Simplify -e <number> option handling.
This patch is to parse the entry symbol name lazily.
llvm-svn: 288882
diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index 874c5c4..d9aec9e 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -148,7 +148,6 @@
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;
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 9774c7c..58dd8d6 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -780,18 +780,10 @@
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.
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 555fe78..9f2eb14 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -1402,11 +1402,13 @@
// 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")) {