Revert r266457: "[ELF] - Implemented basic location counter support."
This reverts commit r266457 as it breaks "hello world" both on
Linux and FreeBSD.
llvm-svn: 266485
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 9b7cd5a..f673c79 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -220,12 +220,8 @@
} else {
createPhdrs();
fixHeaders();
- if (Script->Exists) {
- Script->assignAddresses(OutputSections);
- } else {
- fixSectionAlignments();
- assignAddresses();
- }
+ fixSectionAlignments();
+ assignAddresses();
assignFileOffsets();
setPhdrs();
fixAbsoluteSymbols();
@@ -1532,11 +1528,10 @@
// sections. These are special, we do not include them into output sections
// list, but have them to simplify the code.
template <class ELFT> void Writer<ELFT>::fixHeaders() {
- uintX_t BaseVA = Script->Exists ? 0 : Target->getVAStart();
- Out<ELFT>::ElfHeader->setVA(BaseVA);
+ Out<ELFT>::ElfHeader->setVA(Target->getVAStart());
Out<ELFT>::ElfHeader->setFileOffset(0);
uintX_t Off = Out<ELFT>::ElfHeader->getSize();
- Out<ELFT>::ProgramHeaders->setVA(Off + BaseVA);
+ Out<ELFT>::ProgramHeaders->setVA(Off + Target->getVAStart());
Out<ELFT>::ProgramHeaders->setFileOffset(Off);
}