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 339 matching lines @@
   # 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'])
   elif env.Bit('target_x86_32'):
-    env.AppendUnique(CCFLAGS=['--pnacl-i686-bias'],
+    env.AppendUnique(CCFLAGS=['--pnacl-i686-bias',
+                              '--target=i686-unknown-nacl'],

[Mark Seaborn, 2014/09/30 20:32:29]

This is fine to do, but if we're using the arch-specific "--target" on x86-32
here we should do it for the x86-64 and ARM cases too, otherwise the
inconsistency could cause confusion later.

If that turns out not to work for x86-64 and ARM, there are two fallbacks:

 * Set --target in AllowInlineAssembly().
 * Otherwise, set --target in tests/exception_test.

[Junichi Uekawa, 2014/10/01 04:17:13]

AddBiasForPNaCl is used elsewhere for using the defines only so it seems risky
to add --target here.

moved to AllowInlineAssembly().

[Mark Seaborn, 2014/10/01 17:02:30]

Oops, yes.  I misread this change and thought you were adding this to
PNaClForceNative() (which would be OK).  I agree that adding this to
AddBiasForPNaCl() isn't so good, since AddBiasForPNaCl() is only supposed to
affect #defines.

Moving this to AllowInlineAssembly() is the right thing to do...

                      ASPPFLAGS=['--pnacl-i686-bias'])
   elif env.Bit('target_x86_64'):
     env.AppendUnique(CCFLAGS=['--pnacl-x86_64-bias'],
                      ASPPFLAGS=['--pnacl-x86_64-bias'])
   elif env.Bit('target_mips32'):
     env.AppendUnique(CCFLAGS=['--pnacl-mips-bias'],
                      ASPPFLAGS=['--pnacl-mips-bias'])
   else:
     raise Exception("Unknown architecture!")
 
@@ skipping 336 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)