Index: cmake/config-ix.cmake
===================================================================
--- cmake/config-ix.cmake
+++ cmake/config-ix.cmake
@@ -174,7 +174,7 @@
   detect_target_arch()
   set(COMPILER_RT_OS_SUFFIX "-android")
 elseif(NOT APPLE) # Supported archs for Apple platforms are generated later
-  if("${LLVM_NATIVE_ARCH}" STREQUAL "X86")
+  if("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "x86")
     if(NOT MSVC)
       test_target_arch(x86_64 "" "-m64")
       # FIXME: We build runtimes for both i686 and i386, as "clang -m32" may
@@ -189,14 +189,14 @@
         test_target_arch(x86_64 "" "")
       endif()
     endif()
-  elseif("${LLVM_NATIVE_ARCH}" STREQUAL "PowerPC")
+  elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "powerpc")
     TEST_BIG_ENDIAN(HOST_IS_BIG_ENDIAN)
     if(HOST_IS_BIG_ENDIAN)
       test_target_arch(powerpc64 "" "-m64")
     else()
       test_target_arch(powerpc64le "" "-m64")
     endif()
-  elseif("${LLVM_NATIVE_ARCH}" STREQUAL "Mips")
+  elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "mips")
     # Gcc doesn't accept -m32/-m64 so we do the next best thing and use
     # -mips32r2/-mips64r2. We don't use -mips1/-mips3 because we want to match
     # clang's default CPU's. In the 64-bit case, we must also specify the ABI