| Index: SConstruct
|
| diff --git a/SConstruct b/SConstruct
|
| index 51d28dc3e15d2b5916cf3b1205ffea1cbdff2134..88ec2b3077a4256b89335ee7f374415bb060d707 100755
|
| --- a/SConstruct
|
| +++ b/SConstruct
|
| @@ -693,6 +693,9 @@ nonsfi_test_whitelist = set([
|
| 'run_stack_alignment_test',
|
| 'run_syscall_test',
|
| 'run_thread_test',
|
| +
|
| + # TODO(uekawa): Enable exception test when implementation is ready.
|
| + 'run_exception_test', # TODO(uekawa): disable before submitting because it fails.
|
| ])
|
|
|
|
|
| @@ -3024,8 +3027,11 @@ def AllowInlineAssembly(env):
|
| # only current ARM toolchain. One day, we will have an ARM GCC
|
| # toolchain, and we will no longer need to use inline assembly
|
| # with PNaCl/Clang at all.
|
| - if not (env.Bit('target_arm') or env.Bit('target_mips32')):
|
| - return False
|
| + #
|
| + # For Non-SFI NaCl we use inline assembly in PNaCl/Clang.
|
| + if not (env.Bit('target_arm') or env.Bit('target_mips32')
|
| + or env.Bit('nonsfi_nacl')):
|
| + return False
|
| # Inline assembly does not work in pexes.
|
| if env.Bit('pnacl_generate_pexe'):
|
| return False
|
|
|