Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/service_runtime/build.scons

 # -*- python -*-
 # Copyright (c) 2011 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 platform
 import os
 
 Import('env')
 
 # TODO(robertm): consider adding this to the top level scons files
 env.Append(CPPPATH=['${TARGET_ROOT}'])
 # this is needed for including gen/... files, see GENERATED below
 
 # this is needed for including gdb_utils files
 env.Append(CPPPATH=['${SOURCE_ROOT}/gdb_utils/src'])
 
 DEBUG_LIBS = ['debug_stub_init', 'gdb_rsp', 'debug_stub']
 if env.Bit('windows'):
   env.Append(CPPDEFINES=['WIN32'])
   if env.Bit('target_x86_64'):
     env.Append(CPPDEFINES=['WIN64'])
 
+# Thumb2 mode sets a variety of different defines.
+if env.Bit('target_arm_thumb2'):
+  env.Append(CPPDEFINES=['NACL_TARGET_IS_THUMB2=1'])
+
 # normally comment out -- uncomment out to test the pedantic removal
 # check below.
 #if env.Bit('linux') or env.Bit('mac'):
 #  env.FilterOut(CCFLAGS=['-pedantic'])
 #  env.FilterOut(CCFLAGS=['-Wall'])
 
 # Make a copy of debug CRT for now.
 # TODO(bradnelson): there should be a better way to generalize this requirement.
 crt = []
 if env.AllBits('windows', 'debug'):
@@ skipping 88 matching lines @@
 elif env.Bit('build_arm'):
   ldr_inputs += [
     'arch/arm/nacl_app.c',
     'arch/arm/nacl_switch_to_app_arm.c',
     'arch/arm/sel_rt.c',
     'arch/arm/nacl_tls.c',
     'arch/arm/sel_ldr_arm.c',
     'arch/arm/sel_addrspace_arm.c',
     'arch/arm/nacl_switch.S',
     'arch/arm/nacl_syscall.S',
-    'arch/arm/springboard.S',
-    'arch/arm/tramp_arm.S',
   ]
-  if env.Bit('target_arm_thumb2'):
+  if env.Bit('build_arm_thumb2') or env.Bit('target_arm_thumb2'):
     thumb2_env = env.Clone()
-    thumb2_env.Append(ASFLAGS=['-mthumb'])
+    thumb2_env.Replace(ASFLAGS=['-mthumb'])
     ldr_inputs += [
       thumb2_env.DualObject('arch/arm/springboard_thumb2.S'),
       thumb2_env.DualObject('arch/arm/tramp_arm_thumb2.S'),
     ]
   else:
     ldr_inputs += [
       'arch/arm/springboard.S',
       'arch/arm/tramp_arm.S',
     ]
 
@@ skipping 695 matching lines @@
     expected_exit_status = 'sigabrt'
   node = env.CommandTest(
       'sel_ldr_thread_death_test.out',
       command=[sel_ldr_thread_death_test_exe],
       exit_status=expected_exit_status)
 
   # TODO(tuduce): Make it work on windows.
   env.AddNodeToTestSuite(node, ['medium_tests'],
                          'run_sel_ldr_thread_death_test',
                          is_broken=env.Bit('windows'))