[compiler-rt] r230709 - [CMake] Effectively revert r230683.

[Alexey Samsonov]

Author: samsonov
Date: Thu Feb 26 18:07:04 2015
New Revision: 230709

URL: http://llvm.org/viewvc/llvm-project?rev=230709&view=rev
Log:
[CMake] Effectively revert r230683.

Clang in 32-bit mode may choose to target different architecture
than host compiler.

Modified:
    compiler-rt/trunk/cmake/config-ix.cmake

Modified: compiler-rt/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=230709&r1=230708&r2=230709&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/config-ix.cmake (original)
+++ compiler-rt/trunk/cmake/config-ix.cmake Thu Feb 26 18:07:04 2015
@@ -161,10 +161,11 @@ else()
   if("${LLVM_NATIVE_ARCH}" STREQUAL "X86")
     if(NOT MSVC)
       test_target_arch(x86_64 "" "-m64")
+      # FIXME: We build runtimes for both i686 and i386, as "clang -m32" may
+      # target different variant than "$CMAKE_C_COMPILER -m32". This part should
+      # be gone after we resolve PR14109.
       test_target_arch(i686 __i686__ "-m32")
-      if(NOT CAN_TARGET_i686)
-        test_target_arch(i386 __i386__ "-m32")
-      endif()
+      test_target_arch(i386 __i386__ "-m32")
     else()
       test_target_arch(i386 "" "")
     endif()