Index: tests/irt_compatibility/nacl.scons |
diff --git a/tests/irt_compatibility/nacl.scons b/tests/irt_compatibility/nacl.scons |
index f2392045fc282ddff2bda9254bb85abfe8e60ec5..0bd7e9b3319589ed34cdc3047b044bf7202bc998 100644 |
--- a/tests/irt_compatibility/nacl.scons |
+++ b/tests/irt_compatibility/nacl.scons |
@@ -13,14 +13,8 @@ if env.Bit('pnacl_generate_pexe'): |
Return() |
blob_env = env['NACL_IRT_ENV'].Clone() |
-blob_env.Append(LINKFLAGS=blob_env.RodataSwitch('${IRT_BLOB_DATA_START}')) |
-# The PNaCl linker (gold) does not implement the "-Ttext-segment" |
-# option. However, with the linker for x86, the "-Ttext" option does |
-# not affect the executable's base address. |
-if blob_env.Bit('bitcode'): |
- blob_env.Append(LINKFLAGS='-Wl,-Ttext=${IRT_BLOB_CODE_START}') |
-else: |
- blob_env.Append(LINKFLAGS='-Wl,-Ttext-segment=${IRT_BLOB_CODE_START}') |
+blob_env.Append(LINKFLAGS=[blob_env.RodataSwitch('${IRT_BLOB_DATA_START}'), |
+ blob_env.TextSwitch('${IRT_BLOB_CODE_START}')]) |
irt_entry_obj = blob_env.ComponentObject( |
'${MAIN_DIR}/src/untrusted/irt/irt_entry.c') |