-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
llvmPackages_15.compiler-rt: update the armv7l patch
see the discussion here for context: #194634 (comment)
- Loading branch information
Showing
1 changed file
with
14 additions
and
14 deletions.
There are no files selected for viewing
28 changes: 14 additions & 14 deletions
28
pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,32 @@ | ||
| 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 @@ | ||
|
|
||
| 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) | ||
| +set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) | ||
| -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 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 @@ | ||
| 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 | ||
| @@ -595,7 +596,7 @@ | ||
| @@ -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)$") | ||
| + if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") | ||
| - 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) |