mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 06:33:42 +00:00
33 lines
1.6 KiB
Diff
33 lines
1.6 KiB
Diff
|
diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake
|
||
|
|
--- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900
|
||
|
|
+++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +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-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt
|
||
|
|
--- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900
|
||
|
|
+++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900
|
||
|
|
@@ -474,6 +474,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
|
||
|
|
@@ -595,7 +596,7 @@
|
||
|
|
foreach (arch ${BUILTIN_SUPPORTED_ARCH})
|
||
|
|
if (CAN_TARGET_${arch})
|
||
|
|
# 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)
|