diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-05-11 10:51:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 10:51:50 -0500 |
| commit | 028d3228544358a73a24534741e8d51629b49218 (patch) | |
| tree | a72b49047395a9442d89a88706e01c1bdcbd1f30 /pkgs/development/compilers/llvm/8/compiler-rt-armv7l.patch | |
| parent | 2a23ffc124a733a9889c06de182a3d2f557a1008 (diff) | |
| parent | d616ae8c6de5294cbd7db2431325f6b5387a4262 (diff) | |
| download | nixlib-028d3228544358a73a24534741e8d51629b49218.tar nixlib-028d3228544358a73a24534741e8d51629b49218.tar.gz nixlib-028d3228544358a73a24534741e8d51629b49218.tar.bz2 nixlib-028d3228544358a73a24534741e8d51629b49218.tar.lz nixlib-028d3228544358a73a24534741e8d51629b49218.tar.xz nixlib-028d3228544358a73a24534741e8d51629b49218.tar.zst nixlib-028d3228544358a73a24534741e8d51629b49218.zip | |
Merge pull request #87419 from thefloweringash/compiler-rt-armv7l
compiler-rt: fix build on armv7l
Diffstat (limited to 'pkgs/development/compilers/llvm/8/compiler-rt-armv7l.patch')
| -rw-r--r-- | pkgs/development/compilers/llvm/8/compiler-rt-armv7l.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/8/compiler-rt-armv7l.patch new file mode 100644 index 000000000000..89d7f1aec918 --- /dev/null +++ b/pkgs/development/compilers/llvm/8/compiler-rt-armv7l.patch @@ -0,0 +1,38 @@ +diff -ur compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake 2018-05-25 06:36:27.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-09 20:26:33.030608692 +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-7.1.0.src/lib/builtins/CMakeLists.txt compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt 2018-07-31 03:18:59.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-09 20:27:38.893409318 +0900 +@@ -453,6 +453,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 +@@ -563,12 +564,12 @@ + set(_arch ${arch}) + if("${arch}" STREQUAL "armv6m") + set(_arch "arm|armv6m") +- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + set(_arch "arm") + endif() + + # 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) |