Index: cmake/config-ix.cmake
===================================================================
--- cmake/config-ix.cmake
+++ cmake/config-ix.cmake
@@ -140,11 +140,12 @@
       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()