diff options
| -rw-r--r-- | compiler-rt/test/asan/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | compiler-rt/test/asan/TestCases/Linux/kernel-area.cc | 1 | ||||
| -rw-r--r-- | compiler-rt/test/asan/lit.site.cfg.in | 1 | ||||
| -rw-r--r-- | compiler-rt/test/lit.common.configured.in | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt index 2080a72cc40..2488ef1923e 100644 --- a/compiler-rt/test/asan/CMakeLists.txt +++ b/compiler-rt/test/asan/CMakeLists.txt @@ -9,7 +9,7 @@ if(CAN_TARGET_arm_android) get_filename_component(ASAN_TEST_LLVM_TOOLS_DIR ${CMAKE_C_COMPILER} PATH) set(ASAN_TEST_CONFIG_SUFFIX "-arm-android") set(ASAN_TEST_BITS "32") - get_target_flags_for_arch(arm_android COMPILER_RT_TEST_COMPILER_CFLAGS) + get_target_flags_for_arch(arm_android ASAN_TEST_TARGET_CFLAGS) configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/ARMAndroidConfig/lit.site.cfg @@ -21,6 +21,7 @@ if(CAN_TARGET_arm) # This is only true if we are cross-compiling. # Build all tests with host compiler and use host tools. set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) + set(ASAN_TEST_TARGET_CFLAGS ${COMPILER_RT_TEST_COMPILER_CFLAGS}) set(ASAN_TEST_CONFIG_SUFFIX "-arm-linux") set(ASAN_TEST_BITS "32") set(ASAN_TEST_DYNAMIC False) @@ -34,7 +35,7 @@ endif() if(CAN_TARGET_x86_64 OR CAN_TARGET_powerpc64) set(ASAN_TEST_CONFIG_SUFFIX "64") set(ASAN_TEST_BITS "64") - set(COMPILER_RT_TEST_COMPILER_CFLAGS ${TARGET_64_BIT_CFLAGS}) + set(ASAN_TEST_TARGET_CFLAGS ${TARGET_64_BIT_CFLAGS}) set(ASAN_TEST_DYNAMIC False) configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in @@ -54,7 +55,7 @@ endif() if(CAN_TARGET_i386) set(ASAN_TEST_CONFIG_SUFFIX "32") set(ASAN_TEST_BITS "32") - set(COMPILER_RT_TEST_COMPILER_CFLAGS ${TARGET_32_BIT_CFLAGS}) + set(ASAN_TEST_TARGET_CFLAGS ${TARGET_32_BIT_CFLAGS}) set(ASAN_TEST_DYNAMIC False) set(ASAN_TEST_TARGET_ARCH "i386") configure_lit_site_cfg( diff --git a/compiler-rt/test/asan/TestCases/Linux/kernel-area.cc b/compiler-rt/test/asan/TestCases/Linux/kernel-area.cc index 0b92beaa672..b954ba76b45 100644 --- a/compiler-rt/test/asan/TestCases/Linux/kernel-area.cc +++ b/compiler-rt/test/asan/TestCases/Linux/kernel-area.cc @@ -12,7 +12,6 @@ // CHECK-kernel-64-bits: || `[0x24000000, 0x27ffffff]` || ShadowGap || // // REQUIRES: asan-32-bits -// XFAIL: * int main() { return 0; diff --git a/compiler-rt/test/asan/lit.site.cfg.in b/compiler-rt/test/asan/lit.site.cfg.in index 04a9a49be87..76e0c554256 100644 --- a/compiler-rt/test/asan/lit.site.cfg.in +++ b/compiler-rt/test/asan/lit.site.cfg.in @@ -4,6 +4,7 @@ # Tool-specific config options. config.name_suffix = "@ASAN_TEST_CONFIG_SUFFIX@" config.asan_lit_source_dir = "@ASAN_LIT_SOURCE_DIR@" +config.target_cflags = "@ASAN_TEST_TARGET_CFLAGS@" config.clang = "@ASAN_TEST_TARGET_CC@" config.llvm_tools_dir = "@ASAN_TEST_LLVM_TOOLS_DIR@" config.bits = "@ASAN_TEST_BITS@" diff --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in index 10eb7b5e1c2..f23086a9ff2 100644 --- a/compiler-rt/test/lit.common.configured.in +++ b/compiler-rt/test/lit.common.configured.in @@ -8,7 +8,7 @@ def set_default(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_cflags", "@COMPILER_RT_TEST_COMPILER_CFLAGS@") set_default("host_arch", "@HOST_ARCH@") set_default("target_arch", "@HOST_ARCH@") set_default("host_os", "@HOST_OS@") |
