[llvm] r330963 - [llvm-objcopy] Add --localize-symbol option
Paul Semel via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 26 10:44:43 PDT 2018
Author: paulsemel
Date: Thu Apr 26 10:44:43 2018
New Revision: 330963
URL: http://llvm.org/viewvc/llvm-project?rev=330963&view=rev
Log:
[llvm-objcopy] Add --localize-symbol option
Added:
llvm/trunk/test/tools/llvm-objcopy/localize.test
Modified:
llvm/trunk/tools/llvm-objcopy/Opts.td
llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp
Added: llvm/trunk/test/tools/llvm-objcopy/localize.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/localize.test?rev=330963&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/localize.test (added)
+++ llvm/trunk/test/tools/llvm-objcopy/localize.test Thu Apr 26 10:44:43 2018
@@ -0,0 +1,81 @@
+# RUN: yaml2obj %s > %t
+# RUN: llvm-objcopy --localize-symbol Global -L Local -L Weak %t %t2
+# RUN: llvm-readobj -symbols %t2 | FileCheck %s
+
+!ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+Sections:
+ - Name: .text
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+ Address: 0x1000
+ AddressAlign: 0x0000000000000010
+ Size: 64
+ - Name: .data
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC ]
+ Address: 0x2000
+ AddressAlign: 0x0000000000000010
+ Content: "0000000000000000"
+Symbols:
+ Local:
+ - Name: Local
+ Type: STT_FUNC
+ Section: .text
+ Value: 0x1000
+ Size: 8
+ Weak:
+ - Name: Weak
+ Type: STT_FUNC
+ Size: 8
+ Section: .text
+ Value: 0x1008
+ Global:
+ - Name: Global
+ Type: STT_FUNC
+ Size: 8
+ Section: .text
+ Value: 0x1010
+
+#CHECK: Symbols [
+#CHECK-NEXT: Symbol {
+#CHECK-NEXT: Name:
+#CHECK-NEXT: Value: 0x0
+#CHECK-NEXT: Size: 0
+#CHECK-NEXT: Binding: Local
+#CHECK-NEXT: Type: None
+#CHECK-NEXT: Other: 0
+#CHECK-NEXT: Section: Undefined
+#CHECK-NEXT: }
+#CHECK-NEXT: Symbol {
+#CHECK-NEXT: Name: Local
+#CHECK-NEXT: Value: 0x1000
+#CHECK-NEXT: Size: 8
+#CHECK-NEXT: Binding: Local
+#CHECK-NEXT: Type: Function
+#CHECK-NEXT: Other: 0
+#CHECK-NEXT: Section: .text
+#CHECK-NEXT: }
+#CHECK-NEXT: Symbol {
+#CHECK-NEXT: Name: Global
+#CHECK-NEXT: Value: 0x1010
+#CHECK-NEXT: Size: 8
+#CHECK-NEXT: Binding: Local
+#CHECK-NEXT: Type: Function
+#CHECK-NEXT: Other: 0
+#CHECK-NEXT: Section: .text
+#CHECK-NEXT: }
+#CHECK-NEXT: Symbol {
+#CHECK-NEXT: Name: Weak
+#CHECK-NEXT: Value: 0x1008
+#CHECK-NEXT: Size: 8
+#CHECK-NEXT: Binding: Local
+#CHECK-NEXT: Type: Function
+#CHECK-NEXT: Other: 0
+#CHECK-NEXT: Section: .text
+#CHECK-NEXT: }
+#CHECK-NEXT:]
Modified: llvm/trunk/tools/llvm-objcopy/Opts.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/Opts.td?rev=330963&r1=330962&r2=330963&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/Opts.td (original)
+++ llvm/trunk/tools/llvm-objcopy/Opts.td Thu Apr 26 10:44:43 2018
@@ -56,3 +56,8 @@ def extract_dwo : Flag<["-", "--"], "ext
HelpText<"Remove all sections that are not DWARF .dwo sections from file">;
def localize_hidden : Flag<["-", "--"], "localize-hidden">,
HelpText<"Mark all symbols that have hidden or internal visibility as local">;
+defm localize_symbol : Eq<"localize-symbol">,
+ MetaVarName<"symbol">,
+ HelpText<"Mark <symbol> as local">;
+def L : JoinedOrSeparate<["-"], "L">,
+ Alias<localize_symbol>;
Modified: llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp?rev=330963&r1=330962&r2=330963&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp (original)
+++ llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp Thu Apr 26 10:44:43 2018
@@ -118,6 +118,7 @@ struct CopyConfig {
std::vector<StringRef> Keep;
std::vector<StringRef> OnlyKeep;
std::vector<StringRef> AddSection;
+ std::vector<StringRef> LocalizeSymbol;
bool StripAll;
bool StripAllGNU;
bool StripDebug;
@@ -129,6 +130,7 @@ struct CopyConfig {
};
using SectionPred = std::function<bool(const SectionBase &Sec)>;
+using SymbolPred = std::function<bool(const Symbol &Sym)>;
bool IsDWOSection(const SectionBase &Sec) { return Sec.Name.endswith(".dwo"); }
@@ -188,14 +190,27 @@ void HandleArgs(const CopyConfig &Config
SplitDWOToFile(Config, Reader, Config.SplitDWO, OutputElfType);
}
+ SymbolPred LocalizePred = [](const Symbol &) { return false; };
+
// Localize:
if (Config.LocalizeHidden) {
- Obj.SymbolTable->localize([](const Symbol &Sym) {
+ LocalizePred = [](const Symbol &Sym) {
return Sym.Visibility == STV_HIDDEN || Sym.Visibility == STV_INTERNAL;
- });
+ };
+ }
+
+ if (!Config.LocalizeSymbol.empty()) {
+ LocalizePred = [LocalizePred, &Config](const Symbol &Sym) {
+ return LocalizePred(Sym) ||
+ std::find(std::begin(Config.LocalizeSymbol),
+ std::end(Config.LocalizeSymbol),
+ Sym.Name) != std::end(Config.LocalizeSymbol);
+ };
}
+ Obj.SymbolTable->localize(LocalizePred);
+
SectionPred RemovePred = [](const SectionBase &) { return false; };
// Removes:
@@ -398,6 +413,8 @@ CopyConfig ParseObjcopyOptions(ArrayRef<
Config.StripNonAlloc = InputArgs.hasArg(OBJCOPY_strip_non_alloc);
Config.ExtractDWO = InputArgs.hasArg(OBJCOPY_extract_dwo);
Config.LocalizeHidden = InputArgs.hasArg(OBJCOPY_localize_hidden);
+ for (auto Arg : InputArgs.filtered(OBJCOPY_localize_symbol))
+ Config.LocalizeSymbol.push_back(Arg->getValue());
return Config;
}
More information about the llvm-commits
mailing list