33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
|
diff -ur a/cmake/builtin-config-ix.cmake b/cmake/builtin-config-ix.cmake
|
||
|
|
--- a/cmake/builtin-config-ix.cmake @llvm 15.0.6
|
||
|
|
+++ b/cmake/builtin-config-ix.cmake
|
||
|
|
@@ -46,7 +46,7 @@
|
||
|
|
|
||
|
|
set(ARM64 aarch64)
|
||
|
|
-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv8m.main armv8.1m.main)
|
||
|
|
+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l armv8m.main armv8.1m.main)
|
||
|
|
set(AVR avr)
|
||
|
|
set(HEXAGON hexagon)
|
||
|
|
set(X86 i386)
|
||
|
|
set(X86_64 x86_64)
|
||
|
|
diff -ur a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
|
||
|
|
--- a/lib/builtins/CMakeLists.txt @llvm 15.0.6
|
||
|
|
+++ b/lib/builtins/CMakeLists.txt
|
||
|
|
@@ -565,6 +565,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
|
||
|
|
@@ -734,7 +735,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|armv8m.main|armv8.1m.main)$")
|
||
|
|
+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em|armv8m.main|armv8.1m.main)$")
|
||
|
|
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)
|