Make pnacl_generate_pexe=0 nonsfi_nacl=1 bitcode=1 work.

SConstruct

Index: SConstruct
diff --git a/SConstruct b/SConstruct
index f6dbc26d47a2f84544481b79683a25371ce9223f..45541eb80d4eb832053c1082a9ae32ca40774c14 100755
--- a/SConstruct
+++ b/SConstruct
@@ -688,6 +688,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.
     ])
 
 
@@ -3021,8 +3024,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