From cc44d7c1f1d3e45e338faf2ecc4fb43c58dda330 Mon Sep 17 00:00:00 2001 From: Michal Gorny Date: Sun, 27 Aug 2017 20:37:06 +0000 Subject: Revert r311842 - [cmake] Remove i686 target that is duplicate to i386 The required change in clang is being reverted because of the Android build bot failure. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@311859 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/base-config-ix.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cmake/base-config-ix.cmake') diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake index 55f322538..f9904fbd1 100644 --- a/cmake/base-config-ix.cmake +++ b/cmake/base-config-ix.cmake @@ -139,6 +139,10 @@ macro(test_targets) elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "i[2-6]86|x86|amd64") 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") test_target_arch(i386 __i386__ "-m32") else() if (CMAKE_SIZEOF_VOID_P EQUAL 4) -- cgit v1.2.3