diff options
| author | Rahul Butani <rrbutani@users.noreply.github.com> | 2023-01-15 16:12:15 -0800 |
|---|---|---|
| committer | Rahul Butani <rrbutani@users.noreply.github.com> | 2023-01-27 13:29:21 -0800 |
| commit | f91fad438b3b150f20e6a222a254760d6fac302e (patch) | |
| tree | a823cbee699a4fa71e6d313241820d5416a46f2a /pkgs/development/compilers | |
| parent | 09b8886d5e7e2511a8e68cfe04f11cabb07da539 (diff) | |
| download | nixlib-f91fad438b3b150f20e6a222a254760d6fac302e.tar nixlib-f91fad438b3b150f20e6a222a254760d6fac302e.tar.gz nixlib-f91fad438b3b150f20e6a222a254760d6fac302e.tar.bz2 nixlib-f91fad438b3b150f20e6a222a254760d6fac302e.tar.lz nixlib-f91fad438b3b150f20e6a222a254760d6fac302e.tar.xz nixlib-f91fad438b3b150f20e6a222a254760d6fac302e.tar.zst nixlib-f91fad438b3b150f20e6a222a254760d6fac302e.zip | |
llvmPackages_15.compiler-rt: update the armv7l patch
see the discussion here for context: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch index 120cfe6feb2a..ca1c2332abd9 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch +++ b/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch @@ -1,19 +1,19 @@ -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}) @@ -21,12 +21,12 @@ diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.s 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) |