[llvm-objcopy] Remove support for legacy .zdebug sections

[MaskRay]

Summary

clang 14 removed -gz=zlib-gnu support and ld.lld removed linker input support
for zlib-gnu in D126793. Now let's remove zlib-gnu from llvm-objcopy.

• .zdebug* sections are no longer recognized as debug sections. --strip* don't remove them. They are copied like other opaque sections
• --decompress-debug-sections does not uncompress .zdebug* sections
• --compress-debug-sections=zlib-gnu is not supported

It is very rare but in case a user has object files using .zdebug . They can use
llvm-objcopy<15 or GNU objcopy for uncompression.
--compress-debug-sections=zlib-gnu is unlikely ever used by anyone, so I do not
add a custom diagnostic.

[jhenderson]

@plotfi, you were the one who originally added compression support, including zlib-gnu support. Do you know of a use-case for zlib-gnu support? If not, I think we can drop it, given that GNU has. (Looking back at https://reviews.llvm.org/D49678#1189341 which was a comment I made on the review to add support, @plotfi originally had this marked as deprecated).

llvm/lib/ObjCopy/ELF/ELFObject.cpp

522–524

I wonder if this should be a switch statement, so that we can benefit from compiler diagnostics if not all DebugCompressionType values are handled. Thoughts?

[MaskRay]

llvm/lib/ObjCopy/ELF/ELFObject.cpp

522–524

I placed assert(Sec.CompressionType == DebugCompressionType::Z); below. When zstd is added, the assert will fire :)

[jhenderson]

llvm/lib/ObjCopy/ELF/ELFObject.cpp

522–524

My thinking was that it would turn the runtime failure into a potential build-time one, which improves developer experience. We'd still want an llvm_unreachable or similar after the switch of course.

[MaskRay]

Change ELFSectionWriter<ELFT>::visit to a switch to catch new DebugCompressionType values.

llvm/lib/ObjCopy/ELF/ELFObject.cpp

522–524

The build-time warning/error idea LG. I switched to a switch statement.

[jhenderson]

LGTM!

[MaskRay]

@plotfi Do you have zlib-gnu usage?

[plotfi]

In D128688#3619619, @MaskRay wrote:

@plotfi Do you have zlib-gnu usage?

Hi all thanks for reaching out. I will confirm with some folks who I wrote this zlib-gnu support for to confirm it is not needed.

[smeenai]

In D128688#3619638, @plotfi wrote:

In D128688#3619619, @MaskRay wrote:

@plotfi Do you have zlib-gnu usage?

Hi all thanks for reaching out. I will confirm with some folks who I wrote this zlib-gnu support for to confirm it is not needed.

We don't need zlib-gnu anymore.

[MaskRay]

In D128688#3619734, @smeenai wrote:

In D128688#3619638, @plotfi wrote:

In D128688#3619619, @MaskRay wrote:

@plotfi Do you have zlib-gnu usage?

Hi all thanks for reaching out. I will confirm with some folks who I wrote this zlib-gnu support for to confirm it is not needed.

We don't need zlib-gnu anymore.

Thanks!

[plotfi]

In D128688#3619734, @smeenai wrote:

In D128688#3619638, @plotfi wrote:

In D128688#3619619, @MaskRay wrote:

@plotfi Do you have zlib-gnu usage?

Hi all thanks for reaching out. I will confirm with some folks who I wrote this zlib-gnu support for to confirm it is not needed.

We don't need zlib-gnu anymore.

Thanks for chiming in @smeenai. Thanks for reaching out @MaskRay @jhenderson

[Jake-Egan]

Hi, the new test, zdebug.yaml, fails on AIX with error: LLVM was not compiled with LLVM_ENABLE_ZLIB: cannot decompress.
https://lab.llvm.org/buildbot/#/builders/214/builds/2061/steps/6/logs/FAIL__LLVM__zdebug_yaml

I think the test needs # REQUIRES: zlib ?

[MaskRay]

In D128688#3620459, @Jake-Egan wrote:

Hi, the new test, zdebug.yaml, fails on AIX with error: LLVM was not compiled with LLVM_ENABLE_ZLIB: cannot decompress.
https://lab.llvm.org/buildbot/#/builders/214/builds/2061/steps/6/logs/FAIL__LLVM__zdebug_yaml

