Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(485)

Unified Diff: tests/irt_compatibility/nacl.scons

Issue 19288005: Factor linker flag which sets text segment into a function in SConstruct (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: comment on -Wn Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/untrusted/irt/nacl.scons ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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')
« no previous file with comments | « src/untrusted/irt/nacl.scons ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698