[llvm] r357418 - [llvm-objcopy] Add --keep-symbols option

[Yi Kong via llvm-commits]

Author: kongyi
Date: Mon Apr  1 11:12:43 2019
New Revision: 357418

URL: http://llvm.org/viewvc/llvm-project?rev=357418&view=rev
Log:
[llvm-objcopy] Add --keep-symbols option

Differential Revision: https://reviews.llvm.org/D60054

Modified:
    llvm/trunk/test/tools/llvm-objcopy/ELF/keep-symbol.test
    llvm/trunk/tools/llvm-objcopy/CopyConfig.cpp
    llvm/trunk/tools/llvm-objcopy/ObjcopyOpts.td

Modified: llvm/trunk/test/tools/llvm-objcopy/ELF/keep-symbol.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/keep-symbol.test?rev=357418&r1=357417&r2=357418&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/keep-symbol.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/keep-symbol.test Mon Apr  1 11:12:43 2019
@@ -6,6 +6,13 @@
 # RUN: llvm-readobj --symbols %t3 | FileCheck %s
 # RUN: llvm-readobj --symbols %t4 | FileCheck %s --check-prefix=REGEX
 
+# RUN: echo 'foo' > %t.symbols
+# RUN: echo 'bar' >> %t.symbols
+# RUN: llvm-objcopy --discard-all --keep-symbols %t.symbols %t %t5
+# RUN: llvm-objcopy -K foo -N foo -N bar --keep-symbols %t.symbols -N baz %t %t6
+# RUN: llvm-readobj --symbols %t5 | FileCheck %s
+# RUN: llvm-readobj --symbols %t6 | FileCheck %s
+
 !ELF
 FileHeader:
   Class:           ELFCLASS64

Modified: llvm/trunk/tools/llvm-objcopy/CopyConfig.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/CopyConfig.cpp?rev=357418&r1=357417&r2=357418&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/CopyConfig.cpp (original)
+++ llvm/trunk/tools/llvm-objcopy/CopyConfig.cpp Mon Apr  1 11:12:43 2019
@@ -596,6 +596,10 @@ Expected<DriverConfig> parseObjcopyOptio
       return std::move(E);
   for (auto Arg : InputArgs.filtered(OBJCOPY_keep_symbol))
     Config.SymbolsToKeep.emplace_back(Arg->getValue(), UseRegex);
+  for (auto Arg : InputArgs.filtered(OBJCOPY_keep_symbols))
+    if (Error E = addSymbolsFromFile(Config.SymbolsToKeep, DC.Alloc,
+                                     Arg->getValue(), UseRegex))
+      return std::move(E);
   for (auto Arg : InputArgs.filtered(OBJCOPY_add_symbol)) {
     Expected<NewSymbolInfo> NSI = parseNewSymbolInfo(Arg->getValue());
     if (!NSI)

Modified: llvm/trunk/tools/llvm-objcopy/ObjcopyOpts.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/ObjcopyOpts.td?rev=357418&r1=357417&r2=357418&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/ObjcopyOpts.td (original)
+++ llvm/trunk/tools/llvm-objcopy/ObjcopyOpts.td Mon Apr  1 11:12:43 2019
@@ -207,6 +207,15 @@ defm keep_symbol : Eq<"keep-symbol", "Do
                    MetaVarName<"symbol">;
 def K : JoinedOrSeparate<["-"], "K">, Alias<keep_symbol>;
 
+defm keep_symbols
+    : Eq<"keep-symbols",
+         "Reads a list of symbols from <filename> and runs as if "
+         "--keep-symbol=<symbol> is set for each one. <filename> "
+         "contains one symbol per line and may contain comments beginning with "
+         "'#'. Leading and trailing whitespace is stripped from each line. May "
+         "be repeated to read symbols from many files.">,
+      MetaVarName<"filename">;
+
 def only_keep_debug
     : Flag<["-", "--"], "only-keep-debug">,
       HelpText<"Clear sections that would not be stripped by --strip-debug. "