Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/service_runtime/build.scons

Index: src/trusted/service_runtime/build.scons
diff --git a/src/trusted/service_runtime/build.scons b/src/trusted/service_runtime/build.scons
index cd8731b087f198eb01803f03fd9351ca5f720e7d..4f60ea8cbaf299d350363729d03a471e0633f97c 100644
--- a/src/trusted/service_runtime/build.scons
+++ b/src/trusted/service_runtime/build.scons
@@ -21,6 +21,10 @@ if env.Bit('windows'):
   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'):
@@ -129,12 +133,10 @@ elif env.Bit('build_arm'):
     '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'),