[llvm-strip] Support --keep and --strip-all-gnu from llvm-objcopy

[rupprecht]

Summary

Add --keep and --strip-all-gnu from llvm-objcopy into llvm-strip.

[jhenderson]

LGTM, with the typo fix.

tools/llvm-objcopy/StripOpts.td

26

Typo: "Compaitable" -> "Compatible"

[rupprecht]

• Fix typos

[MaskRay]

The option name`--keep` was introduced to llvm-objcopy in https://reviews.llvm.org/D39021
Have you considered --keep-section?

test/tools/llvm-objcopy/basic-keep.test

 # RUN: yaml2obj %s > %t
 # RUN: llvm-objcopy -strip-non-alloc -keep=.test %t %t2
+# RUN: llvm-strip --strip-all -keep=.test %t -o %t3
 # RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
+# RUN: cmp %t2 %t3
 
 !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_X86_64
 Sections:
   - Name:            .test
     Type:            SHT_PROGBITS
     Flags:           [ ]
 
 # CHECK: SectionHeaderCount: 3
 
 # CHECK:     Name: .test
 # CHECK:     Name: .shstrtab

test/tools/llvm-objcopy/strip-all-gnu.test

 # RUN: yaml2obj %s > %t
 # RUN: cp %t %t1
 # RUN: llvm-objcopy --strip-all-gnu %t %t2
+# RUN: llvm-strip --strip-all-gnu %t -o %t3
 # RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
+# RUN: cmp %t2 %t3
 
 !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_X86_64
 Sections:

tools/llvm-objcopy/CopyConfig.cpp

if (Positional.size() > 1 && InputArgs.hasArg(STRIP_output))
     error("Multiple input files cannot be used in combination with -o");
 
   CopyConfig Config;
   Config.StripDebug = InputArgs.hasArg(STRIP_strip_debug);
 
   Config.DiscardAll = InputArgs.hasArg(STRIP_discard_all);
   Config.StripUnneeded = InputArgs.hasArg(STRIP_strip_unneeded);
   Config.StripAll = InputArgs.hasArg(STRIP_strip_all);
+  Config.StripAllGNU = InputArgs.hasArg(STRIP_strip_all_gnu);
 
-  if (!Config.StripDebug && !Config.StripUnneeded && !Config.DiscardAll)
+  if (!Config.StripDebug && !Config.StripUnneeded && !Config.DiscardAll &&
+      !Config.StripAllGNU)
     Config.StripAll = true;
 
+  for (auto Arg : InputArgs.filtered(STRIP_keep))
+    Config.Keep.push_back(Arg->getValue());
+
   for (auto Arg : InputArgs.filtered(STRIP_remove_section))
     Config.ToRemove.push_back(Arg->getValue());
 
   for (auto Arg : InputArgs.filtered(STRIP_keep_symbol))
     Config.SymbolsToKeep.push_back(Arg->getValue());
 
   Config.PreserveDates = InputArgs.hasArg(STRIP_preserve_dates);
 

tools/llvm-objcopy/ObjcopyOpts.td

 defm add_section : Eq<"add-section">,
                    MetaVarName<"section=file">,
                    HelpText<"Make a section named <section> with the contents of <file>.">;
 def strip_all : Flag<["-", "--"], "strip-all">,
                 HelpText<"Remove non-allocated sections other than .gnu.warning* sections">;
 def S : Flag<["-"], "S">,
         Alias<strip_all>;
 def strip_all_gnu : Flag<["-", "--"], "strip-all-gnu">,
-                    HelpText<"Compaitable with GNU objcopy's --strip-all">;
+                    HelpText<"Compatible with GNU objcopy's --strip-all">;
 def strip_debug : Flag<["-", "--"], "strip-debug">,
                   HelpText<"Remove all debug information">;
 def strip_dwo : Flag<["-", "--"], "strip-dwo">,
                 HelpText<"Remove all DWARF .dwo sections from file">;
 def strip_sections : Flag<["-", "--"], "strip-sections">,
                      HelpText<"Remove all section headers">;
 def strip_non_alloc : Flag<["-", "--"], "strip-non-alloc">,
                       HelpText<"Remove all non-allocated sections">;

 def N : JoinedOrSeparate<["-"], "N">,
         Alias<strip_symbol>;
 defm keep_symbol : Eq<"keep-symbol">,
                        MetaVarName<"symbol">,
                        HelpText<"Do not remove symbol <symbol>">;
 def K : JoinedOrSeparate<["-"], "K">,
         Alias<keep_symbol>;
 def only_keep_debug : Flag<["-", "--"], "only-keep-debug">,
-                          HelpText<"Currently ignored. Only for compaitability with GNU objcopy.">;
+                          HelpText<"Currently ignored. Only for compatibility with GNU objcopy.">;
 def strip_unneeded : Flag<["-", "--"], "strip-unneeded">,
                       HelpText<"Remove all symbols not needed by relocations">;
 def keep_file_symbols : Flag<["-", "--"], "keep-file-symbols">,
                       HelpText<"Do not remove file symbols">;
 defm dump_section : Eq<"dump-section">,
                    MetaVarName<"section=file">,
                    HelpText<"Dump contents of section named <section> into file <file>">;
 defm prefix_symbols : Eq<"prefix-symbols">,
                        MetaVarName<"prefix">,
                        HelpText<"Add <prefix> to the start of every symbol name">;

tools/llvm-objcopy/StripOpts.td

 def p : Flag<[ "-" ], "p">, Alias<preserve_dates>;
 
 def strip_all : Flag<["-", "--"], "strip-all">,
                 HelpText<"Remove non-allocated sections other than .gnu.warning* sections">;
 
 def s : Flag<["-"], "s">,
         Alias<strip_all>;
 
+def strip_all_gnu : Flag<["-", "--"], "strip-all-gnu">,
+                    HelpText<"Compatible with GNU strip's --strip-all">;
+
 def strip_debug : Flag<["-", "--"], "strip-debug">,
                   HelpText<"Remove debugging symbols only">;
 
 def d : Flag<["-"], "d">,
         Alias<strip_debug>;
 
 def g : Flag<["-"], "g">,
         Alias<strip_debug>;
 
 def S : Flag<["-"], "S">,
         Alias<strip_debug>;
 
 defm remove_section : Eq<"remove-section">,
                       MetaVarName<"section">,
                       HelpText<"Remove <section>">;
 
 def R : JoinedOrSeparate<["-"], "R">,
         Alias<remove_section>;
 
+defm keep : Eq<"keep">, MetaVarName<"section">, HelpText<"Keep <section>">;
+
 defm keep_symbol : Eq<"keep-symbol">,
                    MetaVarName<"symbol">,
                    HelpText<"Do not remove symbol <symbol>">;
 
 def K : JoinedOrSeparate<["-"], "K">,
         Alias<keep_symbol>;
 
 def discard_all : Flag<["-", "--"], "discard-all">,