[CMake] Fix building builtins on Linux and Darwin.

[beanz]

Summary

I broke building the builtins with r245967. This fixes them on Linux and builds them properly for Darwin.

The old code could not be made to work on Darwin as a result of the refactoring of add_compiler_rt_runtime, so I had to rework the way they are built for Darwin. This solution is not ideal and will be fixed in subsequent commits. I just want to get this in so everything is working again.

[beanz]

Fixing the path for the lipo'd output library.

[samsonov]

cmake/config-ix.cmake

261

You also need i686 here (it's currently listed in lib/builtins/CMakeLists.txt).

419–421

Please fix the variable name to BUILTIN_SUPPORTED_ARCH

lib/builtins/CMakeLists.txt

335

You probably can also list(APPEND) here. Also, please keep the line length smaller.

340

Line length.

[beanz]

Updates based on feedback from samsonov.

[samsonov]

LGTM

cmake/config-ix.cmake

 set(ARM32 arm)
 set(X86_64 x86_64)
 if(APPLE)
   set(ARM64 arm64)
   set(ARM32 armv7 armv7s)
   set(X86_64 x86_64 x86_64h)
 endif()
 
+set(ALL_BUILTIN_SUPPORTED_ARCH i386 ${X86_64} ${ARM32} ${ARM64})
 set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86_64} i386 i686 powerpc64
   powerpc64le ${ARM32} ${ARM64} mips mips64 mipsel mips64el)
 set(ALL_ASAN_SUPPORTED_ARCH ${X86_64} i386 i686 powerpc64 powerpc64le ${ARM32}
   ${ARM64} mips mipsel mips64 mips64el)
 set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} mips64 mips64el ${ARM64})
 set(ALL_LSAN_SUPPORTED_ARCH ${X86_64} mips64 mips64el)
 set(ALL_MSAN_SUPPORTED_ARCH ${X86_64} mips64 mips64el)
 set(ALL_PROFILE_SUPPORTED_ARCH ${X86_64} i386 i686 ${ARM32} mips mips64
if(IOS_SDK_DIR AND COMPILER_RT_ENABLE_IOS)
         set(CAN_TARGET_${arch} 1)
       endforeach()
     endif()
   endif()
 
   # for list_union
   include(CompilerRTUtils)
 
+  list_union(BUILTIN_SUPPORTED_ARCH ALL_BUILTIN_SUPPORTED_ARCH toolchain_arches)
+
   list_union(SANITIZER_COMMON_SUPPORTED_ARCH
     ALL_SANITIZER_COMMON_SUPPORTED_ARCH
     COMPILER_RT_SUPPORTED_ARCH
     )
   set(LSAN_COMMON_SUPPORTED_ARCH ${SANITIZER_COMMON_SUPPORTED_ARCH})
   set(UBSAN_COMMON_SUPPORTED_ARCH ${SANITIZER_COMMON_SUPPORTED_ARCH})
   list_union(ASAN_SUPPORTED_ARCH
     ALL_ASAN_SUPPORTED_ARCH
if(APPLE)
   list_union(UBSAN_SUPPORTED_ARCH
     ALL_UBSAN_SUPPORTED_ARCH
     SANITIZER_COMMON_SUPPORTED_ARCH)
   list_union(SAFESTACK_SUPPORTED_ARCH
     ALL_SAFESTACK_SUPPORTED_ARCH
     SANITIZER_COMMON_SUPPORTED_ARCH)
 else()
   # Architectures supported by compiler-rt libraries.
   filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH
+    ${ALL_BUILTIN_SUPPORTED_ARCH})
+  filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH
     ${ALL_SANITIZER_COMMON_SUPPORTED_ARCH})
   # LSan and UBSan common files should be available on all architectures
   # supported by other sanitizers (even if they build into dummy object files).
   filter_available_targets(LSAN_COMMON_SUPPORTED_ARCH
     ${SANITIZER_COMMON_SUPPORTED_ARCH})
   filter_available_targets(UBSAN_COMMON_SUPPORTED_ARCH
     ${SANITIZER_COMMON_SUPPORTED_ARCH})
   filter_available_targets(ASAN_SUPPORTED_ARCH ${ALL_ASAN_SUPPORTED_ARCH})

