Imported Upstream version 1.6.0+dfsg1

[rustc.git] / src / compiler-rt / test / lit.common.configured.in

diff --git a/src/compiler-rt/test/lit.common.configured.in b/src/compiler-rt/test/lit.common.configured.in
index 10eb7b5e1c2aad7541b17d2d42813fd198bb39d6..877890257fc721fdfa45a7f3fe509b7457a03a57 100644 (file)
--- a/src/compiler-rt/test/lit.common.configured.in
+++ b/src/compiler-rt/test/lit.common.configured.in
@@ -5,18 +5,21 @@
 def set_default(attr, value):
   if not getattr(config, attr, None):
     setattr(config, attr, value)
-    
+
 # Generic config options for all compiler-rt lit tests.
-set_default("target_triple", "@TARGET_TRIPLE@")
-set_default("target_cflags", "@COMPILER_RT_TEST_COMPILER_FLAGS@")
+set_default("target_triple", "@COMPILER_RT_DEFAULT_TARGET_TRIPLE@")
+set_default("target_cflags", "@COMPILER_RT_TEST_COMPILER_CFLAGS@")
 set_default("host_arch", "@HOST_ARCH@")
-set_default("target_arch", "@HOST_ARCH@")
+set_default("target_arch", "@COMPILER_RT_DEFAULT_TARGET_ARCH@")
 set_default("host_os", "@HOST_OS@")
 set_default("llvm_build_mode", "@LLVM_BUILD_MODE@")
 set_default("llvm_src_root", "@LLVM_SOURCE_DIR@")
 set_default("llvm_obj_root", "@LLVM_BINARY_DIR@")
 set_default("compiler_rt_src_root", "@COMPILER_RT_SOURCE_DIR@")
+set_default("compiler_rt_obj_root", "@COMPILER_RT_BINARY_DIR@")
 set_default("llvm_tools_dir", "@LLVM_TOOLS_DIR@")
+set_default("llvm_shlib_dir", "@SHLIBDIR@")
+set_default("gold_executable", "@GOLD_EXECUTABLE@")
 set_default("clang", "@COMPILER_RT_TEST_COMPILER@")
 set_default("compiler_id", "@COMPILER_RT_TEST_COMPILER_ID@")
 set_default("compiler_rt_arch", "@COMPILER_RT_SUPPORTED_ARCH@")
@@ -24,12 +27,14 @@ set_default("python_executable", "@PYTHON_EXECUTABLE@")
 set_default("compiler_rt_debug", @COMPILER_RT_DEBUG_PYBOOL@)
 set_default("compiler_rt_libdir", "@COMPILER_RT_LIBRARY_OUTPUT_DIR@")
 set_default("emulator", "@COMPILER_RT_EMULATOR@")
+set_default("sanitizer_can_use_cxxabi", @SANITIZER_CAN_USE_CXXABI_PYBOOL@)
+set_default("has_lld", @COMPILER_RT_HAS_LLD_SOURCES_PYBOOL@)
 
 # LLVM tools dir can be passed in lit parameters, so try to
 # apply substitution.
 try:
   config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
-except KeyError,e:
+except KeyError as e:
   key, = e.args
   lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))