tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake
2--- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900
3+++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900
4@@ -37,6 +37,6 @@
5
6 set(ARM64 aarch64)
7-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv8m.main armv8.1m.main)
8+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l armv8m.main armv8.1m.main)
9 set(HEXAGON hexagon)
10 set(X86 i386)
11 set(X86_64 x86_64)
12diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt
13--- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900
14+++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900
15@@ -555,6 +555,7 @@
16 set(armv7_SOURCES ${arm_SOURCES})
17 set(armv7s_SOURCES ${arm_SOURCES})
18 set(armv7k_SOURCES ${arm_SOURCES})
19+set(armv7l_SOURCES ${arm_SOURCES})
20 set(arm64_SOURCES ${aarch64_SOURCES})
21
22 # macho_embedded archs
23@@ -705,7 +705,7 @@
24 foreach (arch ${BUILTIN_SUPPORTED_ARCH})
25 if (CAN_TARGET_${arch})
26 # For ARM archs, exclude any VFP builtins if VFP is not supported
27- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em|armv8m.main|armv8.1m.main)$")
28+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em|armv8m.main|armv8.1m.main)$")
29 string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}")
30 check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP)
31 if(NOT COMPILER_RT_HAS_${arch}_VFP)