Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / native_client / tests / irt_compatibility / nacl.scons

diff --git a/src/native_client/tests/irt_compatibility/nacl.scons b/src/native_client/tests/irt_compatibility/nacl.scons
index 5e1c4cc..96c74b6 100644 (file)
--- a/src/native_client/tests/irt_compatibility/nacl.scons
+++ b/src/native_client/tests/irt_compatibility/nacl.scons
@@ -13,17 +13,21 @@ 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}'),
-                           blob_env.TextSwitch('${IRT_BLOB_CODE_START}')])
+blob_env.Append(LINKFLAGS=['-Wl,-Trodata-segment=${IRT_BLOB_DATA_START}',
+                           '-Wl,-Ttext-segment=${IRT_BLOB_CODE_START}'])
 
 # Build custom IRT library which provides a minimal subset of old
 # interface versions.
 blob_env.Append(CPPDEFINES=[['ALLOW_DYNAMIC_LINKING',
                              str(int(not env.Bit('nacl_static_link')))]])
-irt_comp_test_library = blob_env.ComponentProgram(
-    'irt_comp_test', ['irt_comp_interfaces.c'],
+irt_comp_test_raw_library = blob_env.ComponentProgram(
+    'irt_comp_test_raw', ['irt_comp_interfaces.c'],
     EXTRA_LIBS=['irt_support_private'])
 
+irt_comp_test_library = env.ApplyTLSEdit(
+    'irt_comp_test',
+    irt_comp_test_raw_library)
+
 # Don't provide IRT, we provide it ourselves via -B.
 env.ClearBits('tests_use_irt')