I think the test needs # REQUIRES: zlib ?

Yes! Done in 5530e5552128e9360dccf5e4813dd691d8b4c503

llvm/docs/ReleaseNotes.rst

 During this release ...
 
 Changes to the LLVM tools
 ---------------------------------
 
 * (Experimental) :manpage:`llvm-symbolizer(1)` now has ``--filter-markup`` to
   filter :doc:`Symbolizer Markup </SymbolizerMarkupFormat>` into human-readable
   form.
+* :doc:`llvm-objcopy <CommandGuide/llvm-objcopy>` has removed support for the legacy ``zlib-gnu`` format.
 
 Changes to LLDB
 ---------------------------------
 
 * The "memory region" command now has a "--all" option to list all
   memory regions (including unmapped ranges). This is the equivalent
   of using address 0 then repeating the command until all regions
   have been listed.

llvm/lib/ObjCopy/ELF/ELFObjcopy.cpp

 using namespace llvm::ELF;
 using namespace llvm::objcopy;
 using namespace llvm::objcopy::elf;
 using namespace llvm::object;
 
 using SectionPred = std::function<bool(const SectionBase &Sec)>;
 
 static bool isDebugSection(const SectionBase &Sec) {
-  return StringRef(Sec.Name).startswith(".debug") ||
-         StringRef(Sec.Name).startswith(".zdebug") || Sec.Name == ".gdb_index";
+  return StringRef(Sec.Name).startswith(".debug") || Sec.Name == ".gdb_index";
 }
 
 static bool isDWOSection(const SectionBase &Sec) {
   return StringRef(Sec.Name).endswith(".dwo");
 }
 
 static bool onlyKeepDWOPred(const Object &Obj, const SectionBase &Sec) {
   // We can't remove the section header string table.

llvm/lib/ObjCopy/ELF/ELFObject.h

public:
 
   uint64_t getDecompressedSize() const { return DecompressedSize; }
   uint64_t getDecompressedAlign() const { return DecompressedAlign; }
 
   Error accept(SectionVisitor &Visitor) const override;
   Error accept(MutableSectionVisitor &Visitor) override;
 
   static bool classof(const SectionBase *S) {
-    return (S->OriginalFlags & ELF::SHF_COMPRESSED) ||
-           (StringRef(S->Name).startswith(".zdebug"));
+    return S->OriginalFlags & ELF::SHF_COMPRESSED;
   }
 };
 
 class DecompressedSection : public SectionBase {
   MAKE_SEC_WRITER_FRIEND
 
 public:
   explicit DecompressedSection(const CompressedSection &Sec)
       : SectionBase(Sec) {
     Size = Sec.getDecompressedSize();
     Align = Sec.getDecompressedAlign();
     Flags = OriginalFlags = (Flags & ~ELF::SHF_COMPRESSED);
-    if (StringRef(Name).startswith(".zdebug"))
-      Name = "." + Name.substr(2);
   }
 
   Error accept(SectionVisitor &Visitor) const override;
   Error accept(MutableSectionVisitor &Visitor) override;
 };
 
 // There are two types of string tables that can exist, dynamic and not dynamic.
 // In the dynamic case the string table is allocated. Changing a dynamic string

llvm/lib/ObjCopy/ELF/ELFObject.cpp

