about summary refs log tree commit diff
path: root/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-04-15 18:13:27 +0000
committerGitHub <noreply@github.com>2021-04-15 18:13:27 +0000
commitdfd4f1430301305a0c543f034a95aaae6e3ce09d (patch)
treee451a4f3f1defad8765a1bdcee54846f014741fd /pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch
parent80e725f3dc9daff0b720b4cb7d7088cdc65e015d (diff)
parentbc5c0c559f1c93ccea9a7f21066b6314831bea3d (diff)
downloadnixlib-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-X86-support-extension.patch')
-rw-r--r--pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch
new file mode 100644
index 000000000000..f6f9336ad5ad
--- /dev/null
+++ b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch
@@ -0,0 +1,23 @@
+diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
+index 3a66dd9c3fb..7efc85d9f9f 100644
+--- a/lib/builtins/CMakeLists.txt
++++ b/lib/builtins/CMakeLists.txt
+@@ -301,6 +301,10 @@ if (NOT MSVC)
+     i386/umoddi3.S
+   )
+ 
++  set(i486_SOURCES ${i386_SOURCES})
++  set(i586_SOURCES ${i386_SOURCES})
++  set(i686_SOURCES ${i386_SOURCES})
++
+   if (WIN32)
+     set(i386_SOURCES
+       ${i386_SOURCES}
+@@ -608,6 +612,7 @@ else ()
+   endif()
+ 
+   foreach (arch ${BUILTIN_SUPPORTED_ARCH})
++      message("arch: ${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)$")