diff options
| author | Fangrui Song <i@maskray.me> | 2022-07-29 15:46:51 -0700 |
|---|---|---|
| committer | Fangrui Song <i@maskray.me> | 2022-07-29 15:46:51 -0700 |
| commit | ce6dd4e835a31ce92e6b890982028431c28c333f (patch) | |
| tree | d222b6481f49c22a91556e12f10552225be7ef0f /llvm/tools/llvm-objcopy | |
| parent | 944a86de7c504121da8958b37b7fe8fff53d43a2 (diff) | |
| download | llvm-ce6dd4e835a31ce92e6b890982028431c28c333f.zip llvm-ce6dd4e835a31ce92e6b890982028431c28c333f.tar.gz llvm-ce6dd4e835a31ce92e6b890982028431c28c333f.tar.bz2 | |
Revert D130458 "[llvm-objcopy] Support --{,de}compress-debug-sections for zstd"
This reverts commit c26dc2904b95b3685d883e760e84046ea6c33d7f.
The new Zstd dispatch has an ongoing design discussion related to https://reviews.llvm.org/D130516#3688123 .
Revert for now before it is resolved.
Diffstat (limited to 'llvm/tools/llvm-objcopy')
| -rw-r--r-- | llvm/tools/llvm-objcopy/ObjcopyOptions.cpp | 21 | ||||
| -rw-r--r-- | llvm/tools/llvm-objcopy/ObjcopyOpts.td | 2 |
2 files changed, 6 insertions, 17 deletions
diff --git a/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp b/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp index 7d4e651..7db1e79 100644 --- a/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp +++ b/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp @@ -722,27 +722,16 @@ objcopy::parseObjcopyOptions(ArrayRef<const char *> RawArgsArr, if (const auto *A = InputArgs.getLastArg(OBJCOPY_compress_debug_sections)) { Config.CompressionType = StringSwitch<DebugCompressionType>(A->getValue()) .Case("zlib", DebugCompressionType::Z) - .Case("zstd", DebugCompressionType::Zstd) .Default(DebugCompressionType::None); - switch (Config.CompressionType) { - case DebugCompressionType::None: + if (Config.CompressionType == DebugCompressionType::None) return createStringError( errc::invalid_argument, "invalid or unsupported --compress-debug-sections format: %s", A->getValue()); - case DebugCompressionType::Z: - if (!compression::zlib::isAvailable()) - return createStringError( - errc::invalid_argument, - "LLVM was not compiled with LLVM_ENABLE_ZLIB: cannot compress"); - break; - case DebugCompressionType::Zstd: - if (!compression::zstd::isAvailable()) - return createStringError( - errc::invalid_argument, - "LLVM was not compiled with LLVM_ENABLE_ZSTD: cannot compress"); - break; - } + if (!compression::zlib::isAvailable()) + return createStringError( + errc::invalid_argument, + "LLVM was not compiled with LLVM_ENABLE_ZLIB: can not compress"); } Config.AddGnuDebugLink = InputArgs.getLastArgValue(OBJCOPY_add_gnu_debuglink); diff --git a/llvm/tools/llvm-objcopy/ObjcopyOpts.td b/llvm/tools/llvm-objcopy/ObjcopyOpts.td index 0fddd44..d3713b5 100644 --- a/llvm/tools/llvm-objcopy/ObjcopyOpts.td +++ b/llvm/tools/llvm-objcopy/ObjcopyOpts.td @@ -33,7 +33,7 @@ def compress_debug_sections : Joined<["--"], "compress-debug-sections=">, MetaVarName<"format">, HelpText<"Compress DWARF debug sections using specified format. Supported " - "formats: zlib, zstd. Select zlib if <format> is omitted">; + "formats: zlib">; def : Flag<["--"], "compress-debug-sections">, Alias<compress_debug_sections>, AliasArgs<["zlib"]>; def decompress_debug_sections : Flag<["--"], "decompress-debug-sections">, |