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

Unified Diff: tests/irt_compatibility/nacl.scons

Issue 140653005: Adds tls_edit utility which patches irt_core.nexe's TLS usage. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: gyp builds with host toolsets should not inherit target flags for arm and mips Created 6 years, 11 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
Index: tests/irt_compatibility/nacl.scons
diff --git a/tests/irt_compatibility/nacl.scons b/tests/irt_compatibility/nacl.scons
index a9aa6b21fab1d375c69168da24409dbafa5329e6..9d778d7eaf705d97e7c37aa5e8a8068c24d37dbf 100644
--- a/tests/irt_compatibility/nacl.scons
+++ b/tests/irt_compatibility/nacl.scons
@@ -20,10 +20,18 @@ blob_env.Append(LINKFLAGS=['-Wl,-Trodata-segment=${IRT_BLOB_DATA_START}',
# 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'])
+tls_edit_exe = env.GetTLSEdit()
+
+irt_comp_test_library = env.Command(
+ 'irt_comp_test',
+ [tls_edit_exe, irt_comp_test_raw_library],
+ '${SOURCES} ${TARGET}'
+ )
+
# Don't provide IRT, we provide it ourselves via -B.
env.ClearBits('tests_use_irt')

Powered by Google App Engine
This is Rietveld 408576698