[PATCH] D47217: [cmake] [ARM] Exclude any VFP builtins if VFP is not supported

[Azharuddin Mohammed via Phabricator via llvm-commits]

azharudd updated this revision to Diff 155733.
azharudd added a comment.

I had to revert this last time as it was causing the armhf buildbot to fail. This should take care of that.


https://reviews.llvm.org/D47217

Files:
  lib/builtins/CMakeLists.txt


Index: lib/builtins/CMakeLists.txt
===================================================================
--- lib/builtins/CMakeLists.txt
+++ lib/builtins/CMakeLists.txt
@@ -566,6 +566,16 @@
         set(_arch "arm")
       endif()
 
+      # For ARM archs (besides armhf), exclude any VFP builtins if VFP is not
+      # supported
+      if (${arch} MATCHES "^(arm|armv7|armv7s|armv7k|armv7m|armv7em)$")
+        string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}")
+        check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP)
+        if(NOT COMPILER_RT_HAS_${arch}_VFP)
+          list(REMOVE_ITEM ${arch}_SOURCES ${arm_Thumb1_VFPv2_SOURCES} ${arm_Thumb1_SjLj_EH_SOURCES})
+        endif()
+      endif()
+
       # 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.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D47217.155733.patch
Type: text/x-patch
Size: 1014 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180716/ba4047ba/attachment.bin>