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

Simplify -e <number> option handling. 

This patch is to parse the entry symbol name lazily.

llvm-svn: 288882
This commit is contained in:
Rui Ueyama 2016-12-07 03:23:06 +00:00
parent 67ec0eb531
commit a1407c4fdf
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lld/ELF/Config.h
View File

@ -148,7 +148,6 @@ struct Configuration {
ELFKind EKind = ELFNoneKind;
uint16_t DefaultSymbolVersion = llvm::ELF::VER_NDX_GLOBAL;
uint16_t EMachine = llvm::ELF::EM_NONE;
uint64_t EntryAddr = 0;
uint64_t ErrorLimit = 20;
uint64_t ImageBase;
uint64_t MaxPageSize;

14
lld/ELF/Driver.cpp
View File

@ -780,18 +780,10 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &Args) {
for (InputFile *F : Files)
Symtab.addFile(F);
// Add the start symbol.
// It initializes either Config->Entry or Config->EntryAddr.
// Note that AMDGPU binaries have no entries.
if (!Config->Entry.empty()) {
// It is either "-e <addr>" or "-e <symbol>".
if (!Config->Entry.getAsInteger(0, Config->EntryAddr))
Config->Entry = "";
} else if (!Config->Relocatable && Config->EMachine != EM_AMDGPU) {
// -e was not specified. Use the default start symbol name
// if it is resolvable.
// Add the start symbol. Note that AMDGPU binaries have no entries.
if (Config->Entry.empty() && !Config->Relocatable &&
Config->EMachine != EM_AMDGPU)
Config->Entry = (Config->EMachine == EM_MIPS) ? "__start" : "_start";
}
// If an object file defining the entry symbol is in an archive file,
// extract the file now.

8
lld/ELF/Writer.cpp
View File

@ -1402,11 +1402,13 @@ template <class ELFT> void Writer<ELFT>::setPhdrs() {
// 4. the address of the first byte of the .text section, if present;
// 5. the address 0.
template <class ELFT> typename ELFT::uint Writer<ELFT>::getEntryAddr() {
// Case 1, 2 or 3
if (Config->Entry.empty())
return Config->EntryAddr;
// Case 1, 2 or 3. As a special case, if the symbol is actually
// a number, we'll use that number as an address.
if (SymbolBody *B = Symtab<ELFT>::X->find(Config->Entry))
return B->getVA<ELFT>();
uint64_t Addr;
if (!Config->Entry.getAsInteger(0, Addr))
return Addr;
// Case 4
if (OutputSectionBase *Sec = findSection(".text")) {