Index: llvm/test/tools/llvm-elfabi/binary-read-neededlibs.test =================================================================== --- /dev/null +++ llvm/test/tools/llvm-elfabi/binary-read-neededlibs.test @@ -0,0 +1,56 @@ +# RUN: yaml2obj %s > %t +# RUN: llvm-elfabi %t -emit-tbe=%t2 +# RUN: cat %t2 | FileCheck %s + +!ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN + Machine: EM_X86_64 +Sections: + - Name: .dynamic + Type: SHT_DYNAMIC + Flags: [ SHF_ALLOC ] + Address: 0x1000 + Content: "010000000000000001000000000000000e00000000000000150000000000000001000000000000000b000000000000000a000000000000001c000000000000000500000000000000d00200000000000000000000000000000000000000000000" + # DT_NEEDED 1 (0x01) + # DT_SONAME 21 (0x15) + # DT_NEEDED 11 (0x0b) + # DT_STRSZ 36 (0x24) + # DT_STRTAB 0x2b0 + # DT_NULL 0x0 + Size: 96 + - Name: .dynsym + Type: SHT_DYNSYM + Flags: [ SHF_ALLOC ] + Address: 0x2000 + EntSize: 24 + Size: 0 + Link: .dynstr + - Name: .dynstr + Type: SHT_STRTAB + Flags: [ SHF_ALLOC ] + Address: 0x3000 +# \0 l i b f o o . s o\0 l i b b a r . s o\0 s o m e l i b . s o\0 f o o\0 + Content: "006c6962666f6f2e736f006c69626261722e736f00736f6d656c69622e736f00666f6f00" +ProgramHeaders: + - Type: PT_LOAD + VAddr: 0x0000 + PAddr: 0x0000 + - Type: PT_DYNAMIC + Flags: [ PF_X, PF_R ] + VAddr: 0x1000 + PAddr: 0x1000 + Sections: + - Section: .dynamic + +#CHECK: --- !tapi-tbe +#CHECK-NEXT: TbeVersion: {{[1-9]\d*\.(0|([1-9]\d*))}} +#CHECK-NEXT: SoName: somelib.so +#CHECK-NEXT: Arch: x86_64 +#CHECK-NEXT: NeededLibs: +#CHECK-NEXT: - libfoo.so +#CHECK-NEXT: - libbar.so +#CHECK-NEXT: Symbols: {} +#CHECK-NEXT: ... Index: llvm/tools/llvm-elfabi/ELFObjHandler.h =================================================================== --- llvm/tools/llvm-elfabi/ELFObjHandler.h +++ llvm/tools/llvm-elfabi/ELFObjHandler.h @@ -57,6 +57,19 @@ const typename ELFT::DynRange &DynamicEntries, StringRef DynStr); +/// Populate the `NeededLibs` member of an ELFStub. +/// Since NeededLibs is optional, this doesn't return any errors and will simply +/// return the number of located occurrences of DT_NEEDED entries. +/// @param TargetStub An ELFStub whose NeededLibs member will be populated. +/// @param DynamicEntries Dynamic entries to pull DT_NEEDED entries from. +/// @param DynStr String table containing library names. +/// +/// @return Number of DT_NEEDED entries read and added to NeededLibs. +template +int populateNeededLibs(ELFStub &TargetStub, + const typename ELFT::DynRange &DynamicEntries, + StringRef DynStr); + /// Attempt to read a binary ELF file from a MemoryBuffer reference. Expected> readELFFile(MemoryBufferRef Buf); Index: llvm/tools/llvm-elfabi/ELFObjHandler.cpp =================================================================== --- llvm/tools/llvm-elfabi/ELFObjHandler.cpp +++ llvm/tools/llvm-elfabi/ELFObjHandler.cpp @@ -66,7 +66,9 @@ // Populate SoName from .dynamic entries and dynamic string table. populateSoName(*DestStub, DynamicEntries, DynStr); - // TODO: Populate NeededLibs from .dynamic entries and linked string table. + // Populate NeededLibs from .dynamic entries and dynamic string table. + populateNeededLibs(*DestStub, DynamicEntries, DynStr); + // TODO: Populate Symbols from .dynsym table and linked string table. return std::move(DestStub); @@ -116,6 +118,23 @@ return false; } +template +int populateNeededLibs(ELFStub &TargetStub, + const typename ELFT::DynRange &DynamicEntries, + StringRef DynStr) { + uint64_t NeededLibCount = 0; + for (auto &Entry : DynamicEntries) { + if (Entry.d_tag == DT_NEEDED) { + uint64_t LibNameOffset = Entry.d_un.d_val; + const char *SoNamePtr = DynStr.data() + LibNameOffset; + TargetStub.NeededLibs.push_back(SoNamePtr); + NeededLibCount++; + } + } + + return NeededLibCount; +} + template Error populateArch(ELFStub &TargetStub, const typename ELFT::Ehdr &Header) { TargetStub.Arch = Header.e_machine;