lib/builtins/CMakeLists.txt

 set(x86_64_SOURCES
   x86_64/floatdidf.c
   x86_64/floatdisf.c
   x86_64/floatdixf.c
   x86_64/floatundidf.S
   x86_64/floatundisf.S
   x86_64/floatundixf.S
   ${GENERIC_SOURCES})
+set(x86_64h_SOURCES ${x86_64_SOURCES})
 
 if(WIN32)
   set(x86_64_SOURCES
       ${x86_64_SOURCES}
       x86_64/chkstk.S)
 endif()
 
 set(i386_SOURCES
set(aarch64_SOURCES
   floatsitf.c
   floatunditf.c
   floatunsitf.c
   multc3.c
   trunctfdf2.c
   trunctfsf2.c
   ${GENERIC_SOURCES})
 
+set(armv7_SOURCES ${arm_SOURCES})
+set(armv7s_SOURCES ${arm_SOURCES})
+set(arm64_SOURCES ${aarch64_SOURCES})
+
 add_custom_target(builtins)
 
-if(APPLE)
-  set(OS_OPTION OS osx)
-endif()
+if (APPLE)
+  foreach (os osx)
+    list_union(DARWIN_BUILTIN_ARCHS DARWIN_${os}_ARCHS BUILTIN_SUPPORTED_ARCH)
+    set(${os}_builtin_libs)
+    set(${os}_builtin_lipo_flags)
+    foreach (arch ${DARWIN_BUILTIN_ARCHS})
+      # Filter out generic versions of routines that are re-implemented in
+      # architecture specific manner.  This prevents multiple definitions of the
+      # same symbols, making the symbol selection non-deterministic.
+      foreach (_file ${${arch}_SOURCES})
+        if (${_file} MATCHES ${arch}/*)
+          get_filename_component(_name ${_file} NAME)
+          string(REPLACE ".S" ".c" _cname "${_name}")
+          list(REMOVE_ITEM ${arch}_SOURCES ${_cname})
+        endif ()
+      endforeach ()
+
+      add_compiler_rt_runtime(clang_rt.builtins_${arch} STATIC
+                              OS ${os}
+                              ARCHS ${arch}
+                              SOURCES ${${arch}_SOURCES}
+                              CFLAGS "-std=c99" ${DARWIN_${os}_CFLAGS} -arch ${arch}
+                              PARENT_TARGET builtins)
+      list(APPEND ${os}_builtin_libs clang_rt.builtins_${arch}_${os})
+      set(${os}_builtin_lipo_flags ${${os}_builtin_lipo_flags} -arch ${arch} ${COMPILER_RT_LIBRARY_OUTPUT_DIR}/libclang_rt.builtins_${arch}_${os}.a)
+    endforeach()
 
-if (NOT WIN32 OR MINGW)
-  foreach (arch x86_64 i386 i686 arm aarch64)
+    if(${os}_builtin_libs)
+      add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/clang_rt.builtins_${os}.a
+        COMMAND lipo -output ${CMAKE_CURRENT_BINARY_DIR}/clang_rt.builtins_${os}.a -create ${${os}_builtin_lipo_flags}
+        DEPENDS ${${os}_builtin_libs}
+        )
+      add_custom_target(clang_rt.builtins_${os}
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/clang_rt.builtins_${os}.a)
+      add_dependencies(builtins clang_rt.builtins_${os})
+    endif()
+  endforeach()
+elseif (NOT WIN32 OR MINGW)
+  foreach (arch ${BUILTIN_SUPPORTED_ARCH})
     if (CAN_TARGET_${arch})
       # Filter out generic versions of routines that are re-implemented in
       # architecture specific manner.  This prevents multiple definitions of the
       # same symbols, making the symbol selection non-deterministic.
       foreach (_file ${${arch}_SOURCES})
         if (${_file} MATCHES ${arch}/*)
           get_filename_component(_name ${_file} NAME)
           string(REPLACE ".S" ".c" _cname "${_name}")
           list(REMOVE_ITEM ${arch}_SOURCES ${_cname})
         endif ()
       endforeach ()
 
       add_compiler_rt_runtime(clang_rt.builtins
                               STATIC
-                              ARCH ${arch}
-                              ${OS_OPTION}
+                              ARCHS ${arch}
                               SOURCES ${${arch}_SOURCES}
                               CFLAGS "-std=c99"
                               PARENT_TARGET builtins)
     endif ()
   endforeach ()
 endif ()
 
 add_dependencies(compiler-rt builtins)