Non-SFI Mode: Enable compiling exception_test for x86-32.

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 336 matching lines @@
 def AddBiasForPNaCl(env, temporarily_allow=True):
   assert(env.Bit('bitcode'))
   # re: the temporarily_allow flag -- that is for:
   # BUG= http://code.google.com/p/nativeclient/issues/detail?id=1248
   if env.Bit('pnacl_generate_pexe') and not temporarily_allow:
     env.Replace(CC='NO-NATIVE-CC-INVOCATION-ALLOWED',
                 CXX='NO-NATIVE-CXX-INVOCATION-ALLOWED')
     return
 
   if env.Bit('target_arm'):
-    env.AppendUnique(CCFLAGS=['--pnacl-arm-bias'],
-                     ASPPFLAGS=['--pnacl-arm-bias'])
+    bias_flag = '--pnacl-bias=arm'
   elif env.Bit('target_x86_32'):
-    env.AppendUnique(CCFLAGS=['--pnacl-i686-bias'],
-                     ASPPFLAGS=['--pnacl-i686-bias'])
+    bias_flag = '--pnacl-bias=x86-32'
   elif env.Bit('target_x86_64'):
-    env.AppendUnique(CCFLAGS=['--pnacl-x86_64-bias'],
-                     ASPPFLAGS=['--pnacl-x86_64-bias'])
+    bias_flag = '--pnacl-bias=x86-64'
   elif env.Bit('target_mips32'):
-    env.AppendUnique(CCFLAGS=['--pnacl-mips-bias'],
-                     ASPPFLAGS=['--pnacl-mips-bias'])
+    bias_flag = '--pnacl-bias=mips32'
   else:
     raise Exception("Unknown architecture!")
 
+  if env.Bit('nonsfi_nacl'):
+    bias_flag += '-nonsfi'
+
+  env.AppendUnique(CCFLAGS=[bias_flag],
+                   ASPPFLAGS=[bias_flag])
+
 
 def ValidateSdk(env):
   checkables = ['${NACL_SDK_INCLUDE}/stdio.h']
   for c in checkables:
     if os.path.exists(env.subst(c)):
       continue
     # Windows build does not use cygwin and so can not see nacl subdirectory
     # if it's cygwin's symlink - check for /include instead...
     if os.path.exists(re.sub(r'(nacl64|nacl)/include/([^/]*)$',
                              r'include/\2',
@@ skipping 326 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)