diff options
| -rw-r--r-- | compiler-rt/cmake/config-ix.cmake | 5 | ||||
| -rw-r--r-- | compiler-rt/lib/builtins/CMakeLists.txt | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 0b5367c71ca..b7ac47b6feb 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -207,7 +207,8 @@ elseif(NOT APPLE) # Supported archs for Apple platforms are generated later test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu") test_target_arch(mips64 "" "-mips64r2" "-mabi=n64") elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "arm") - test_target_arch(arm "" "-march=armv7-a") + test_target_arch(arm "" "-march=armv7-a -mfloat-abi=soft") + test_target_arch(armhf "" "-march=armv7-a -mfloat-abi=hard") elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32") test_target_arch(aarch32 "" "-march=armv8-a") elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64") @@ -246,7 +247,7 @@ function(get_target_flags_for_arch arch out_var) endfunction() set(ARM64 aarch64) -set(ARM32 arm) +set(ARM32 arm armhf) set(X86 i386 i686) set(X86_64 x86_64) set(MIPS32 mips mipsel) diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt index 6ea3850280f..dcfe6bdddbb 100644 --- a/compiler-rt/lib/builtins/CMakeLists.txt +++ b/compiler-rt/lib/builtins/CMakeLists.txt @@ -313,6 +313,7 @@ set(aarch64_SOURCES trunctfsf2.c ${GENERIC_SOURCES}) +set(armhf_SOURCES ${arm_SOURCES}) set(armv7_SOURCES ${arm_SOURCES}) set(armv7s_SOURCES ${arm_SOURCES}) set(arm64_SOURCES ${aarch64_SOURCES}) |
