[PATCH] D18655: [ELF] - Move calculation of _end to fixAbsoluteSymbols()

[George Rimar via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL265129: [ELF] - Move calculation of _end to fixAbsoluteSymbols() (authored by grimar).

Changed prior to commit:
  http://reviews.llvm.org/D18655?vs=52232&id=52341#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D18655

Files:
  lld/trunk/ELF/Writer.cpp

Index: lld/trunk/ELF/Writer.cpp
===================================================================
--- lld/trunk/ELF/Writer.cpp
+++ lld/trunk/ELF/Writer.cpp
@@ -1424,10 +1424,6 @@
   SectionHeaderOff = alignTo(FileOff, sizeof(uintX_t));
   FileSize = SectionHeaderOff + getNumSections() * sizeof(Elf_Shdr);
 
-  // Update "_end" and "end" symbols so that they
-  // point to the end of the data segment.
-  ElfSym<ELFT>::End.st_value = VA;
-
   for (Phdr &PHdr : Phdrs) {
     Elf_Phdr &H = PHdr.H;
     if (PHdr.First) {
@@ -1503,9 +1499,11 @@
 
   // _etext is the first location after the last read-only loadable segment.
   // _edata is the first location after the last read-write loadable segment.
+  // _end is the first location after the uninitialized data region.
   for (Phdr &PHdr : Phdrs) {
     if (PHdr.H.p_type != PT_LOAD)
       continue;
+    ElfSym<ELFT>::End.st_value = PHdr.H.p_vaddr + PHdr.H.p_memsz;
     uintX_t Val = PHdr.H.p_vaddr + PHdr.H.p_filesz;
     if (PHdr.H.p_flags & PF_W)
       ElfSym<ELFT>::Edata.st_value = Val;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D18655.52341.patch
Type: text/x-patch
Size: 1052 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160401/c4a57479/attachment.bin>