Error BinarySectionWriter::visit(const CompressedSection &Sec) {
   return createStringError(errc::operation_not_permitted,
                            "cannot write compressed section '" + Sec.Name +
                                "' ");
 }
 
 template <class ELFT>
 Error ELFSectionWriter<ELFT>::visit(const CompressedSection &Sec) {
   uint8_t *Buf = reinterpret_cast<uint8_t *>(Out.getBufferStart()) + Sec.Offset;
-  if (Sec.CompressionType == DebugCompressionType::None) {
+  Elf_Chdr_Impl<ELFT> Chdr;
+  switch (Sec.CompressionType) {
+  case DebugCompressionType::None:
     std::copy(Sec.OriginalData.begin(), Sec.OriginalData.end(), Buf);
     return Error::success();
-  }
-
-  if (Sec.CompressionType == DebugCompressionType::GNU) {
-    const char *Magic = "ZLIB";
-    memcpy(Buf, Magic, strlen(Magic));
-    Buf += strlen(Magic);
-    const uint64_t DecompressedSize =
-        support::endian::read64be(&Sec.DecompressedSize);
-    memcpy(Buf, &DecompressedSize, sizeof(DecompressedSize));
-    Buf += sizeof(DecompressedSize);
-  } else {
-    Elf_Chdr_Impl<ELFT> Chdr;
+  case DebugCompressionType::GNU:
+    llvm_unreachable("unexpected zlib-gnu");
+    break;
+  case DebugCompressionType::Z:
     Chdr.ch_type = ELF::ELFCOMPRESS_ZLIB;
-    Chdr.ch_size = Sec.DecompressedSize;
-    Chdr.ch_addralign = Sec.DecompressedAlign;
-    memcpy(Buf, &Chdr, sizeof(Chdr));
-    Buf += sizeof(Chdr);
-  }
+    break;
+  }
 
   std::copy(Sec.CompressedData.begin(), Sec.CompressedData.end(), Buf);
   return Error::success();
 }
 
 CompressedSection::CompressedSection(const SectionBase &Sec,
                                      DebugCompressionType CompressionType)
     : SectionBase(Sec), CompressionType(CompressionType),
       DecompressedSize(Sec.OriginalData.size()), DecompressedAlign(Sec.Align) {
   zlib::compress(StringRef(reinterpret_cast<const char *>(OriginalData.data()),
                            OriginalData.size()),
                  CompressedData);
 
-  size_t ChdrSize;
-  if (CompressionType == DebugCompressionType::GNU) {
-    Name = ".z" + Sec.Name.substr(1);
-    ChdrSize = sizeof("ZLIB") - 1 + sizeof(uint64_t);
-  } else {
-    Flags |= ELF::SHF_COMPRESSED;
-    ChdrSize =
-        std::max(std::max(sizeof(object::Elf_Chdr_Impl<object::ELF64LE>),
-                          sizeof(object::Elf_Chdr_Impl<object::ELF64BE>)),
-                 std::max(sizeof(object::Elf_Chdr_Impl<object::ELF32LE>),
-                          sizeof(object::Elf_Chdr_Impl<object::ELF32BE>)));
-  }
+  assert(CompressionType != DebugCompressionType::None);
+  size_t ChdrSize =
   Size = ChdrSize + CompressedData.size();
   Align = 8;
 }
 
 CompressedSection::CompressedSection(ArrayRef<uint8_t> CompressedData,
                                      uint64_t DecompressedSize,
                                      uint64_t DecompressedAlign)
     : CompressionType(DebugCompressionType::None),

llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-default-gnu.test

-# REQUIRES: zlib
-
-# RUN: yaml2obj %p/Inputs/compress-debug-sections.yaml -o %t.o
-# RUN: llvm-objcopy --compress-debug-sections --compress-debug-sections=zlib-gnu %t.o %t-compressed.o
-# RUN: llvm-objdump -s %t-compressed.o | FileCheck %s
-
-# CHECK: .zdebug_foo:
-# CHECK: ZLIB
-

llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-groups.test

 # REQUIRES: zlib
 
 ## In this test, we check how llvm-objcopy handles compression/decompression
 ## of debug sections included in a COMDAT group.
 
 # RUN: yaml2obj %p/Inputs/compress-debug-sections.yaml -o %t.o
 
 ## Check compression of debug sections.
 # RUN: llvm-objcopy --compress-debug-sections %t.o %t-compressed.o
 # RUN: llvm-readobj -S --section-groups %t-compressed.o | \
 # RUN:   FileCheck %s --check-prefixes=CHECK,COMPRESS
 
-## Check zlib-gnu compression of debug sections.
-# RUN: llvm-objcopy --compress-debug-sections=zlib-gnu %t.o %t-compressed-gnu.o
-# RUN: llvm-readobj -S --section-groups %t-compressed-gnu.o | \
-# RUN:   FileCheck %s --check-prefixes=CHECK,COMPRESSZLIB
-
 ## Check decompression of debug sections.
 # RUN: llvm-objcopy --decompress-debug-sections %t-compressed.o %t-decompressed.o
 # RUN: llvm-readobj --section-groups %t-decompressed.o | \
 # RUN:   FileCheck %s --check-prefixes=CHECK,DECOMPRESS
 
