diff options
| author | Azharuddin Mohammed <azharudd@codeaurora.org> | 2018-05-24 21:36:27 +0000 |
|---|---|---|
| committer | Azharuddin Mohammed <azharudd@codeaurora.org> | 2018-05-24 21:36:27 +0000 |
| commit | 06e0fd3bc1e6de1b360c7723485e4494ec2d32f3 (patch) | |
| tree | 7a39e88fd6ebc2327acadc80582ddbbef056cdd9 | |
| parent | a4ffa3accf25c0f57f3cdef74bc1a3fdd8cfc0be (diff) | |
| download | bcm5719-llvm-06e0fd3bc1e6de1b360c7723485e4494ec2d32f3.tar.gz bcm5719-llvm-06e0fd3bc1e6de1b360c7723485e4494ec2d32f3.zip | |
Revert "[cmake] [ARM] Check if VFP is supported before including any VFP builtins"
This reverts commit 2a10f5da5acb1b51d0a2ecf13dca0bf1de859db2.
llvm-svn: 333232
| -rw-r--r-- | compiler-rt/cmake/builtin-config-ix.cmake | 6 | ||||
| -rw-r--r-- | compiler-rt/lib/builtins/CMakeLists.txt | 19 |
2 files changed, 5 insertions, 20 deletions
diff --git a/compiler-rt/cmake/builtin-config-ix.cmake b/compiler-rt/cmake/builtin-config-ix.cmake index e3f13203321..a5704e5fed5 100644 --- a/compiler-rt/cmake/builtin-config-ix.cmake +++ b/compiler-rt/cmake/builtin-config-ix.cmake @@ -48,12 +48,6 @@ set(ALL_BUILTIN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} 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) diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt index 2099c46efa4..5e7f2246787 100644 --- a/compiler-rt/lib/builtins/CMakeLists.txt +++ b/compiler-rt/lib/builtins/CMakeLists.txt @@ -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 |
