NonSFI mode: Enable compiling exception_test for NonSFI NaCl on ARM

site_scons/site_tools/naclsdk.py

 #!/usr/bin/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.
 
 """NaCl SDK tool SCons."""
 
 import __builtin__
 import re
 import os
@@ skipping 285 matching lines @@
 def PNaClForceNative(env):
   assert(env.Bit('bitcode'))
   if env.Bit('pnacl_generate_pexe'):
     env.Replace(CC='NO-NATIVE-CC-INVOCATION-ALLOWED',
                 CXX='NO-NATIVE-CXX-INVOCATION-ALLOWED')
     return
 
   env.Replace(OBJSUFFIX='.o',
               SHLIBSUFFIX='.so')
   arch_flag = ' -arch ${TARGET_FULLARCH}'
+  if env.Bit('nonsfi_nacl'):
+    arch_flag += '-nonsfi'
   cc_flags = ' --pnacl-allow-native --pnacl-allow-translate'
   env.Append(CC=arch_flag + cc_flags,
              CXX=arch_flag + cc_flags,
              ASPP=arch_flag + cc_flags,
              LINK=cc_flags) # Already has -arch
   env['LD'] = 'NO-NATIVE-LD-INVOCATION-ALLOWED'
   env['SHLINK'] = '${LINK}'
   if env.Bit('built_elsewhere'):
     _StubOutEnvToolsForBuiltElsewhere(env)
 
@@ skipping 389 matching lines @@
     # translation.
     if not os.path.exists(version_file) or env.Bit('use_sandboxed_translator'):
       version_file = os.path.join(os.path.dirname(root), 'pnacl_translator',
                                   'FEATURE_VERSION')
     if os.path.exists(version_file):
       with open(version_file, 'r') as fh:
         version = int(fh.read())
     else:
       version = 0
   env.Replace(TOOLCHAIN_FEATURE_VERSION=version)