NonSFI mode: Enable compiling exception_test for NonSFI NaCl on ARM

SConstruct

 #! -*- python -*-
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import atexit
 import json
 import os
 import platform
 import re
@@ skipping 675 matching lines @@
     'run_prctl_test',
     'run_printf_test',
     'run_pwrite_test',
     'run_sigaction_test',
     'run_signal_sigbus_test',
     'run_signal_test',
     'run_socket_test',
     '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.
     ])
 
 
 # If a test is not in one of these suites, it will probally not be run on a
 # regular basis.  These are the suites that will be run by the try bot or that
 # a large number of users may run by hand.
 MAJOR_TEST_SUITES = set([
   'small_tests',
   'medium_tests',
   'large_tests',
@@ skipping 2311 matching lines @@
   """
   if env.Bit('bitcode'):
     # For each architecture, we only attempt to make our inline
     # assembly code work with one untrusted-code toolchain.  For x86,
     # we target GCC, but not PNaCl/Clang, because the latter's
     # assembly support has various quirks that we don't want to have
     # to debug.  For ARM, we target PNaCl/Clang, because that is the
     # 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
     env.AddBiasForPNaCl()
     env.PNaClForceNative()
   return True
 
 nacl_env.AddMethod(AllowInlineAssembly)
 
 
@@ skipping 980 matching lines @@
   nacl_env.ValidateSdk()
 
 if BROKEN_TEST_COUNT > 0:
   msg = "There are %d broken tests." % BROKEN_TEST_COUNT
   if GetOption('brief_comstr'):
     msg += " Add --verbose to the command line for more information."
   print msg
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')