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 12ccbc63130c5d96a4e5a0ab4e04fb01393e3c57..6180b06a817229aff22482ec16e7745f28416b2b 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'):
@@ -128,12 +132,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'):

[Karl, 2011/08/30 19:53:52]

Why is this needed for the build environment? I understand the need for the
target, but do not understand the build.

[jasonwkim, 2011/09/16 20:09:16]

It was just to keep the prior bifurcation bet. BUILD and TARGET alive. we can
cut it out later

     thumb2_env = env.Clone()
-    thumb2_env.Append(ASFLAGS=['-mthumb'])
+    thumb2_env.Replace(ASFLAGS=['-mthumb'])

[bsy, 2011/09/01 00:30:00]

could env already have other ASFLAGS already set?  Environment.Replace will get
rid of these other values, so -- are previous values bad?

[jasonwkim, 2011/09/16 20:09:16]

Don't know. I'll have to check

     ldr_inputs += [
       thumb2_env.DualObject('arch/arm/springboard_thumb2.S'),
       thumb2_env.DualObject('arch/arm/tramp_arm_thumb2.S'),