summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorRenato Golin <renato.golin@linaro.org>2014-10-08 13:47:18 +0000
committerRenato Golin <renato.golin@linaro.org>2014-10-08 13:47:18 +0000
commit7f8371a90e00394baad495acebb65184de8f563d (patch)
tree301b5ef613b08345a30d450e5eafce6d49d24bfb /cmake
parent14ce15acbe5947e7d51fa1519a6dd6fd2b91beb0 (diff)
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. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@219304 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rw-r--r--cmake/config-ix.cmake9
1 files changed, 5 insertions, 4 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 1afedde29..ccfd4dc04 100644
--- a/cmake/config-ix.cmake
+++ b/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()