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

Unified Diff: tests/common/nacl.scons

Issue 544003002: NonSFI mode: Enable compiling exception_test for NonSFI NaCl on ARM (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: Created 6 years, 3 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/common/nacl.scons
diff --git a/tests/common/nacl.scons b/tests/common/nacl.scons
index ecb43e1ad36aa6fb74773d3cdf5d6be8fcb1d193..13d327be945a30710f284a7a7ac97d8bb2a733e6 100644
--- a/tests/common/nacl.scons
+++ b/tests/common/nacl.scons
@@ -5,8 +5,20 @@
Import('env')
-if not env.AllowInlineAssembly():
- Return()
+if env.Bit('nonsfi_nacl'):
+ # Specifying the target arch is necessary for using inline assembly in pNaCl.
+ if env.Bit('target_x86_32'):
+ env.Append(CCFLAGS=['--target=i686-unknown-nacl',
+ '--pnacl-allow-translate'])
+ elif env.Bit('target_arm'):
+ env.Append(CCFLAGS=['--target=arm-unknown-nacl', '-mfloat-abi=hard'])
+ else:
+ raise Exception('Unsupported architecture')
+ # env.SetBits('nonstable_bitcode')
+ env.Append(LINKFLAGS=['--pnacl-disable-abi-check',])
+
+# if not env.AllowInlineAssembly():
+# Return()
env.ComponentLibrary('test_common', ['register_set.c'])

Powered by Google App Engine
This is Rietveld 408576698