This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[COMMITTED PATCH] fix excess SIZEOF_HEADERS addition for rodata-segment in *-*-nacl* targets


I'm not sure how this slipped through for all these months.  One
x86_64-nacl test case is the only place it actually shows up in the test
suite, and I've been paying much more attention to arm-nacl since that's
the target where these tools are already in production use.

Committed to trunk and 2.23 branch.


Thanks,
Roland


ld/
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.

--- 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"
 }


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]