[compiler-rt] r333232 - Revert "[cmake] [ARM] Check if VFP is supported before including any VFP builtins"

[Azharuddin Mohammed via llvm-commits]

Author: azharudd
Date: Thu May 24 14:36:27 2018
New Revision: 333232

URL: http://llvm.org/viewvc/llvm-project?rev=333232&view=rev
Log:
Revert "[cmake] [ARM] Check if VFP is supported before including any VFP builtins"

This reverts commit 2a10f5da5acb1b51d0a2ecf13dca0bf1de859db2.

Modified:
    compiler-rt/trunk/cmake/builtin-config-ix.cmake
    compiler-rt/trunk/lib/builtins/CMakeLists.txt

Modified: compiler-rt/trunk/cmake/builtin-config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/builtin-config-ix.cmake?rev=333232&r1=333231&r2=333232&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/builtin-config-ix.cmake (original)
+++ compiler-rt/trunk/cmake/builtin-config-ix.cmake Thu May 24 14:36:27 2018
@@ -48,12 +48,6 @@ set(ALL_BUILTIN_SUPPORTED_ARCH ${X86} ${
 include(CompilerRTUtils)
 include(CompilerRTDarwinUtils)
 
-# If targeting ARM, check if VFP is supported.
-if(CAN_TARGET_arm)
-  string(REPLACE ";" " " _TARGET_arm_CFLAGS "${TARGET_arm_CFLAGS}")
-  check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_arm_CFLAGS}" COMPILER_RT_HAS_ARM_VFP)
-endif()
-
 if(APPLE)
 
   find_darwin_sdk_dir(DARWIN_osx_SYSROOT macosx)

Modified: compiler-rt/trunk/lib/builtins/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/CMakeLists.txt?rev=333232&r1=333231&r2=333232&view=diff
==============================================================================
--- compiler-rt/trunk/lib/builtins/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/builtins/CMakeLists.txt Thu May 24 14:36:27 2018
@@ -394,20 +394,11 @@ set(arm_Thumb1_VFPv2_SOURCES
   arm/unordsf2vfp.S)
 set(arm_Thumb1_icache_SOURCES
   arm/sync_synchronize.S)
-
-# If VFP is supported, include arm_Thumb1_SjLj_EH_SOURCES and
-# arm_Thumb1_VFPv2_SOURCES in arm_Thumb1_SOURCES.
-if(COMPILER_RT_HAS_ARM_VFP)
-  set(arm_Thumb1_SOURCES
-    ${arm_Thumb1_JT_SOURCES}
-    ${arm_Thumb1_SjLj_EH_SOURCES}
-    ${arm_Thumb1_VFPv2_SOURCES}
-    ${arm_Thumb1_icache_SOURCES})
-else()
-  set(arm_Thumb1_SOURCES
-    ${arm_Thumb1_JT_SOURCES}
-    ${arm_Thumb1_icache_SOURCES})
-endif()
+set(arm_Thumb1_SOURCES
+  ${arm_Thumb1_JT_SOURCES}
+  ${arm_Thumb1_SjLj_EH_SOURCES}
+  ${arm_Thumb1_VFPv2_SOURCES}
+  ${arm_Thumb1_icache_SOURCES})
 
 if(MINGW)
   set(arm_SOURCES