diff options
| -rw-r--r-- | compiler-rt/test/asan/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | compiler-rt/test/scudo/CMakeLists.txt | 10 |
2 files changed, 2 insertions, 16 deletions
diff --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt index 6c22ef3b10e..2a44aebd55d 100644 --- a/compiler-rt/test/asan/CMakeLists.txt +++ b/compiler-rt/test/asan/CMakeLists.txt @@ -45,14 +45,8 @@ if(OS_NAME MATCHES "SunOS") endif() foreach(arch ${ASAN_TEST_ARCH}) - if(ANDROID) - set(ASAN_TEST_TARGET_ARCH ${arch}-android) - else() - set(ASAN_TEST_TARGET_ARCH ${arch}) - endif() - + set(ASAN_TEST_TARGET_ARCH ${arch}) set(ASAN_TEST_APPLE_PLATFORM "osx") - string(TOLOWER "-${arch}-${OS_NAME}" ASAN_TEST_CONFIG_SUFFIX) get_bits_for_arch(${arch} ASAN_TEST_BITS) get_test_cc_for_arch(${arch} ASAN_TEST_TARGET_CC ASAN_TEST_TARGET_CFLAGS) diff --git a/compiler-rt/test/scudo/CMakeLists.txt b/compiler-rt/test/scudo/CMakeLists.txt index dd513f3c7de..7e0702e9bf1 100644 --- a/compiler-rt/test/scudo/CMakeLists.txt +++ b/compiler-rt/test/scudo/CMakeLists.txt @@ -15,15 +15,7 @@ configure_lit_site_cfg( set(SCUDO_TEST_ARCH ${SCUDO_SUPPORTED_ARCH}) foreach(arch ${SCUDO_TEST_ARCH}) - if(ANDROID) - if (${arch} STREQUAL "i386") - set(SCUDO_TEST_TARGET_ARCH i686-android) - else() - set(SCUDO_TEST_TARGET_ARCH ${arch}-android) - endif() - else() - set(SCUDO_TEST_TARGET_ARCH ${arch}) - endif() + set(SCUDO_TEST_TARGET_ARCH ${arch}) string(TOLOWER "-${arch}" SCUDO_TEST_CONFIG_SUFFIX) get_test_cc_for_arch(${arch} SCUDO_TEST_TARGET_CC SCUDO_TEST_TARGET_CFLAGS) string(TOUPPER ${arch} ARCH_UPPER_CASE) |
