tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff -ur a/cmake/builtin-config-ix.cmake b/cmake/builtin-config-ix.cmake
2--- a/cmake/builtin-config-ix.cmake @llvm 15.0.6
3+++ b/cmake/builtin-config-ix.cmake
4@@ -46,7 +46,7 @@
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(AVR avr)
10 set(HEXAGON hexagon)
11 set(X86 i386)
12 set(X86_64 x86_64)
13diff -ur a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
14--- a/lib/builtins/CMakeLists.txt @llvm 15.0.6
15+++ b/lib/builtins/CMakeLists.txt
16@@ -565,6 +565,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@@ -734,7 +735,7 @@
25 foreach (arch ${BUILTIN_SUPPORTED_ARCH})
26 if (CAN_TARGET_${arch})
27 # For ARM archs, exclude any VFP builtins if VFP is not supported
28- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em|armv8m.main|armv8.1m.main)$")
29+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em|armv8m.main|armv8.1m.main)$")
30 string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}")
31 check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP)
32 if(NOT COMPILER_RT_HAS_${arch}_VFP)