This is an archive of the discontinued LLVM Phabricator instance.

Differential D57582

[llvm-strip] Add --keep-file-symbols
ClosedPublic

Authored by evgeny777 on Feb 1 2019, 5:57 AM.

Details

Reviewers
jhenderson
rupprecht
• espindola
alexander-shaposhnikov
Commits
rG05a3f9978ea9: [llvm-strip] Implement --keep-file-symbols
rL352878: [llvm-strip] Implement --keep-file-symbols

Diff Detail

Repository
rL LLVM

Event Timeline

evgeny777 created this revision.Feb 1 2019, 5:57 AM
Herald added a reviewer: • espindola. · View Herald TranscriptFeb 1 2019, 5:57 AM
Herald added a reviewer: alexander-shaposhnikov. · View Herald Transcript
Herald added subscribers: jakehehrlich, arichardson, emaste. · View Herald Transcript
jhenderson accepted this revision.Feb 1 2019, 6:22 AM

LGTM.

This revision is now accepted and ready to land.Feb 1 2019, 6:22 AM
Closed by commit rL352878: [llvm-strip] Implement --keep-file-symbols (authored by evgeny777). · Explain WhyFeb 1 2019, 7:25 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 1 2019, 7:25 AM

Revision Contents

PathSize
llvm/
trunk/
test/
tools/
llvm-objcopy/
ELF/
5 lines
tools/
llvm-objcopy/
1 line
3 lines

Diff 184750

llvm/trunk/test/tools/llvm-objcopy/ELF/keep-file-symbols.test

# RUN: yaml2obj %s > %t # RUN: yaml2obj %s > %t
# RUN: llvm-objcopy --strip-all --keep-file-symbols %t %t2 # RUN: llvm-objcopy --strip-all --keep-file-symbols %t %t2
# RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=STRIPALL # RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=STRIPALL
# RUN: llvm-objcopy --keep-file-symbols --strip-symbol foo %t %t2 # RUN: llvm-objcopy --keep-file-symbols --strip-symbol foo %t %t2
# RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=STRIP # RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=STRIP
# RUN: llvm-strip --keep-file-symbols %t -o %t3
# RUN: llvm-readobj --symbols %t3 | FileCheck %s --check-prefix=STRIPALL
# RUN: llvm-strip --keep-file-symbols --strip-symbol foo %t -o %t4
# RUN: llvm-readobj --symbols %t4 | FileCheck %s --check-prefix=STRIP
!ELF !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
Sections: Sections:
- Name: .text - Name: .text
▲ Show 20 Lines • Show All 65 Lines • Show Last 20 Lines

llvm/trunk/tools/llvm-objcopy/CopyConfig.cpp

Show First 20 Lines • Show All 473 Lines • ▼ Show 20 LinesDriverConfig parseStripOptions(ArrayRef<const char *> ArgsArr) {
if (InputArgs.hasArg(STRIP_discard_all, STRIP_discard_locals)) if (InputArgs.hasArg(STRIP_discard_all, STRIP_discard_locals))
Config.DiscardMode = Config.DiscardMode =
InputArgs.hasFlag(STRIP_discard_all, STRIP_discard_locals) InputArgs.hasFlag(STRIP_discard_all, STRIP_discard_locals)
? DiscardType::All ? DiscardType::All
: DiscardType::Locals; : DiscardType::Locals;
Config.StripUnneeded = InputArgs.hasArg(STRIP_strip_unneeded); Config.StripUnneeded = InputArgs.hasArg(STRIP_strip_unneeded);
Config.StripAll = InputArgs.hasArg(STRIP_strip_all); Config.StripAll = InputArgs.hasArg(STRIP_strip_all);
Config.StripAllGNU = InputArgs.hasArg(STRIP_strip_all_gnu); Config.StripAllGNU = InputArgs.hasArg(STRIP_strip_all_gnu);
Config.KeepFileSymbols = InputArgs.hasArg(STRIP_keep_file_symbols);
for (auto Arg : InputArgs.filtered(STRIP_keep_section)) for (auto Arg : InputArgs.filtered(STRIP_keep_section))
Config.KeepSection.push_back(Arg->getValue()); Config.KeepSection.push_back(Arg->getValue());
for (auto Arg : InputArgs.filtered(STRIP_remove_section)) for (auto Arg : InputArgs.filtered(STRIP_remove_section))
Config.ToRemove.push_back(Arg->getValue()); Config.ToRemove.push_back(Arg->getValue());
for (auto Arg : InputArgs.filtered(STRIP_strip_symbol)) for (auto Arg : InputArgs.filtered(STRIP_strip_symbol))
Show All 34 Lines

llvm/trunk/tools/llvm-objcopy/StripOpts.td

Show First 20 Lines • Show All 53 Lines • ▼ Show 20 Lines
defm strip_symbol : Eq<"strip-symbol", "Strip <symbol>">, defm strip_symbol : Eq<"strip-symbol", "Strip <symbol>">,
MetaVarName<"symbol">; MetaVarName<"symbol">;
def N : JoinedOrSeparate<["-"], "N">, Alias<strip_symbol>; def N : JoinedOrSeparate<["-"], "N">, Alias<strip_symbol>;
defm keep_section : Eq<"keep-section", "Keep <section>">, defm keep_section : Eq<"keep-section", "Keep <section>">,
MetaVarName<"section">; MetaVarName<"section">;
defm keep_symbol : Eq<"keep-symbol", "Do not remove symbol <symbol>">, defm keep_symbol : Eq<"keep-symbol", "Do not remove symbol <symbol>">,
MetaVarName<"symbol">; MetaVarName<"symbol">;
def keep_file_symbols : Flag<["-", "--"], "keep-file-symbols">,
HelpText<"Do not remove file symbols">;
def K : JoinedOrSeparate<["-"], "K">, Alias<keep_symbol>; def K : JoinedOrSeparate<["-"], "K">, Alias<keep_symbol>;
def discard_locals : Flag<["-", "--"], "discard-locals">, def discard_locals : Flag<["-", "--"], "discard-locals">,
HelpText<"Remove compiler-generated local symbols, (e.g. " HelpText<"Remove compiler-generated local symbols, (e.g. "
"symbols starting with .L)">; "symbols starting with .L)">;
def X : Flag<["-"], "X">, Alias<discard_locals>; def X : Flag<["-"], "X">, Alias<discard_locals>;
def discard_all def discard_all
: Flag<["-", "--"], "discard-all">, : Flag<["-", "--"], "discard-all">,
HelpText<"Remove all local symbols except file and section symbols">; HelpText<"Remove all local symbols except file and section symbols">;
def x : Flag<["-"], "x">, Alias<discard_all>; def x : Flag<["-"], "x">, Alias<discard_all>;
def version : Flag<["-", "--"], "version">, def version : Flag<["-", "--"], "version">,
HelpText<"Print the version and exit.">; HelpText<"Print the version and exit.">;
def V : Flag<["-"], "V">, Alias<version>; def V : Flag<["-"], "V">, Alias<version>;