Stackable IRT

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 os
 import platform
 import re
 import subprocess
@@ skipping 3043 matching lines @@
 nacl_env.AddChromeFilesFromGroup('untrusted_scons_files')
 
 # These are tests that are worthwhile to run in IRT variant only.
 irt_only_tests = [
     #### ALPHABETICALLY SORTED ####
     'tests/irt/nacl.scons',
     'tests/irt_compatibility/nacl.scons',
     'tests/random/nacl.scons',
     'tests/sbrk/nacl.scons',
     'tests/translator_size_limits/nacl.scons',
+    'tests/stacked_irt/nacl.scons',
     ]
 
 # These are tests that are worthwhile to run in both IRT and non-IRT variants.
 # The nacl_irt_test mode runs them in the IRT variants.
 irt_variant_tests = [
     #### ALPHABETICALLY SORTED ####
     'tests/app_lib/nacl.scons',
     'tests/bigalloc/nacl.scons',
     'tests/bundle_size/nacl.scons',
     'tests/callingconv/nacl.scons',
@@ skipping 226 matching lines @@
   nacl_irt_env.Append(CCFLAGS=['-mtp=soft'])
 else:
   nacl_irt_env.Append(CCFLAGS=['-mtls-use-call'])
 # A debugger should be able to unwind IRT call frames. As the IRT is compiled
 # with high level of optimizations and without debug info, compiler is requested
 # to generate unwind tables explicitly. This is the default behavior on x86-64
 # and when compiling C++ with exceptions enabled, the change is for the benefit
 # of x86-32 C.
 nacl_irt_env.Append(CCFLAGS=['-fasynchronous-unwind-tables'])
 
+irt_env = nacl_irt_env.Clone(
+    BUILD_TYPE = 'stacked_irt',
+    BUILD_TYPE_DESCRIPTION = 'Stacked IRT build',
+    NACL_BUILD_FAMILY = 'UNTRUSTED_IRT',
+)
+
+# Provide access to the IRT build environment from the default environment
+# which is needed when compiling custom IRT for testing purposes.
+nacl_env['IRT_ENV'] = irt_env
+
+# Unlike NaCl IRT, stacked IRT should be position independent
+irt_env.SetBits('nacl_pic')
+
 # TODO(mcgrathr): Clean up uses of these methods.
 def AddLibraryDummy(env, nodes):
   return nodes
 nacl_irt_env.AddMethod(AddLibraryDummy, 'AddLibraryToSdk')
 
 def AddObjectInternal(env, nodes):
   return env.Replicate('${LIB_DIR}', nodes)
 nacl_env.AddMethod(AddObjectInternal, 'AddObjectToSdk')
 nacl_irt_env.AddMethod(AddObjectInternal, 'AddObjectToSdk')
 
@@ skipping 373 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:')