-## Check decompression of zlib-gnu debug sections.
-# RUN: llvm-objcopy --decompress-debug-sections %t-compressed-gnu.o %t-decompressed-gnu.o
-# RUN: llvm-readobj --section-groups %t-decompressed-gnu.o | \
-# RUN:   FileCheck %s --check-prefixes=CHECK,DECOMPRESS
-
-# COMPRESSZLIB:      Name: .zdebug_in_group
-# COMPRESSZLIB-NEXT: Type: SHT_PROGBITS
-# COMPRESSZLIB-NEXT: Flags [
-# COMPRESSZLIB-NEXT:   SHF_GROUP
-# COMPRESSZLIB-NEXT: ]
-
 # COMPRESS:      Name: .debug_in_group
 # COMPRESS-NEXT: Type: SHT_PROGBITS
 # COMPRESS-NEXT: Flags [
 # COMPRESS-NEXT:   SHF_COMPRESSED
 # COMPRESS-NEXT:   SHF_GROUP
 # COMPRESS-NEXT: ]
 
 # CHECK:           Group {
 # CHECK-NEXT:        Name: .group
 # CHECK-NEXT:        Index:
 # CHECK-NEXT:        Link:
 # CHECK-NEXT:        Info:
 # CHECK-NEXT:        Type: COMDAT
 # CHECK-NEXT:        Signature: groupname
 # CHECK-NEXT:        Section(s) in group [
 # CHECK-NEXT:          .text.in.group
-# COMPRESSZLIB-NEXT:   .zdebug_in_group
 # COMPRESS-NEXT:       .debug_in_group
 # DECOMPRESS-NEXT:     .debug_in_group
 # CHECK-NEXT:        ]

llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-invalid-format.test

 # RUN: yaml2obj %p/Inputs/compress-debug-sections.yaml -o %t.o
 # RUN: not llvm-objcopy --compress-debug-sections=zlib-fake %t.o 2>&1 | FileCheck %s
+# RUN: not llvm-objcopy --compress-debug-sections=zlib-gnu %t.o 2>&1 | FileCheck %s --check-prefix=GNU
 
 # CHECK: invalid or unsupported --compress-debug-sections format: zlib-fake
-
+# GNU:   invalid or unsupported --compress-debug-sections format: zlib-gnu

llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-symbols.test

 # REQUIRES: zlib
 
 # RUN: yaml2obj %p/Inputs/compress-debug-sections.yaml -o %t.o
 
 ## Test that after the compression is done we do not remove the symbol
 ## and it is placed into the right section.
 
 # RUN: llvm-objcopy --compress-debug-sections %t.o %t-compressed1.o
-# RUN: llvm-readobj --symbols %t-compressed1.o | FileCheck %s --check-prefixes=CHECK,ZLIB
-
-# RUN: llvm-objcopy --compress-debug-sections=zlib-gnu %t.o %t-compressed2.o
-# RUN: llvm-readobj --symbols %t-compressed2.o | FileCheck %s --check-prefixes=CHECK,ZLIBGNU
+# RUN: llvm-readobj --symbols %t-compressed1.o | FileCheck %s
 
 # CHECK:        Name:    .Linfo_string0
 # CHECK-NEXT:   Value:   0x0
 # CHECK-NEXT:   Size:    0
 # CHECK-NEXT:   Binding: Global
 # CHECK-NEXT:   Type:    None
 # CHECK-NEXT:   Other:   0
-# ZLIB-NEXT:    Section: .debug_bar
-# ZLIBGNU-NEXT: Section: .zdebug_bar
+# CHECK-NEXT:   Section: .debug_bar

llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test

