From 34cb659103fd1818c0509daf958863f974cf7985 Mon Sep 17 00:00:00 2001 From: Renato Golin Date: Wed, 8 Oct 2014 13:47:18 +0000 Subject: [PATCH] Separating ARM/AArch64 Compiler-RT tests Makes sure ARM bots don't run AArch64 and vice-versa, since not all AArch64 systems can run AArch32 and no ARM hardware can run AArch64. llvm-svn: 219304 --- compiler-rt/cmake/config-ix.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 1afedde297f5..ccfd4dc046b2 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -140,11 +140,12 @@ else() test_target_arch(mips ${TARGET_32_BIT_CFLAGS}) test_target_arch(mips64 ${TARGET_64_BIT_CFLAGS}) endif() - endif() - # Build ARM libraries if we are configured to test on ARM - if("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm|aarch64") + elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm") test_target_arch(arm "-march=armv7-a") - test_target_arch(aarch64 "-march=armv8-a") + elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch32") + test_target_arch(aarch32 "-march=armv8-a") + elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch64") + test_target_arch(aarch64 "-march=aarch64") endif() set(COMPILER_RT_OS_SUFFIX "") endif()