commit 8de8364753af002d97981cfd6918913d25e0118d
author Michael J. Spencer <bigcheesegs@gmail.com> Mon Jan 07 08:00:42 2013 +0000
committer Michael J. Spencer <bigcheesegs@gmail.com> Mon Jan 07 08:00:42 2013 +0000
tree e1a9f0b8925bff57a5872a9afbbf8a429b78bc51
parent 956b03618c93afb597f944483ddc9d8e4ee51f55

[ELF] Properly handle constant data.

With this hello world works with dietlibc on x86-64 Linux.

llvm-svn: 171711

lld/lib/ReaderWriter/ELF/WriterELF.cpp

diff --git a/lld/lib/ReaderWriter/ELF/WriterELF.cpp b/lld/lib/ReaderWriter/ELF/WriterELF.cpp
index b6e847e..2973f02 100644
--- a/lld/lib/ReaderWriter/ELF/WriterELF.cpp
+++ b/lld/lib/ReaderWriter/ELF/WriterELF.cpp
@@ -273,6 +273,7 @@
       switch(definedAtom->contentType()) {
       case  DefinedAtom::typeCode:
       case  DefinedAtom::typeData:
+      case  DefinedAtom::typeConstant:
         _atoms.push_back(std::make_pair(atom, std::make_pair(fOffset, 0)));
         this->_fsize = fOffset + definedAtom->size();
         this->_msize = mOffset + definedAtom->size();
@@ -456,6 +457,8 @@
     uint8_t *chunkBuffer = buffer->getBufferStart();
     for (auto &ai : _atoms) {
       const DefinedAtom *definedAtom = llvm::dyn_cast<DefinedAtom>(ai.first);
+      if (definedAtom->contentType() == DefinedAtom::typeZeroFill)
+        continue;
       // Copy raw content of atom to file buffer.
       ArrayRef<uint8_t> content = definedAtom->rawContent();
       uint64_t contentSize = content.size();
@@ -1067,6 +1070,7 @@
         type = ELF::STT_FUNC;
         break;
       case  DefinedAtom::typeData:
+      case  DefinedAtom::typeConstant:
         symbol->st_value = addr;
         type = ELF::STT_OBJECT;
         break;