[PATCH] D12222: build: tweak default builtins set for Darwin

[Saleem Abdulrasool via llvm-commits]

compnerd created this revision.
compnerd added a reviewer: beanz.
compnerd added a subscriber: llvm-commits.
compnerd set the repository for this revision to rL LLVM.

In light of the recent work to support building for the Darwin targets with
cmake, tweak the default builtins sources.  Remove the apple versioning in
non-Apple builds, and remove the AEABI functions from the Apple build since it
does not conform to the AEABI RTABI.


Repository:
  rL LLVM

http://reviews.llvm.org/D12222

Files:
  lib/builtins/CMakeLists.txt

Index: lib/builtins/CMakeLists.txt
===================================================================
--- lib/builtins/CMakeLists.txt
+++ lib/builtins/CMakeLists.txt
@@ -12,7 +12,6 @@
   addvdi3.c
   addvsi3.c
   addvti3.c
-  apple_versioning.c
   ashldi3.c
   ashlti3.c
   ashrdi3.c
@@ -139,6 +138,12 @@
   umodsi3.c
   umodti3.c)
 
+if (APPLE)
+  set(GENERIC_SOURCES
+      apple_versioning.c
+      ${GENERIC_SOURCES})
+endif ()
+
 if (HAVE_UNWIND_H)
   set(GENERIC_SOURCES
       ${GENERIC_SOURCES}
@@ -189,23 +194,6 @@
 set(arm_SOURCES
   arm/adddf3vfp.S
   arm/addsf3vfp.S
-  arm/aeabi_cdcmp.S
-  arm/aeabi_cdcmpeq_check_nan.c
-  arm/aeabi_cfcmp.S
-  arm/aeabi_cfcmpeq_check_nan.c
-  arm/aeabi_dcmp.S
-  arm/aeabi_div0.c
-  arm/aeabi_drsub.c
-  arm/aeabi_fcmp.S
-  arm/aeabi_frsub.c
-  arm/aeabi_idivmod.S
-  arm/aeabi_ldivmod.S
-  arm/aeabi_memcmp.S
-  arm/aeabi_memcpy.S
-  arm/aeabi_memmove.S
-  arm/aeabi_memset.S
-  arm/aeabi_uidivmod.S
-  arm/aeabi_uldivmod.S
   arm/bswapdi2.S
   arm/bswapsi2.S
   arm/comparesf2.S
@@ -276,6 +264,28 @@
   arm/unordsf2vfp.S
   ${GENERIC_SOURCES})
 
+if (NOT APPLE)
+  set(arm_SOURCES
+      arm/aeabi_cdcmp.S
+      arm/aeabi_cdcmpeq_check_nan.c
+      arm/aeabi_cfcmp.S
+      arm/aeabi_cfcmpeq_check_nan.c
+      arm/aeabi_dcmp.S
+      arm/aeabi_div0.c
+      arm/aeabi_drsub.c
+      arm/aeabi_fcmp.S
+      arm/aeabi_frsub.c
+      arm/aeabi_idivmod.S
+      arm/aeabi_ldivmod.S
+      arm/aeabi_memcmp.S
+      arm/aeabi_memcpy.S
+      arm/aeabi_memmove.S
+      arm/aeabi_memset.S
+      arm/aeabi_uidivmod.S
+      arm/aeabi_uldivmod.S
+      ${arm_SOURCES})
+endif ()
+
 set(aarch64_SOURCES
   comparetf2.c
   extenddftf2.c


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D12222.32798.patch
Type: text/x-patch
Size: 1681 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150821/b91d5460/attachment.bin>