ld/

	* emulparams/elf_nacl.sh (nacl_rodata_addr): Don't add in
	SIZEOF_HEADERS here; elf.sc does it already.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index f9cc7e6..27b4be7 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-23  Roland McGrath  <mcgrathr@google.com>
+
+       * emulparams/elf_nacl.sh (nacl_rodata_addr): Don't add in
+       SIZEOF_HEADERS here; elf.sc does it already.
+
 2013-08-23  Nick Clifton  <nickc@redhat.com>
 
        PR ld/15839

diff --git a/ld/emulparams/elf_nacl.sh b/ld/emulparams/elf_nacl.sh
index 657cd06..d68cbcd 100644 (file)
--- a/ld/emulparams/elf_nacl.sh
+++ b/ld/emulparams/elf_nacl.sh
@@ -6,7 +6,7 @@ NACL_RODATA_DISTANCE=0x10000000
 nacl_rodata_addr()
 {
   nacl_text_addr="SEGMENT_START(\"text-segment\", $1)"
-  nacl_rodata_addr="$nacl_text_addr + ${NACL_RODATA_DISTANCE} + SIZEOF_HEADERS"
+  nacl_rodata_addr="$nacl_text_addr + ${NACL_RODATA_DISTANCE}"
   echo "$nacl_rodata_addr"
 }