Index: test/tools/llvm-objcopy/dynamic.test =================================================================== --- /dev/null +++ test/tools/llvm-objcopy/dynamic.test @@ -0,0 +1,27 @@ +# RUN: llvm-objcopy %p/Inputs/dynamic.so %t +# RUN: llvm-readobj -dynamic-table %t | FileCheck %s +# RUN: llvm-readobj -sections %t | FileCheck -check-prefix=LINK %s + +#CHECK: DynamicSection [ +#CHECK-NEXT: Tag Type Name/Value +#CHECK-NEXT: 0x0000000000000006 SYMTAB 0x1C8 +#CHECK-NEXT: 0x000000000000000B SYMENT 24 +#CHECK-NEXT: 0x0000000000000005 STRTAB 0x210 +#CHECK-NEXT: 0x000000000000000A STRSZ 5 +#CHECK-NEXT: 0x0000000000000004 HASH 0x1F8 +#CHECK-NEXT: 0x0000000000000000 NULL 0x0 +#CHECK-NEXT:] + +#LINK: Index: 3 +#LINK-NEXT: Name: .dynstr + +#LINK: Name: .dynamic +#LINK-NEXT: Type: SHT_DYNAMIC +#LINK-NEXT: Flags [ +#LINK-NEXT: SHF_ALLOC +#LINK-NEXT: SHF_WRITE +#LINK-NEXT: ] +#LINK-NEXT: Address: +#LINK-NEXT: Offset: +#LINK-NEXT: Size: +#LINK-NEXT: Link: 3 Index: test/tools/llvm-objcopy/dynstr.test =================================================================== --- /dev/null +++ test/tools/llvm-objcopy/dynstr.test @@ -0,0 +1,32 @@ +# RUN: yaml2obj %s > %t +# RUN: llvm-objcopy %t %t2 +# RUN: llvm-readobj -sections -section-data %t2 | FileCheck %s + +!ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC + Machine: EM_X86_64 +Sections: + - Name: .dynstr + Type: SHT_STRTAB + Flags: [ SHF_ALLOC ] + Address: 0x1000 + Content: "002EDEADBEEF002EBAADF00D00" + +#CHECK: Name: .dynstr +#CHECK-NEXT: Type: SHT_STRTAB +#CHECK-NEXT: Flags [ +#CHECK-NEXT: SHF_ALLOC +#CHECK-NEXT: ] +#CHECK-NEXT: Address: 0x1000 +#CHECK-NEXT: Offset: +#CHECK-NEXT: Size: 13 +#CHECK-NEXT: Link: +#CHECK-NEXT: Info: +#CHECK-NEXT: AddressAlignment: +#CHECK-NEXT: EntrySize: +#CHECK-NEXT: SectionData ( +#CHECK-NEXT: 0000: 002EDEAD BEEF002E BAADF00D 00 +#CHECK-NEXT: ) Index: test/tools/llvm-objcopy/dynsym.test =================================================================== --- /dev/null +++ test/tools/llvm-objcopy/dynsym.test @@ -0,0 +1,50 @@ +# RUN: llvm-objcopy %p/Inputs/dynsym.so %t +# RUN: llvm-readobj -dyn-symbols %t | FileCheck %s + +#CHECK: DynamicSymbols [ +#CHECK-NEXT: Symbol { +#CHECK-NEXT: Name: @ (0) +#CHECK-NEXT: Value: 0x0 +#CHECK-NEXT: Size: 0 +#CHECK-NEXT: Binding: Local +#CHECK-NEXT: Type: None (0x0) +#CHECK-NEXT: Other: 0 +#CHECK-NEXT: Section: Undefined (0x0) +#CHECK-NEXT: } +#CHECK-NEXT: Symbol { +#CHECK-NEXT: Name: bang@ (1) +#CHECK-NEXT: Value: 0x4000 +#CHECK-NEXT: Size: 8 +#CHECK-NEXT: Binding: Global (0x1) +#CHECK-NEXT: Type: Object (0x1) +#CHECK-NEXT: Other: 0 +#CHECK-NEXT: Section: .bss (0x7) +#CHECK-NEXT: } +#CHECK-NEXT: Symbol { +#CHECK-NEXT: Name: bar@ (6) +#CHECK-NEXT: Value: 0x1001 +#CHECK-NEXT: Size: 0 +#CHECK-NEXT: Binding: Global (0x1) +#CHECK-NEXT: Type: Function (0x2) +#CHECK-NEXT: Other: 0 +#CHECK-NEXT: Section: .text (0x4) +#CHECK-NEXT: } +#CHECK-NEXT: Symbol { +#CHECK-NEXT: Name: baz@ (10) +#CHECK-NEXT: Value: 0x2000 +#CHECK-NEXT: Size: 0 +#CHECK-NEXT: Binding: Global (0x1) +#CHECK-NEXT: Type: Object (0x1) +#CHECK-NEXT: Other: 0 +#CHECK-NEXT: Section: .data (0x5) +#CHECK-NEXT: } +#CHECK-NEXT: Symbol { +#CHECK-NEXT: Name: foo@ (14) +#CHECK-NEXT: Value: 0x1000 +#CHECK-NEXT: Size: 0 +#CHECK-NEXT: Binding: Global (0x1) +#CHECK-NEXT: Type: Function (0x2) +#CHECK-NEXT: Other: 0 +#CHECK-NEXT: Section: .text (0x4) +#CHECK-NEXT: } +#CHECK-NEXT:] Index: tools/llvm-objcopy/Object.h =================================================================== --- tools/llvm-objcopy/Object.h +++ tools/llvm-objcopy/Object.h @@ -177,6 +177,36 @@ } }; +// Oddly this seems to be a complete duplication of DynamicSection because they +// both need their sh_link to be changed if sections get moved around at all. +// Still logically these are two different things so they have two different +// classes. +class DynamicSymbolTableSection : public Section { +private: + StringTableSection *SymbolNames; + +public: + DynamicSymbolTableSection(llvm::ArrayRef Data) : Section(Data) {} + void setStrTab(StringTableSection *StrTab) { SymbolNames = StrTab; } + void finalize() override; + static bool classof(const SectionBase *S) { + return S->Type == llvm::ELF::SHT_DYNSYM; + } +}; + +class DynamicSection : public Section { +private: + StringTableSection *StrTab; + +public: + DynamicSection(llvm::ArrayRef Data) : Section(Data) {} + void setStrTab(StringTableSection *StrTable) { this->StrTab = StrTable; } + void finalize() override; + static bool classof(const SectionBase *S) { + return S->Type == llvm::ELF::SHT_DYNAMIC; + } +}; + template class Object { private: typedef std::unique_ptr SecPtr; Index: tools/llvm-objcopy/Object.cpp =================================================================== --- tools/llvm-objcopy/Object.cpp +++ tools/llvm-objcopy/Object.cpp @@ -201,6 +201,10 @@ writeRela(reinterpret_cast(Buf)); } +void DynamicSymbolTableSection::finalize() { this->Link = SymbolNames->Index; } + +void DynamicSection::finalize() { this->Link = StrTab->Index; } + // Returns true IFF a section is wholly inside the range of a segment static bool sectionWithinSegment(const SectionBase &Section, const Segment &Segment) { @@ -338,7 +342,26 @@ return Sec; } case SHT_STRTAB: - return llvm::make_unique(); + // If a string table is allocated we don't want to mess with it. That would + // mean altering the memory image. There are no speical link types or + // anything so we can just use a Section + if (Shdr.sh_flags & SHF_ALLOC) { + Data = unwrapOrError(ElfFile.getSectionContents(&Shdr)); + return make_unique
(Data); + } + return make_unique(); + case SHT_HASH: + case SHT_GNU_HASH: + // Hash tables should refer to SHT_DYNSYM which we're not going to change. + // Because of this we don't need to mess with the hash tables anyway + Data = unwrapOrError(ElfFile.getSectionContents(&Shdr)); + return make_unique
(Data); + case SHT_DYNSYM: + Data = unwrapOrError(ElfFile.getSectionContents(&Shdr)); + return make_unique(Data); + case SHT_DYNAMIC: + Data = unwrapOrError(ElfFile.getSectionContents(&Shdr)); + return make_unique(Data); case SHT_SYMTAB: { auto SymTab = make_unique>(); SymbolTable = SymTab.get(); @@ -387,6 +410,14 @@ dyn_cast>(Sections[RelSec->Link - 1].get())); RelSec->setSection(Sections[RelSec->Info - 1].get()); } + if (auto DynamicSec = dyn_cast(Section.get())) { + DynamicSec->setStrTab( + dyn_cast(Sections[DynamicSec->Link - 1].get())); + } + if (auto DynSymTab = dyn_cast(Section.get())) { + DynSymTab->setStrTab( + dyn_cast(Sections[DynSymTab->Link - 1].get())); + } } }