From cf51c80bf1adfa3bb2eb0ac5a8990a076b4c7256 Mon Sep 17 00:00:00 2001 From: Paul Semel Date: Sat, 26 May 2018 08:10:37 +0000 Subject: [llvm-objcopy] Add --keep-file-symbols option This option prevent from removing file symbols while removing symbols. Differential Revision: https://reviews.llvm.org/D46830 llvm-svn: 333339 --- llvm/tools/llvm-objcopy/ObjcopyOpts.td | 2 ++ llvm/tools/llvm-objcopy/llvm-objcopy.cpp | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'llvm/tools/llvm-objcopy') diff --git a/llvm/tools/llvm-objcopy/ObjcopyOpts.td b/llvm/tools/llvm-objcopy/ObjcopyOpts.td index e7c7541a32c..4e337e6db9e 100644 --- a/llvm/tools/llvm-objcopy/ObjcopyOpts.td +++ b/llvm/tools/llvm-objcopy/ObjcopyOpts.td @@ -92,3 +92,5 @@ def only_keep_debug : Flag<["-", "--"], "only-keep-debug">, HelpText<"Currently ignored. Only for compaitability 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">; diff --git a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp index 0a5b5b0d066..da8c6ee776a 100644 --- a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp +++ b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp @@ -174,6 +174,7 @@ struct CopyConfig { bool Weaken = false; bool DiscardAll = false; bool OnlyKeepDebug = false; + bool KeepFileSymbols = false; }; using SectionPred = std::function; @@ -273,8 +274,9 @@ void HandleArgs(const CopyConfig &Config, Object &Obj, const Reader &Reader, } Obj.removeSymbols([&](const Symbol &Sym) { - if (!Config.SymbolsToKeep.empty() && - is_contained(Config.SymbolsToKeep, Sym.Name)) + if ((!Config.SymbolsToKeep.empty() && + is_contained(Config.SymbolsToKeep, Sym.Name)) || + (Config.KeepFileSymbols && Sym.Type == STT_FILE)) return false; if (Config.DiscardAll && Sym.Binding == STB_LOCAL && @@ -410,7 +412,8 @@ void HandleArgs(const CopyConfig &Config, Object &Obj, const Reader &Reader, // and at least one of those symbols is present // (equivalently, the updated symbol table is not empty) // the symbol table and the string table should not be removed. - if (!Config.SymbolsToKeep.empty() && !Obj.SymbolTable->empty()) { + if ((!Config.SymbolsToKeep.empty() || Config.KeepFileSymbols) && + !Obj.SymbolTable->empty()) { RemovePred = [&Obj, RemovePred](const SectionBase &Sec) { if (&Sec == Obj.SymbolTable || &Sec == Obj.SymbolTable->getStrTab()) return false; @@ -531,6 +534,7 @@ CopyConfig ParseObjcopyOptions(ArrayRef ArgsArr) { Config.Weaken = InputArgs.hasArg(OBJCOPY_weaken); Config.DiscardAll = InputArgs.hasArg(OBJCOPY_discard_all); Config.OnlyKeepDebug = InputArgs.hasArg(OBJCOPY_only_keep_debug); + Config.KeepFileSymbols = InputArgs.hasArg(OBJCOPY_keep_file_symbols); for (auto Arg : InputArgs.filtered(OBJCOPY_localize_symbol)) Config.SymbolsToLocalize.push_back(Arg->getValue()); for (auto Arg : InputArgs.filtered(OBJCOPY_globalize_symbol)) -- cgit v1.2.3