commit 8be15899b4d23575ea2acd893c4cb64a5328d525
author Michael J. Spencer <bigcheesegs@gmail.com> Tue Sep 08 21:11:25 2015 +0000
committer Michael J. Spencer <bigcheesegs@gmail.com> Tue Sep 08 21:11:25 2015 +0000
tree 3618c4f17a97265ad0b079fb5e770233abf5d8e9
parent 0127d80986a29a6dea137440c835809b9ae581da

[lld][elf2] Fix hard coded entry address.

llvm-svn: 247073

lld/ELF/Writer.cpp

diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index ab98ddc..c41d034 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -576,7 +576,11 @@
   auto &FirstObj = cast<ObjectFile<ELFT>>(*Symtab.getFirstELF());
   EHdr->e_machine = FirstObj.getEMachine();
   EHdr->e_version = EV_CURRENT;
-  EHdr->e_entry = 0x401000;
+
+  llvm::DenseMap<StringRef, Symbol *>::const_iterator Entry =
+      Symtab.getSymbols().find("_start");
+
+  EHdr->e_entry = getSymVA(cast<DefinedRegular<ELFT>>(Entry->second->Body));
   EHdr->e_phoff = sizeof(Elf_Ehdr_Impl<ELFT>);
   EHdr->e_shoff = SectionHeaderOff;
   EHdr->e_ehsize = sizeof(Elf_Ehdr_Impl<ELFT>);