tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff -ur compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake
2--- compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake 2018-05-25 06:36:27.000000000 +0900
3+++ compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-09 20:26:33.030608692 +0900
4@@ -24,7 +24,7 @@
5
6
7 set(ARM64 aarch64)
8-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k)
9+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l)
10 set(HEXAGON hexagon)
11 set(X86 i386)
12 set(X86_64 x86_64)
13diff -ur compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt
14--- compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt 2018-07-31 03:18:59.000000000 +0900
15+++ compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-09 20:27:38.893409318 +0900
16@@ -453,6 +453,7 @@
17 set(armv7_SOURCES ${arm_SOURCES})
18 set(armv7s_SOURCES ${arm_SOURCES})
19 set(armv7k_SOURCES ${arm_SOURCES})
20+set(armv7l_SOURCES ${arm_SOURCES})
21 set(arm64_SOURCES ${aarch64_SOURCES})
22
23 # macho_embedded archs
24@@ -563,12 +564,12 @@
25 set(_arch ${arch})
26 if("${arch}" STREQUAL "armv6m")
27 set(_arch "arm|armv6m")
28- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$")
29+ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$")
30 set(_arch "arm")
31 endif()
32
33 # For ARM archs, exclude any VFP builtins if VFP is not supported
34- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$")
35+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$")
36 string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}")
37 check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP)
38 if(NOT COMPILER_RT_HAS_${arch}_VFP)