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 b0f237c346ac4ff00c03535e525b17684bcf285d..7a36ab397d003f8e0a804629f6a160746b9a8ad2 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-07-18  Roland McGrath  <mcgrathr@google.com>
 
        * emultempl/armelf.em (elf32_arm_add_stub_section): Take third

diff --git a/ld/emulparams/elf_nacl.sh b/ld/emulparams/elf_nacl.sh
index 657cd06f13ba32ce9ca0bb94982fc38ba93d02da..d68cbcdc09f7fdd53ddbee197eb1e1acefb53ea5 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"
 }