summaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2013-08-23 22:38:42 +0000
committerRoland McGrath <roland@gnu.org>2013-08-23 22:38:42 +0000
commitf35eb649ac6a4ab6f21e7c00fecdcecf0f33ac7b (patch)
treea319526144379f8569bc6bdbfd29e20607a00ddb /ld
parent0b322e6f2f1fc3672a8ecd42b81a29552d6deae9 (diff)
downloadbinutils-redhat-f35eb649ac6a4ab6f21e7c00fecdcecf0f33ac7b.tar.gz
ld/
* emulparams/elf_nacl.sh (nacl_rodata_addr): Don't add in SIZEOF_HEADERS here; elf.sc does it already.
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/emulparams/elf_nacl.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index f9cc7e61b0..27b4be715e 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-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 657cd06f13..d68cbcdc09 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"
}