Index: test/tools/llvm-objcopy/strip-unneeded.test =================================================================== --- /dev/null +++ test/tools/llvm-objcopy/strip-unneeded.test @@ -0,0 +1,114 @@ +# RUN: yaml2obj %s > %t +# RUN: llvm-objcopy --strip-unneeded %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: .rel.text + Type: SHT_REL + Link: .symtab + Info: .text + Relocations: + - Offset: 0x1000 + Symbol: foo + Type: R_X86_64_PC32 +Symbols: + Local: + - Name: foo + Type: STT_FUNC + Section: .text + Value: 0x1000 + Size: 8 + - Name: bar + Type: STT_FUNC + Size: 8 + Section: .text + Value: 0x1008 + - Name: fileSymbol + Type: STT_FILE + - Name: sectionSymbol + Type: STT_SECTION + Weak: + - Name: baz + Type: STT_FUNC + Size: 8 + Section: .text + Value: 0x1010 + - Name: foobaz + Type: STT_FUNC + Global: + - Name: foobar + Type: STT_FUNC + - Name: barbaz + Type: STT_FUNC + Size: 8 + Section: .text + Value: 0x1018 + +#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: foo +#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: fileSymbol +#CHECK-NEXT: Value: 0x0 +#CHECK-NEXT: Size: 0 +#CHECK-NEXT: Binding: Local +#CHECK-NEXT: Type: File +#CHECK-NEXT: Other: 0 +#CHECK-NEXT: Section: Undefined +#CHECK-NEXT: } +#CHECK-NEXT: Symbol { +#CHECK-NEXT: Name: sectionSymbol +#CHECK-NEXT: Value: 0x0 +#CHECK-NEXT: Size: 0 +#CHECK-NEXT: Binding: Local +#CHECK-NEXT: Type: Section +#CHECK-NEXT: Other: 0 +#CHECK-NEXT: Section: Undefined +#CHECK-NEXT: } +#CHECK-NEXT: Symbol { +#CHECK-NEXT: Name: barbaz +#CHECK-NEXT: Value: 0x1018 +#CHECK-NEXT: Size: 8 +#CHECK-NEXT: Binding: Global +#CHECK-NEXT: Type: Function +#CHECK-NEXT: Other: 0 +#CHECK-NEXT: Section: .text +#CHECK-NEXT: } +#CHECK-NEXT: Symbol { +#CHECK-NEXT: Name: baz +#CHECK-NEXT: Value: 0x1010 +#CHECK-NEXT: Size: 8 +#CHECK-NEXT: Binding: Weak +#CHECK-NEXT: Type: Function +#CHECK-NEXT: Other: 0 +#CHECK-NEXT: Section: .text +#CHECK-NEXT: } +#CHECK-NEXT:] Index: tools/llvm-objcopy/ObjcopyOpts.td =================================================================== --- tools/llvm-objcopy/ObjcopyOpts.td +++ tools/llvm-objcopy/ObjcopyOpts.td @@ -88,3 +88,5 @@ HelpText<"Do not remove symbol ">; def K : JoinedOrSeparate<["-"], "K">, Alias; +def strip_unneeded : Flag<["-", "--"], "strip-unneeded">, + HelpText<"Remove all symbols not needed by relocations">; Index: tools/llvm-objcopy/Object.h =================================================================== --- tools/llvm-objcopy/Object.h +++ tools/llvm-objcopy/Object.h @@ -344,6 +344,7 @@ uint8_t Type; uint64_t Value; uint8_t Visibility; + uint32_t RelocRefs; uint16_t getShndx() const; }; @@ -367,6 +368,7 @@ void addSymbolNames(); const SectionBase *getStrTab() const { return SymbolNames; } const Symbol *getSymbolByIndex(uint32_t Index) const; + Symbol *getSymbolByIndex(uint32_t Index); void updateSymbols(function_ref Callable); void removeSectionReferences(const SectionBase *Sec) override; @@ -381,7 +383,7 @@ }; struct Relocation { - const Symbol *RelocSymbol = nullptr; + Symbol *RelocSymbol = nullptr; uint64_t Offset; uint64_t Addend; uint32_t Type; @@ -432,6 +434,7 @@ std::vector Relocations; public: + ~RelocationSection(); void addRelocation(Relocation Rel) { Relocations.push_back(Rel); } void accept(SectionVisitor &Visitor) const override; void removeSymbols(function_ref ToRemove) override; @@ -449,7 +452,7 @@ class GroupSection : public SectionBase { MAKE_SEC_WRITER_FRIEND const SymbolTableSection *SymTab = nullptr; - const Symbol *Sym = nullptr; + Symbol *Sym = nullptr; ELF::Elf32_Word FlagWord; SmallVector GroupMembers; @@ -459,9 +462,10 @@ ArrayRef Contents; explicit GroupSection(ArrayRef Data) : Contents(Data) {} + ~GroupSection() { --Sym->RelocRefs; } void setSymTab(const SymbolTableSection *SymTabSec) { SymTab = SymTabSec; } - void setSymbol(const Symbol *S) { Sym = S; } + void setSymbol(Symbol *S) { Sym = S; ++Sym->RelocRefs; } void setFlagWord(ELF::Elf32_Word W) { FlagWord = W; } void addMember(SectionBase *Sec) { GroupMembers.push_back(Sec); } Index: tools/llvm-objcopy/Object.cpp =================================================================== --- tools/llvm-objcopy/Object.cpp +++ tools/llvm-objcopy/Object.cpp @@ -185,6 +185,7 @@ Sym.Visibility = Visibility; Sym.Size = Sz; Sym.Index = Symbols.size(); + Sym.RelocRefs = 0; Symbols.emplace_back(llvm::make_unique(Sym)); Size += this->EntrySize; } @@ -255,6 +256,11 @@ return Symbols[Index].get(); } +Symbol *SymbolTableSection::getSymbolByIndex(uint32_t Index) { + return const_cast( + static_cast(this)->getSymbolByIndex(Index)); +} + template void ELFSectionWriter::visit(const SymbolTableSection &Sec) { uint8_t *Buf = Out.getBufferStart(); @@ -344,6 +350,12 @@ Visitor.visit(*this); } +RelocationSection::~RelocationSection() { + for (auto& Rel : Relocations) { + --Rel.RelocSymbol->RelocRefs; + } +} + void RelocationSection::removeSymbols( function_ref ToRemove) { for (const Relocation &Reloc : Relocations) @@ -647,7 +659,9 @@ ToAdd.Offset = Rel.r_offset; getAddend(ToAdd.Addend, Rel); ToAdd.Type = Rel.getType(false); - ToAdd.RelocSymbol = SymbolTable->getSymbolByIndex(Rel.getSymbol(false)); + Symbol *Sym = SymbolTable->getSymbolByIndex(Rel.getSymbol(false)); + ++Sym->RelocRefs; + ToAdd.RelocSymbol = Sym; Relocs->addRelocation(ToAdd); } } Index: tools/llvm-objcopy/llvm-objcopy.cpp =================================================================== --- tools/llvm-objcopy/llvm-objcopy.cpp +++ tools/llvm-objcopy/llvm-objcopy.cpp @@ -156,6 +156,7 @@ bool StripSections = false; bool StripNonAlloc = false; bool StripDWO = false; + bool StripUnneeded = false; bool ExtractDWO = false; bool LocalizeHidden = false; bool Weaken = false; @@ -388,6 +389,13 @@ return true; } + // TODO: We might handle the 'null symbol' in a different way + // by probably handling it the same way as we handle 'null section' ? + if (Config.StripUnneeded && !Sym.RelocRefs && Sym.Index != 0 && + (Sym.Binding == STB_LOCAL || Sym.getShndx() == SHN_UNDEF) && + Sym.Type != STT_FILE && Sym.Type != STT_SECTION) + return true; + return false; }); } @@ -478,6 +486,7 @@ Config.StripDWO = InputArgs.hasArg(OBJCOPY_strip_dwo); Config.StripSections = InputArgs.hasArg(OBJCOPY_strip_sections); Config.StripNonAlloc = InputArgs.hasArg(OBJCOPY_strip_non_alloc); + Config.StripUnneeded = InputArgs.hasArg(OBJCOPY_strip_unneeded); Config.ExtractDWO = InputArgs.hasArg(OBJCOPY_extract_dwo); Config.LocalizeHidden = InputArgs.hasArg(OBJCOPY_localize_hidden); Config.Weaken = InputArgs.hasArg(OBJCOPY_weaken);