forked from mirrors/nixpkgs
39 lines
1.9 KiB
Diff
39 lines
1.9 KiB
Diff
diff -ur compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake
|
|
--- compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake 2018-05-25 06:36:27.000000000 +0900
|
|
+++ compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-09 20:26:33.030608692 +0900
|
|
@@ -24,7 +24,7 @@
|
|
|
|
|
|
set(ARM64 aarch64)
|
|
-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k)
|
|
+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l)
|
|
set(HEXAGON hexagon)
|
|
set(X86 i386)
|
|
set(X86_64 x86_64)
|
|
diff -ur compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt
|
|
--- compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt 2018-07-31 03:18:59.000000000 +0900
|
|
+++ compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-09 20:27:38.893409318 +0900
|
|
@@ -453,6 +453,7 @@
|
|
set(armv7_SOURCES ${arm_SOURCES})
|
|
set(armv7s_SOURCES ${arm_SOURCES})
|
|
set(armv7k_SOURCES ${arm_SOURCES})
|
|
+set(armv7l_SOURCES ${arm_SOURCES})
|
|
set(arm64_SOURCES ${aarch64_SOURCES})
|
|
|
|
# macho_embedded archs
|
|
@@ -563,12 +564,12 @@
|
|
set(_arch ${arch})
|
|
if("${arch}" STREQUAL "armv6m")
|
|
set(_arch "arm|armv6m")
|
|
- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$")
|
|
+ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$")
|
|
set(_arch "arm")
|
|
endif()
|
|
|
|
# For ARM archs, exclude any VFP builtins if VFP is not supported
|
|
- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$")
|
|
+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|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)
|