-# REQUIRES: zlib
-
-# RUN: yaml2obj %p/Inputs/compress-debug-sections.yaml -o %t.o
-# RUN: llvm-objcopy --compress-debug-sections=zlib-gnu %t.o %t-compressed.o
-# RUN: llvm-objcopy --decompress-debug-sections %t-compressed.o %t-decompressed.o
-
-# RUN: llvm-objdump -s %t.o --section=.debug_foo | FileCheck %s
-# RUN: llvm-objdump -s %t-compressed.o | FileCheck %s --check-prefix=CHECK-COMPRESSED
-# RUN: llvm-readobj --relocations -S %t-compressed.o | FileCheck %s --check-prefix=CHECK-FLAGS
-# RUN: llvm-readobj --relocations -S %t-decompressed.o | FileCheck %s --check-prefix=CHECK-HEADER
-# RUN: llvm-readobj --relocations -S %t.o | FileCheck %s --check-prefix=CHECK-HEADER
-# RUN: llvm-objdump -s %t-decompressed.o --section=.debug_foo | FileCheck %s
-
-# CHECK: .debug_foo:
-# CHECK-NEXT: 0000 00000000 00000000
-
-# CHECK-HEADER:      Name: .debug_foo
-# CHECK-HEADER-NEXT: Type: SHT_PROGBITS
-# CHECK-HEADER-NEXT: Flags [
-# CHECK-HEADER-NEXT: ]
-# CHECK-HEADER-NEXT: Address:
-# CHECK-HEADER-NEXT: Offset:
-# CHECK-HEADER-NEXT: Size: 8
-
-# CHECK-COMPRESSED: .zdebug_foo:
-# CHECK-COMPRESSED: ZLIB
-# CHECK-COMPRESSED: .notdebug_foo:
-
-# CHECK-FLAGS-NOT:  Name: .debug_foo
-# CHECK-FLAGS:      Name: .zdebug_foo
-# CHECK-FLAGS-NEXT: Type: SHT_PROGBITS
-# CHECK-FLAGS-NEXT: Flags [
-# CHECK-FLAGS-NEXT: ]
-# CHECK-FLAGS-NEXT: Address:
-# CHECK-FLAGS-NEXT: Offset:
-# CHECK-FLAGS-NEXT: Size: 23
-
-# CHECK-FLAGS: Name: .notdebug_foo
-# CHECK-FLAGS-NEXT: Type: SHT_PROGBITS
-# CHECK-FLAGS-NEXT: Flags [
-# CHECK-FLAGS-NEXT: ]
-# CHECK-FLAGS-NEXT: Address:
-# CHECK-FLAGS-NEXT: Offset:
-# CHECK-FLAGS-NEXT: Size: 8
-
-# CHECK-FLAGS: Name: .rela.debug_foo
-# CHECK-FLAGS-NEXT: Type: SHT_RELA
-# CHECK-FLAGS-NEXT: Flags [
-# CHECK-FLAGS-NEXT: ]
-
-# CHECK-FLAGS: Relocations [
-# CHECK-FLAGS-NEXT:   .rela.debug_foo {
-# CHECK-FLAGS-NEXT:     0x1 R_X86_64_32 .zdebug_foo 0x0
-# CHECK-FLAGS-NEXT:     0x2 R_X86_64_32 .notdebug_foo 0x0
-# CHECK-FLAGS-NEXT:   }
-# CHECK-FLAGS-NEXT: ]
-

llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections.test

 # REQUIRES: zlib
 
 # RUN: yaml2obj %p/Inputs/compress-debug-sections.yaml -o %t.o
 # RUN: cp %t.o %t.copy.o
 
 # RUN: llvm-objcopy --compress-debug-sections=zlib     %t.o %tz.o
-# RUN: llvm-objcopy --compress-debug-sections=zlib-gnu %t.o %tzg.o
 # RUN: cp %tz.o %tz.copy.o
-# RUN: cp %tzg.o %tzg.copy.o
 
 # RUN: llvm-objcopy --decompress-debug-sections %tz.o  %t2.o
-# RUN: llvm-objcopy --decompress-debug-sections %tzg.o %t3.o
 
 # Using redirects to avoid llvm-objdump from printing the filename.
 # RUN: llvm-objdump -s --section=.debug_str - < %t.o  > %t.txt
 # RUN: llvm-objdump -s --section=.debug_str - < %t2.o > %t2.txt
-# RUN: llvm-objdump -s --section=.debug_str - < %t3.o > %t3.txt
 
 # RUN: diff %t.txt %t2.txt
-# RUN: diff %t.txt %t3.txt
 
 # RUN: cmp %t.o %t.copy.o
 # RUN: cmp %tz.o %tz.copy.o
-# RUN: cmp %tzg.o %tzg.copy.o

llvm/test/tools/llvm-objcopy/ELF/strip-debug.test

FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_X86_64
 Sections:
   - Name:            .debugfoo
     Type:            SHT_PROGBITS
     Content:         "00000000"
+  ## .zdebug is no longer recognized as a debug section.
   - Name:            .zdebugfoo
     Type:            SHT_PROGBITS
     Content:         "00000000"
   - Name:            .gdb_index
     Type:            SHT_PROGBITS
     Content:         "00000000"
   - Name:            .text
     Type:            SHT_PROGBITS
     Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
     AddressAlign:    0x0000000000000010
     Content:         "00000000"
 Symbols:
   - Name:    foo
     Section: .text
     Binding:  STB_GLOBAL
   - Name:    debugfoo
     Section: .debugfoo
     Binding:  STB_GLOBAL
   - Name:    filesymbol
     Type:    STT_FILE
 
-# CHECK: SectionHeaderCount: 5
+# CHECK: SectionHeaderCount: 6
 
+# CHECK: Name: .zdebugfoo
 # CHECK: Name: .text
 # CHECK: Name: .symtab
 # CHECK: Name: .strtab
 # CHECK: Name: .shstrtab
 
 # Check that *only* foo is copied and not debugfoo or filesymbol.
 # CHECK:      Symbols [
 # CHECK-NEXT:   Symbol {

llvm/test/tools/llvm-objcopy/ELF/zdebug.yaml

+## .zdebug is no longer recognized as zlib-gnu compressed sections. It's treated
+## as an opaque non-debug section.
+# RUN: yaml2obj %s -o %t
+# RUN: llvm-objcopy --decompress-debug-sections %t %t.copy
+# RUN: llvm-readelf -S %t.copy | FileCheck %s
+
+# CHECK: .zdebug_str
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_X86_64
+Sections:
+  - Name:         .text
+    Type:         SHT_PROGBITS
+    Flags:        [ SHF_ALLOC, SHF_EXECINSTR ]
+    Content:      '00'
+  - Name:         .zdebug_str
+    Type:         SHT_PROGBITS
+    Content:      5a4c49420000000000000002789c4b64000000c40062
+    AddressAlign: 8
+...

llvm/tools/llvm-objcopy/ObjcopyOptions.cpp

objcopy::parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
   if (auto Arg = InputArgs.getLastArg(OBJCOPY_compress_debug_sections,
                                       OBJCOPY_compress_debug_sections_eq)) {
     Config.CompressionType = DebugCompressionType::Z;
 
     if (Arg->getOption().getID() == OBJCOPY_compress_debug_sections_eq) {
       Config.CompressionType =
           StringSwitch<DebugCompressionType>(
               InputArgs.getLastArgValue(OBJCOPY_compress_debug_sections_eq))
-              .Case("zlib-gnu", DebugCompressionType::GNU)
               .Case("zlib", DebugCompressionType::Z)
               .Default(DebugCompressionType::None);
       if (Config.CompressionType == DebugCompressionType::None)
         return createStringError(
             errc::invalid_argument,
             "invalid or unsupported --compress-debug-sections format: %s",
             InputArgs.getLastArgValue(OBJCOPY_compress_debug_sections_eq)
                 .str()

llvm/tools/llvm-objcopy/ObjcopyOpts.td

 defm new_symbol_visibility : Eq<"new-symbol-visibility", "Visibility of "
                                 "symbols generated for binary input or added"
                                 " with --add-symbol unless otherwise"
                                 " specified. The default value is 'default'.">;
 
 def compress_debug_sections : Flag<["--"], "compress-debug-sections">;
 def compress_debug_sections_eq
     : Joined<["--"], "compress-debug-sections=">,
-      MetaVarName<"[ zlib | zlib-gnu ]">,
+      MetaVarName<"[ zlib ]">,
       HelpText<"Compress DWARF debug sections using specified style. Supported "
-               "styles: 'zlib-gnu' and 'zlib'">;
+               "formats: 'zlib'">;
 def decompress_debug_sections : Flag<["--"], "decompress-debug-sections">,
                                 HelpText<"Decompress DWARF debug sections.">;
 defm split_dwo
     : Eq<"split-dwo", "Equivalent to extract-dwo on the input file to "
                       "<dwo-file>, then strip-dwo on the input file">,
       MetaVarName<"dwo-file">;
 
 defm add_gnu_debuglink