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

[Shoaib Meenai via llvm-commits]

You should use something like the git-svnrevert script to avoid having a git hash in the commit message. See http://llvm.org/docs/GettingStarted.html#for-developers-to-work-with-git-svn (I'm not sure if that works with the monorepo though).

It's also helpful to include a bit of context on why you're reverting (probably buildbot failures?).

From: llvm-commits <llvm-commits-bounces at lists.llvm.org> on behalf of Azharuddin Mohammed via llvm-commits <llvm-commits at lists.llvm.org>
Reply-To: Azharuddin Mohammed <azharudd at codeaurora.org>
Date: Thursday, May 24, 2018 at 2:40 PM
To: "llvm-commits at lists.llvm.org" <llvm-commits at lists.llvm.org>
Subject: [compiler-rt] r333232 - Revert "[cmake] [ARM] Check if VFP is supported before including any VFP builtins"

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

URL: https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D333232-26view-3Drev&d=DwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=o3kDXzdBUE3ljQXKeTWOMw&m=NsUEnvZEGaGrTL0HiDLKtfmtJfZKbsVK4QSuw7OjaOA&s=FwaI9wnqQkrJ7Piu5bGcWJEuc8UymfO1i-TGNMMgEg4&e=
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: https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_cmake_builtin-2Dconfig-2Dix.cmake-3Frev-3D333232-26r1-3D333231-26r2-3D333232-26view-3Ddiff&d=DwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=o3kDXzdBUE3ljQXKeTWOMw&m=NsUEnvZEGaGrTL0HiDLKtfmtJfZKbsVK4QSuw7OjaOA&s=WPfN6o5Gltl1LoCDQJKu_YrtJxuGgXDZE8wFaxEOmo8&e=
==============================================================================
--- 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: https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_lib_builtins_CMakeLists.txt-3Frev-3D333232-26r1-3D333231-26r2-3D333232-26view-3Ddiff&d=DwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=o3kDXzdBUE3ljQXKeTWOMw&m=NsUEnvZEGaGrTL0HiDLKtfmtJfZKbsVK4QSuw7OjaOA&s=UfvUl9Z8Qy8jfqa68ohiBn5HLjFEm_YR1mV_ogd-vTA&e=
==============================================================================
--- 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


_______________________________________________
llvm-commits mailing list
llvm-commits at lists.llvm.org<mailto:llvm-commits at lists.llvm.org>
https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.llvm.org_cgi-2Dbin_mailman_listinfo_llvm-2Dcommits&d=DwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=o3kDXzdBUE3ljQXKeTWOMw&m=NsUEnvZEGaGrTL0HiDLKtfmtJfZKbsVK4QSuw7OjaOA&s=EcYZfHcx5mlEWnVdWWtZq5SMjaH6wS54w-hJEwoVJ0E&e=

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180524/69852815/attachment.html>