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 666 matching lines @@
     'run_nanosleep_test',
     'run_prctl_test',
     'run_printf_test',
     'run_pwrite_test',
     'run_sigaction_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',
     ])
 
 
 # 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 2300 matching lines @@
 
 nacl_env.AddMethod(AllowNonStableBitcode)
 
 
 def AllowInlineAssembly(env):
   """ This modifies the environment to allow inline assembly in
       untrusted code.  If the environment cannot be modified to allow
       inline assembly, it returns False.  Otherwise, on success, it
       returns True.
   """
+  if env.Bit('nonsfi_nacl'):
+    if not AllowNonStableBitcode(env):
+      return False
+    # Specifying the target arch is necessary for using inline
+    # assembly in pNaCl.
+    if env.Bit('target_x86_32'):
+      env.AppendUnique(CCFLAGS=['--target=i686-unknown-nacl',
+                                '--pnacl-allow-translate'])
+    elif env.Bit('target_arm'):
+      env.AppendUnique(CCFLAGS=['--target=arm-unknown-nacl',
+                                '-mfloat-abi=hard',
+                                '--pnacl-allow-translate'])
+    else:
+      return False
+    env.AppendUnique(LINKFLAGS=['--pnacl-disable-abi-check',])
+    return True;
+
   if env.Bit('bitcode'):

[Junichi Uekawa, 2014/09/09 12:23:58]

I am a little bit confused by how this part is constructed since the flags are
slightly different from what we're using in src/nonsfi/linux/nacl.scons

Not sure if I can merge the two sections and if that makes things easier to
maintain / read, and I don't claim to have understood what's happening here
quite yet.

     # 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
@@ skipping 982 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:')