diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-08-13 20:39:08 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-08-13 20:39:32 +0200 |
| commit | b86c019efbc5c4ea35f3cd6d2f52985f40e49e6c (patch) | |
| tree | 01c8ec8d4172c2834bef1e8859d6ca8b99338470 /gnu/packages/patches/openblas-fix-tests-i686.patch | |
| parent | 25bd72678ae4048b0b84ee82bc5f2644367e9715 (diff) | |
| parent | 7b38f045c04fe69001ff5c2f04486cc51a69ae82 (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/patches/openblas-fix-tests-i686.patch')
| -rw-r--r-- | gnu/packages/patches/openblas-fix-tests-i686.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/gnu/packages/patches/openblas-fix-tests-i686.patch b/gnu/packages/patches/openblas-fix-tests-i686.patch deleted file mode 100644 index 3325546ea3..0000000000 --- a/gnu/packages/patches/openblas-fix-tests-i686.patch +++ /dev/null @@ -1,35 +0,0 @@ -Fix a test failure on some i686 systems: - -https://github.com/xianyi/OpenBLAS/issues/1575 - -This patch is a squashed version of these commits: - -https://github.com/xianyi/OpenBLAS/pull/1583 - -diff --git a/kernel/x86/KERNEL.NEHALEM b/kernel/x86/KERNEL.NEHALEM -index 835520ef..65b03ae5 100644 ---- a/kernel/x86/KERNEL.NEHALEM -+++ b/kernel/x86/KERNEL.NEHALEM -@@ -1,3 +1 @@ - include $(KERNELDIR)/KERNEL.PENRYN --SSWAPKERNEL = ../arm/swap.c --DSWAPKERNEL = ../arm/swap.c -diff --git a/kernel/x86/swap.S b/kernel/x86/swap.S -index 54b00b33..e30c2789 100644 ---- a/kernel/x86/swap.S -+++ b/kernel/x86/swap.S -@@ -138,6 +138,14 @@ - /* INCX != 1 or INCY != 1 */ - - .L14: -+ cmpl $0, %ebx -+ jne .L141 -+ cmpl $0, %ecx -+ jne .L141 -+/* INCX == 0 and INCY == 0 */ -+ jmp .L27 -+ -+.L141: - movl %edx, %eax - sarl $2, %eax - jle .L28 |