[llvm-strip] Support grouped options in llvm-strip

[drodriguez]

Summary

GNU and Apple strip implementations seems to support grouped options.
Enable the support for grouped options introduced in
https://reviews.llvm.org/D83639 for llvm-strip invocations.

Includes test that checks that both the grouped and non grouped
invocations produces the same result.

[MaskRay]

llvm/test/tools/llvm-objcopy/grouped-options.test

17

You may drop .zdebug and .gdb_index . There is a main test checking the functionality, no need to replicate that here.

[drodriguez]

Remove .zdebugGlobal and .gdb_index from the test

[smeenai]

I don't think it should make a difference if the class is only instantiated in one place, but other parts of the codebase seem to do this in the class constructor, e.g. https://github.com/llvm/llvm-project/blob/3afbf898044aa5839ed75273fa38a897abe9d3d4/llvm/tools/llvm-objdump/llvm-objdump.cpp#L97.

[jhenderson]

Does it make sense to do this for llvm-objcopy at the same time? My quick testing suggests GNU objcopy accepts grouped options, but llvm-objcopy doesn't, at least for the version I've got on my machine.

llvm/test/tools/llvm-objcopy/grouped-options.test

2

Add a brief top-level comment to the test explaining the purpose of the test.

48

Nit: delete the extra trailing blank line.

[drodriguez]

Move configuration to constructors. Enable grouped options in llvm-objcopy. Add comment about the intention of the test. Remove blank line.

[drodriguez]

Lint

[MaskRay]

Thanks!

[jhenderson]

llvm/test/tools/llvm-objcopy/grouped-options.test

2–3

Up to you whether you bother fixing it now, but in the newer tests in the LLVM binutils, we tend to use ## for comments, to help distinguish them from RUN and CHECK directives.

[drodriguez]

llvm/test/tools/llvm-objcopy/grouped-options.test

2–3

Thanks for the tip! I didn't noticed the pattern before. If I modify this file (or others) again, I will try to remember.

llvm/test/tools/llvm-objcopy/grouped-options.test

+# This test checks that both grouped and ungrouped options (-S -x and -Sx)
+# produce exactly the same result given the same input.
+#
+# RUN: yaml2obj %s -o %t
+# RUN: llvm-strip -S -x -o %t-strip-separated %t
+# RUN: llvm-strip -Sx -o %t-strip-grouped %t
+# RUN: cmp %t-strip-separated %t-strip-grouped
+
+# RUN: llvm-objcopy -S -x %t %t-objcopy-separated
+# RUN: llvm-objcopy -Sx %t %t-objcopy-grouped
+# RUN: cmp %t-objcopy-separated %t-objcopy-grouped
+
+!ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .debugGlobal
+    Type:            SHT_PROGBITS
+    Content:         "00000000"
+  - Name:            .text
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
+    Address:         0x1000
+    AddressAlign:    0x0000000000000010
+    Size:            64
+Symbols:
+  - Name:     Local
+    Type:     STT_FUNC
+    Section:  .text
+    Value:    0x1000
+    Size:     8
+  - Name:     LocalSection
+    Type:     STT_SECTION
+    Section:  .text
+  - Name:     LocalFile
+    Type:     STT_FILE
+  - Name:     Global
+    Type:     STT_FUNC
+    Size:     8
+    Section:  .text
+    Value:    0x1010
+    Binding:  STB_GLOBAL
+  - Name:     Weak
+    Type:     STT_FUNC
+    Size:     8
+    Section:  .text
+    Value:    0x1008
+  - Name:    debugGlobal
+    Section: .debugGlobal
+    Binding:  STB_GLOBAL

llvm/tools/llvm-objcopy/ConfigManager.cpp

 //===- ConfigManager.cpp --------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
    ALIASARGS,                                                                  \
    VALUES},
 #include "ObjcopyOpts.inc"
 #undef OPTION
 };
 
 class ObjcopyOptTable : public opt::OptTable {
 public:
-  ObjcopyOptTable() : OptTable(ObjcopyInfoTable) {}
+  ObjcopyOptTable() : OptTable(ObjcopyInfoTable) {
+    setGroupedShortOptions(true);
+  }
 };
 
 enum InstallNameToolID {
   INSTALL_NAME_TOOL_INVALID = 0, // This is not an option ID.
 #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
                HELPTEXT, METAVAR, VALUES)                                      \
   INSTALL_NAME_TOOL_##ID,
 #include "InstallNameToolOpts.inc"
#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
    PARAM,          FLAGS,      STRIP_##GROUP,                                  \
    STRIP_##ALIAS,  ALIASARGS,  VALUES},
 #include "StripOpts.inc"
 #undef OPTION
 };
 
 class StripOptTable : public opt::OptTable {
 public:
-  StripOptTable() : OptTable(StripInfoTable) {}
+  StripOptTable() : OptTable(StripInfoTable) {
+    setGroupedShortOptions(true);
+  }
 };
 
 } // namespace
 
 static SectionFlag parseSectionRenameFlag(StringRef SectionName) {
   return llvm::StringSwitch<SectionFlag>(SectionName)
       .CaseLower("alloc", SectionFlag::SecAlloc)
       .CaseLower("load", SectionFlag::SecLoad)