diff options
| -rw-r--r-- | compiler-rt/cmake/config-ix.cmake | 26 | ||||
| -rw-r--r-- | compiler-rt/test/asan/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | compiler-rt/test/fuzzer/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | compiler-rt/test/tsan/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | compiler-rt/test/ubsan/CMakeLists.txt | 9 |
5 files changed, 9 insertions, 55 deletions
diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 2050b139e54..b072c1180e3 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -205,32 +205,6 @@ macro(get_test_cc_for_arch arch cc_out cflags_out) endif() endmacro() -# Returns CFLAGS that should be used to run tests for the -# specific apple platform and architecture. -function(get_test_cflags_for_apple_platform platform arch cflags_out) - is_valid_apple_platform("${platform}" is_valid_platform) - if (NOT is_valid_platform) - message(FATAL_ERROR "\"${platform}\" is not a valid apple platform") - endif() - set(test_cflags "") - get_target_flags_for_arch(${arch} test_cflags) - list(APPEND test_cflags ${DARWIN_${platform}_CFLAGS}) - string(REPLACE ";" " " test_cflags_str "${test_cflags}") - string(APPEND test_cflags_str "${COMPILER_RT_TEST_COMPILER_CFLAGS}") - set(${cflags_out} "${test_cflags_str}" PARENT_SCOPE) -endfunction() - -function(is_valid_apple_platform platform is_valid_out) - set(is_valid FALSE) - if ("${platform}" STREQUAL "") - message(FATAL_ERROR "platform cannot be empty") - endif() - if ("${platform}" MATCHES "^(osx|((ios|watchos|tvos)(sim)?))$") - set(is_valid TRUE) - endif() - set(${is_valid_out} ${is_valid} PARENT_SCOPE) -endfunction() - set(ARM64 aarch64) set(ARM32 arm armhf) set(HEXAGON hexagon) diff --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt index a6abd1c7c4a..2a44aebd55d 100644 --- a/compiler-rt/test/asan/CMakeLists.txt +++ b/compiler-rt/test/asan/CMakeLists.txt @@ -89,11 +89,7 @@ if(APPLE) foreach(arch ${DARWIN_iossim_ARCHS}) set(ASAN_TEST_APPLE_PLATFORM "iossim") set(ASAN_TEST_TARGET_ARCH ${arch}) - get_test_cflags_for_apple_platform( - "${ASAN_TEST_APPLE_PLATFORM}" - "${ASAN_TEST_TARGET_ARCH}" - ASAN_TEST_TARGET_CFLAGS - ) + set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-${ASAN_TEST_APPLE_PLATFORM}") get_bits_for_arch(${arch} ASAN_TEST_BITS) string(TOUPPER ${arch} ARCH_UPPER_CASE) @@ -110,10 +106,7 @@ if(APPLE) foreach (arch ${DARWIN_ios_ARCHS}) set(ASAN_TEST_APPLE_PLATFORM "ios") set(ASAN_TEST_TARGET_ARCH ${arch}) - get_test_cflags_for_apple_platform( - "${ASAN_TEST_APPLE_PLATFORM}" - "${arch}" - ASAN_TEST_TARGET_CFLAGS) + set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-${ASAN_TEST_APPLE_PLATFORM}") get_bits_for_arch(${arch} ASAN_TEST_BITS) string(TOUPPER ${arch} ARCH_UPPER_CASE) diff --git a/compiler-rt/test/fuzzer/CMakeLists.txt b/compiler-rt/test/fuzzer/CMakeLists.txt index 21fdbbff472..ef46ec4a906 100644 --- a/compiler-rt/test/fuzzer/CMakeLists.txt +++ b/compiler-rt/test/fuzzer/CMakeLists.txt @@ -91,11 +91,7 @@ if (APPLE) foreach(arch ${DARWIN_ios_ARCHS}) set(LIBFUZZER_TEST_APPLE_PLATFORM "ios") set(LIBFUZZER_TEST_TARGET_ARCH ${arch}) - get_test_cflags_for_apple_platform( - "${LIBFUZZER_TEST_APPLE_PLATFORM}" - "${LIBFUZZER_TEST_TARGET_ARCH}" - LIBFUZZER_TEST_FLAGS - ) + set(LIBFUZZER_TEST_FLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") set(LIBFUZZER_TEST_CONFIG_SUFFIX "-${arch}-${LIBFUZZER_TEST_APPLE_PLATFORM}") string(TOUPPER ${arch} ARCH_UPPER_CASE) set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") diff --git a/compiler-rt/test/tsan/CMakeLists.txt b/compiler-rt/test/tsan/CMakeLists.txt index 37398ebb629..c62eb1d6b3d 100644 --- a/compiler-rt/test/tsan/CMakeLists.txt +++ b/compiler-rt/test/tsan/CMakeLists.txt @@ -56,11 +56,7 @@ if(APPLE) set(TSAN_TEST_APPLE_PLATFORM "iossim") set(arch "x86_64") set(TSAN_TEST_TARGET_ARCH ${arch}) - get_test_cflags_for_apple_platform( - "${TSAN_TEST_APPLE_PLATFORM}" - "${TSAN_TEST_TARGET_ARCH}" - TSAN_TEST_TARGET_CFLAGS - ) + set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-${TSAN_TEST_APPLE_PLATFORM}") string(TOUPPER ${arch} ARCH_UPPER_CASE) set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") @@ -75,11 +71,7 @@ if(APPLE) set(TSAN_TEST_APPLE_PLATFORM "ios") set(arch "arm64") set(TSAN_TEST_TARGET_ARCH ${arch}) - get_test_cflags_for_apple_platform( - "${TSAN_TEST_APPLE_PLATFORM}" - "${TSAN_TEST_TARGET_ARCH}" - TSAN_TEST_TARGET_CFLAGS - ) + set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-${TSAN_TEST_APPLE_PLATFORM}") string(TOUPPER ${arch} ARCH_UPPER_CASE) set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") diff --git a/compiler-rt/test/ubsan/CMakeLists.txt b/compiler-rt/test/ubsan/CMakeLists.txt index 280f9677740..351bf3b829d 100644 --- a/compiler-rt/test/ubsan/CMakeLists.txt +++ b/compiler-rt/test/ubsan/CMakeLists.txt @@ -113,11 +113,10 @@ if(APPLE) endif() foreach(platform ${UBSAN_APPLE_PLATFORMS}) foreach(arch ${DARWIN_${platform}_ARCHS}) - get_test_cflags_for_apple_platform( - "${platform}" - "${arch}" - UBSAN_TEST_TARGET_CFLAGS - ) + get_target_flags_for_arch(${arch} UBSAN_TEST_TARGET_ARCH_FLAGS_AS_LIST) + string(REPLACE ";" " " UBSAN_TEST_TARGET_ARCH_FLAGS "${UBSAN_TEST_TARGET_ARCH_FLAGS_AS_LIST}") + set(UBSAN_TEST_TARGET_CFLAGS + "${UBSAN_TEST_TARGET_ARCH_FLAGS} -isysroot ${DARWIN_${platform}_SYSROOT}") if (";${UBSAN_SUPPORTED_ARCH};" MATCHES ";${arch};") add_ubsan_device_testsuite("Standalone" ubsan ${platform} ${arch}) endif() |
