[llvm-strip] Hook up (unimplemented) --only-keep-debug
For ELF, we accept but ignore --only-keep-debug. Do the same for llvm-strip.
COFF does implement this, so update the test that it is supported.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@356207 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/tools/llvm-objcopy/COFF/only-keep-debug.test b/test/tools/llvm-objcopy/COFF/only-keep-debug.test
index 5518d40..c2a6afe 100644
--- a/test/tools/llvm-objcopy/COFF/only-keep-debug.test
+++ b/test/tools/llvm-objcopy/COFF/only-keep-debug.test
@@ -3,6 +3,10 @@
RUN: llvm-objcopy --only-keep-debug %t.in.exe %t.out.exe
RUN: llvm-readobj --sections %t.out.exe | FileCheck %s --check-prefix=SECTIONS
RUN: llvm-objdump -t %t.out.exe | FileCheck %s --check-prefix=SYMBOLS
+# Run llvm-strip with --strip-symbol on a non-existent symbol to prevent
+# defaulting to --strip-all.
+RUN: llvm-strip --only-keep-debug --strip-symbol foo %t.in.exe -o %t-strip.out.exe
+RUN: cmp %t.out.exe %t-strip.out.exe
Check that all non-debug/buildid sections with IMAGE_SCN_CNT_CODE
or IMAGE_SCN_CNT_INITIALIZED_DATA are truncated, and no others.
diff --git a/test/tools/llvm-objcopy/ELF/basic-only-keep-debug.test b/test/tools/llvm-objcopy/ELF/basic-only-keep-debug.test
index c35c4a5..c5a794a 100644
--- a/test/tools/llvm-objcopy/ELF/basic-only-keep-debug.test
+++ b/test/tools/llvm-objcopy/ELF/basic-only-keep-debug.test
@@ -6,6 +6,10 @@
# RUN: llvm-objcopy %t %t2
# RUN: llvm-objcopy --only-keep-debug %t %t3
# RUN: cmp %t2 %t3
+# Run llvm-strip with --strip-symbol on a non-existent symbol to prevent
+# defaulting to --strip-all.
+# RUN: llvm-strip --only-keep-debug --strip-symbol foo %t -o %t4
+# RUN: cmp %t2 %t4
!ELF
FileHeader:
diff --git a/tools/llvm-objcopy/CopyConfig.cpp b/tools/llvm-objcopy/CopyConfig.cpp
index 4786782..dd3fa3e 100644
--- a/tools/llvm-objcopy/CopyConfig.cpp
+++ b/tools/llvm-objcopy/CopyConfig.cpp
@@ -725,6 +725,7 @@
Config.StripUnneeded = InputArgs.hasArg(STRIP_strip_unneeded);
Config.StripAll = InputArgs.hasArg(STRIP_strip_all);
Config.StripAllGNU = InputArgs.hasArg(STRIP_strip_all_gnu);
+ Config.OnlyKeepDebug = InputArgs.hasArg(STRIP_only_keep_debug);
Config.KeepFileSymbols = InputArgs.hasArg(STRIP_keep_file_symbols);
for (auto Arg : InputArgs.filtered(STRIP_keep_section))
diff --git a/tools/llvm-objcopy/ObjcopyOpts.td b/tools/llvm-objcopy/ObjcopyOpts.td
index a5f7119..8cd803b 100644
--- a/tools/llvm-objcopy/ObjcopyOpts.td
+++ b/tools/llvm-objcopy/ObjcopyOpts.td
@@ -206,9 +206,12 @@
defm keep_symbol : Eq<"keep-symbol", "Do not remove symbol <symbol>">,
MetaVarName<"symbol">;
def K : JoinedOrSeparate<["-"], "K">, Alias<keep_symbol>;
+
def only_keep_debug
: Flag<["-", "--"], "only-keep-debug">,
- HelpText<"Currently ignored. Only for compatibility with GNU objcopy.">;
+ HelpText<"Clear sections that would not be stripped by --strip-debug. "
+ "Currently only implemented for COFF.">;
+
def keep_file_symbols : Flag<["-", "--"], "keep-file-symbols">,
HelpText<"Do not remove file symbols">;
defm dump_section
diff --git a/tools/llvm-objcopy/StripOpts.td b/tools/llvm-objcopy/StripOpts.td
index 40b043a..1bf18eb 100644
--- a/tools/llvm-objcopy/StripOpts.td
+++ b/tools/llvm-objcopy/StripOpts.td
@@ -63,6 +63,11 @@
def K : JoinedOrSeparate<["-"], "K">, Alias<keep_symbol>;
+def only_keep_debug
+ : Flag<["-", "--"], "only-keep-debug">,
+ HelpText<"Clear sections that would not be stripped by --strip-debug. "
+ "Currently only implemented for COFF.">;
+
def discard_locals : Flag<["-", "--"], "discard-locals">,
HelpText<"Remove compiler-generated local symbols, (e.g. "
"symbols starting with .L)">;
