summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Leviant <eleviant@accesssoftek.com>2019-02-01 15:25:15 +0000
committerEugene Leviant <eleviant@accesssoftek.com>2019-02-01 15:25:15 +0000
commit05a3f9978ea904860c4072d893dd5bcc5920eab0 (patch)
tree5ff18da8c110f557012ee260044c50488d28d718
parent971d4762b6d686429dca484ec64b8f82634dfc85 (diff)
downloadbcm5719-llvm-05a3f9978ea904860c4072d893dd5bcc5920eab0.tar.gz
bcm5719-llvm-05a3f9978ea904860c4072d893dd5bcc5920eab0.zip
[llvm-strip] Implement --keep-file-symbols
Differential revision: https://reviews.llvm.org/D57582 llvm-svn: 352878
-rw-r--r--llvm/test/tools/llvm-objcopy/ELF/keep-file-symbols.test5
-rw-r--r--llvm/tools/llvm-objcopy/CopyConfig.cpp1
-rw-r--r--llvm/tools/llvm-objcopy/StripOpts.td3
3 files changed, 9 insertions, 0 deletions
diff --git a/llvm/test/tools/llvm-objcopy/ELF/keep-file-symbols.test b/llvm/test/tools/llvm-objcopy/ELF/keep-file-symbols.test
index 3d7299d9138..3655f39512d 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/keep-file-symbols.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/keep-file-symbols.test
@@ -4,6 +4,11 @@
# RUN: llvm-objcopy --keep-file-symbols --strip-symbol foo %t %t2
# 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
FileHeader:
Class: ELFCLASS64
diff --git a/llvm/tools/llvm-objcopy/CopyConfig.cpp b/llvm/tools/llvm-objcopy/CopyConfig.cpp
index 169a8ebb77f..053f9086b70 100644
--- a/llvm/tools/llvm-objcopy/CopyConfig.cpp
+++ b/llvm/tools/llvm-objcopy/CopyConfig.cpp
@@ -479,6 +479,7 @@ DriverConfig parseStripOptions(ArrayRef<const char *> ArgsArr) {
Config.StripUnneeded = InputArgs.hasArg(STRIP_strip_unneeded);
Config.StripAll = InputArgs.hasArg(STRIP_strip_all);
Config.StripAllGNU = InputArgs.hasArg(STRIP_strip_all_gnu);
+ Config.KeepFileSymbols = InputArgs.hasArg(STRIP_keep_file_symbols);
for (auto Arg : InputArgs.filtered(STRIP_keep_section))
Config.KeepSection.push_back(Arg->getValue());
diff --git a/llvm/tools/llvm-objcopy/StripOpts.td b/llvm/tools/llvm-objcopy/StripOpts.td
index f0f77254af0..b29f9ee6e17 100644
--- a/llvm/tools/llvm-objcopy/StripOpts.td
+++ b/llvm/tools/llvm-objcopy/StripOpts.td
@@ -59,6 +59,9 @@ defm keep_section : Eq<"keep-section", "Keep <section>">,
MetaVarName<"section">;
defm keep_symbol : Eq<"keep-symbol", "Do not remove symbol <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 discard_locals : Flag<["-", "--"], "discard-locals">,
OpenPOWER on IntegriCloud