ld/

[external/binutils.git] / ld / emulparams / elf_nacl.sh

diff --git a/ld/emulparams/elf_nacl.sh b/ld/emulparams/elf_nacl.sh
index 0073c0f..d68cbcd 100644 (file)
--- a/ld/emulparams/elf_nacl.sh
+++ b/ld/emulparams/elf_nacl.sh
@@ -2,5 +2,13 @@ ENABLE_INITFINI_ARRAY=yes
 SEPARATE_CODE=yes
 TEXT_START_ADDR=0x20000
 NACL_RODATA_DISTANCE=0x10000000
-RODATA_ADDR="${TEXT_START_ADDR} + ${NACL_RODATA_DISTANCE} + SIZEOF_HEADERS"
-SHLIB_RODATA_ADDR="${NACL_RODATA_DISTANCE} + SIZEOF_HEADERS"
+
+nacl_rodata_addr()
+{
+  nacl_text_addr="SEGMENT_START(\"text-segment\", $1)"
+  nacl_rodata_addr="$nacl_text_addr + ${NACL_RODATA_DISTANCE}"
+  echo "$nacl_rodata_addr"
+}
+
+RODATA_ADDR=`nacl_rodata_addr "${TEXT_START_ADDR}"`
+SHLIB_RODATA_ADDR=`nacl_rodata_addr 0`