maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make ObjectFiles private. NFC. 

Just preparation for adding support for shared libraries.

llvm-svn: 246793
This commit is contained in:
Rafael Espindola 2015-09-03 18:56:20 +00:00
parent 50456fb98e
commit 222edc66d6
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/ELF/Driver.cpp
View File

@ -98,7 +98,7 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
Symtab.reportRemainingUndefines(); Symtab.reportRemainingUndefines();
// Write the result. // Write the result.
ObjectFileBase &FirstObj = *Symtab.ObjectFiles[0]; ObjectFileBase &FirstObj = *Symtab.getObjectFiles()[0];
switch (FirstObj.getELFKind()) { switch (FirstObj.getELFKind()) {
case ELF32LEKind: case ELF32LEKind:
writeResult<object::ELF32LE>(&Symtab); writeResult<object::ELF32LE>(&Symtab);

10
lld/ELF/SymbolTable.h
View File

@ -37,13 +37,14 @@ public:
// Print an error message on undefined symbols. // Print an error message on undefined symbols.
void reportRemainingUndefines(); void reportRemainingUndefines();
// The writer needs to infer the machine type from the object files.
std::vector<std::unique_ptr<ObjectFileBase>> ObjectFiles;
const llvm::DenseMap<StringRef, Symbol *> &getSymbols() const { const llvm::DenseMap<StringRef, Symbol *> &getSymbols() const {
return Symtab; return Symtab;
} }
const std::vector<std::unique_ptr<ObjectFileBase>> &getObjectFiles() const {
return ObjectFiles;
}
private: private:
void addObject(ObjectFileBase *File); void addObject(ObjectFileBase *File);
@ -52,6 +53,9 @@ private:
llvm::DenseMap<StringRef, Symbol *> Symtab; llvm::DenseMap<StringRef, Symbol *> Symtab;
llvm::BumpPtrAllocator Alloc; llvm::BumpPtrAllocator Alloc;
// The writer needs to infer the machine type from the object files.
std::vector<std::unique_ptr<ObjectFileBase>> ObjectFiles;
}; };
} // namespace elf2 } // namespace elf2

4
lld/ELF/Writer.cpp
View File

@ -432,7 +432,7 @@ template <class ELFT> void Writer<ELFT>::createSections() {
}; };
const SymbolTable &Symtab = SymTable.getSymTable(); const SymbolTable &Symtab = SymTable.getSymTable();
for (const std::unique_ptr<ObjectFileBase> &FileB : Symtab.ObjectFiles) { for (const std::unique_ptr<ObjectFileBase> &FileB : Symtab.getObjectFiles()) {
auto &File = cast<ObjectFile<ELFT>>(*FileB); auto &File = cast<ObjectFile<ELFT>>(*FileB);
for (SectionChunk<ELFT> *C : File.getChunks()) { for (SectionChunk<ELFT> *C : File.getChunks()) {
if (!C) if (!C)
@ -543,7 +543,7 @@ template <class ELFT> void Writer<ELFT>::writeHeader() {
EHdr->e_type = ET_EXEC; EHdr->e_type = ET_EXEC;
const SymbolTable &Symtab = SymTable.getSymTable(); const SymbolTable &Symtab = SymTable.getSymTable();
auto &FirstObj = cast<ObjectFile<ELFT>>(*Symtab.ObjectFiles[0]); auto &FirstObj = cast<ObjectFile<ELFT>>(*Symtab.getObjectFiles()[0]);
EHdr->e_machine = FirstObj.getObj()->getHeader()->e_machine; EHdr->e_machine = FirstObj.getObj()->getHeader()->e_machine;
EHdr->e_version = EV_CURRENT; EHdr->e_version = EV_CURRENT;
EHdr->e_entry = 0x401000; EHdr->e_entry = 0x401000;