1 --- src/compiler-rt/cmake/config-ix.cmake.orig 2016-08-16 01:54:40 UTC
2 +++ src/compiler-rt/cmake/config-ix.cmake
3 @@ -188,20 +188,9 @@ if(ANDROID)
4 set(COMPILER_RT_OS_SUFFIX "-android")
5 elseif(NOT APPLE) # Supported archs for Apple platforms are generated later
6 if("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "i[2-6]86|x86|amd64")
8 - test_target_arch(x86_64 "" "-m64")
9 - # FIXME: We build runtimes for both i686 and i386, as "clang -m32" may
10 - # target different variant than "$CMAKE_C_COMPILER -m32". This part should
11 - # be gone after we resolve PR14109.
12 - test_target_arch(i686 __i686__ "-m32")
13 - test_target_arch(i386 __i386__ "-m32")
15 - if (CMAKE_SIZEOF_VOID_P EQUAL 4)
16 - test_target_arch(i386 "" "")
18 - test_target_arch(x86_64 "" "")
21 + test_target_arch(x86_64 "" "")
22 + test_target_arch(i686 "" "")
23 + test_target_arch(i386 "" "")
24 elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc")
25 TEST_BIG_ENDIAN(HOST_IS_BIG_ENDIAN)
26 if(HOST_IS_BIG_ENDIAN)