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

site_scons/site_tools/naclsdk.py

Index: site_scons/site_tools/naclsdk.py
diff --git a/site_scons/site_tools/naclsdk.py b/site_scons/site_tools/naclsdk.py
index dbe31281f023d6f5e1c52ac14cf766c8fe79d79c..69e4611d4440331dbbd529724e819319436f1fda 100755
--- a/site_scons/site_tools/naclsdk.py
+++ b/site_scons/site_tools/naclsdk.py
@@ -357,7 +357,8 @@ def AddBiasForPNaCl(env, temporarily_allow=True):
     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'],