diff options
| author | Yi Kong <yikong@google.com> | 2020-04-21 12:04:01 +0800 |
|---|---|---|
| committer | Yi Kong <yikong@google.com> | 2020-04-21 12:04:01 +0800 |
| commit | 37a1c2eda54aaf0a96045e8013f8f61398ffe49e (patch) | |
| tree | 414cb5b24bed676647dfafcfa2ef0a7a8751c3ab /llvm/tools/llvm-objcopy/CopyConfig.cpp | |
| parent | 7c65e88d0bc85ff2732a4e23c397ff842b97b828 (diff) | |
| download | llvm-37a1c2eda54aaf0a96045e8013f8f61398ffe49e.zip llvm-37a1c2eda54aaf0a96045e8013f8f61398ffe49e.tar.gz llvm-37a1c2eda54aaf0a96045e8013f8f61398ffe49e.tar.bz2 | |
Revert "[llvm-objcopy] Match GNU behaviour regarding file symbols"
This reverts commit 7c65e88d0bc85ff2732a4e23c397ff842b97b828.
Broke non ELF targets.
Diffstat (limited to 'llvm/tools/llvm-objcopy/CopyConfig.cpp')
| -rw-r--r-- | llvm/tools/llvm-objcopy/CopyConfig.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/llvm/tools/llvm-objcopy/CopyConfig.cpp b/llvm/tools/llvm-objcopy/CopyConfig.cpp index ff12e4b..df2fbbb 100644 --- a/llvm/tools/llvm-objcopy/CopyConfig.cpp +++ b/llvm/tools/llvm-objcopy/CopyConfig.cpp @@ -667,10 +667,8 @@ parseObjcopyOptions(ArrayRef<const char *> ArgsArr, Config.KeepFileSymbols = InputArgs.hasArg(OBJCOPY_keep_file_symbols); Config.DecompressDebugSections = InputArgs.hasArg(OBJCOPY_decompress_debug_sections); - if (Config.DiscardMode == DiscardType::All) { + if (Config.DiscardMode == DiscardType::All) Config.StripDebug = true; - Config.KeepFileSymbols = true; - } for (auto Arg : InputArgs.filtered(OBJCOPY_localize_symbol)) if (Error E = Config.SymbolsToLocalize.addMatcher(NameOrPattern::create( Arg->getValue(), SymbolMatchStyle, ErrorCallback))) @@ -940,10 +938,8 @@ parseStripOptions(ArrayRef<const char *> ArgsArr, !Config.StripAllGNU && Config.SymbolsToRemove.empty()) Config.StripAll = true; - if (Config.DiscardMode == DiscardType::All) { + if (Config.DiscardMode == DiscardType::All) Config.StripDebug = true; - Config.KeepFileSymbols = true; - } Config.DeterministicArchives = InputArgs.hasFlag(STRIP_enable_deterministic_archives, |