From: Roland McGrath <roland@gnu.org>
Date: Fri, 23 Aug 2013 22:41:05 +0000 (+0000)
Subject: ld/
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60d871a7fc848306b22749f8ca6057a1f5a21379;p=thirdparty%2Fbinutils-gdb.git

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 b0f237c346a..7a36ab397d0 100644
--- 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 657cd06f13b..d68cbcdc09f 100644
--- 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"
 }