replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ELF][Writer] Add hash table. 

llvm-svn: 175972
This commit is contained in:
Michael J. Spencer 2013-02-23 19:46:18 +00:00
parent 5352e644b3
commit 3407211b2f
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lld/lib/ReaderWriter/ELF/SectionChunks.h
View File

@ -836,6 +836,43 @@ public:
private:
StringRef _interp;
};
template <class ELFT> class HashSection : public Section<ELFT> {
struct SymbolTableEntry {
StringRef _name;
uint32_t _index;
};
public:
HashSection(const ELFTargetInfo &ti, StringRef name, int32_t order)
: Section<ELFT>(ti, name) {
this->setOrder(order);
this->_align2 = 4; // Alignment of Elf32_Word.
this->_type = SHT_HASH;
this->_flags = SHF_ALLOC;
// The size of nbucket and nchain.
this->_fsize = 8;
this->_msize = this->_fsize;
}
void addSymbol(StringRef name, uint32_t index) {
SymbolTableEntry ste;
ste._name = name;
ste._index = index;
_entries.push_back(ste);
}
virtual void write(ELFWriter *writer, llvm::FileOutputBuffer &buffer) {
uint8_t *chunkBuffer = buffer.getBufferStart();
uint8_t *dest = chunkBuffer + this->fileOffset();
// TODO: Calculate hashes and build the hash table in finalize. We currently
// just emit an empty hash table so the dynamic loader doesn't crash.
std::memset(dest, 0, this->_fsize);
}
private:
std::vector<SymbolTableEntry> _entries;
};
} // end namespace elf
} // end namespace lld

4
lld/lib/ReaderWriter/ELF/Writer.cpp
View File

@ -72,6 +72,7 @@ private:
LLD_UNIQUE_BUMP_PTR(DynamicSymbolTable<ELFT>) _dynamicSymbolTable;
LLD_UNIQUE_BUMP_PTR(StringTable<ELFT>) _dynamicStringTable;
LLD_UNIQUE_BUMP_PTR(InterpSection<ELFT>) _interpSection;
LLD_UNIQUE_BUMP_PTR(HashSection<ELFT>) _hashTable;
/// @}
CRuntimeFile<ELFT> _runtimeFile;
};
@ -348,10 +349,13 @@ void ExecutableWriter<ELFT>::createDefaultSections() {
_interpSection.reset(new (_alloc) InterpSection<ELFT>(
_targetInfo, ".interp", DefaultLayout<ELFT>::ORDER_INTERP,
_targetInfo.getInterpreter()));
_hashTable.reset(new (_alloc) HashSection<ELFT>(
_targetInfo, ".hash", DefaultLayout<ELFT>::ORDER_HASH));
_layout->addSection(_dynamicTable.get());
_layout->addSection(_dynamicStringTable.get());
_layout->addSection(_dynamicSymbolTable.get());
_layout->addSection(_interpSection.get());
_layout->addSection(_hashTable.get());
_dynamicSymbolTable->setStringSection(_dynamicStringTable.get());
}

7
lld/test/elf/dynamic-hash.test Normal file
View File

@ -0,0 +1,7 @@
RUN: lld -core -target x86_64-linux %p/Inputs/use-shared.x86-64 \
RUN: %p/Inputs/shared.so-x86-64 -output=%t -entry=main \
RUN: -output-type=dynamic
RUN: llvm-readobj %t | FileCheck %s
CHECK: Sections:
CHECK: .hash {{[0-9a-f]+}} 8 4 required,rodata