diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-15 18:13:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-15 18:13:27 +0000 |
| commit | dfd4f1430301305a0c543f034a95aaae6e3ce09d (patch) | |
| tree | e451a4f3f1defad8765a1bdcee54846f014741fd /pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch | |
| parent | 80e725f3dc9daff0b720b4cb7d7088cdc65e015d (diff) | |
| parent | bc5c0c559f1c93ccea9a7f21066b6314831bea3d (diff) | |
| download | nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.gz nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.bz2 nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.lz nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.xz nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.zst nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch')
| -rw-r--r-- | pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch new file mode 100644 index 000000000000..120cfe6feb2a --- /dev/null +++ b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch @@ -0,0 +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 @@ + + + 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(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 @@ + 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 @@ + 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)$") + 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) |