--- cmake/config-ix.cmake.orig	2016-05-02 20:51:53.598525522 +0000
+++ cmake/config-ix.cmake	2016-05-02 20:53:24.573519349 +0000
@@ -189,11 +189,6 @@
   if("${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)
         test_target_arch(i386 "" "")