aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2015-12-02 20:03:51 +0100
committerAndreas Enge <andreas@enge.fr>2015-12-02 20:03:51 +0100
commite414a7dec365233ad505595bbebaff5d30e72f19 (patch)
tree1d59409839d0a70996c4e9c4cf3169a69c36a502
parente946b609b2455e2b38ba2d2b86448bddea0a28ce (diff)
downloadguix-e414a7dec365233ad505595bbebaff5d30e72f19.tar
guix-e414a7dec365233ad505595bbebaff5d30e72f19.tar.gz
gnu: gmp: Drop patch included in release 6.1.0.
* gnu/packages/multiprecision.scm (gmp)[source]: Drop patch. * gnu/packages/patches/gmp-arm-asm-nothumb.patch: Remove patch. * gnu-system.am (dist_patch_DATA): Unregister patch.
-rw-r--r--gnu-system.am1
-rw-r--r--gnu/packages/multiprecision.scm3
-rw-r--r--gnu/packages/patches/gmp-arm-asm-nothumb.patch21
3 files changed, 1 insertions, 24 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 4363e615b0..0eb2f28739 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -476,7 +476,6 @@ dist_patch_DATA = \
gnu/packages/patches/glibc-locale-incompatibility.patch \
gnu/packages/patches/glibc-o-largefile.patch \
gnu/packages/patches/glibc-versioned-locpath.patch \
- gnu/packages/patches/gmp-arm-asm-nothumb.patch \
gnu/packages/patches/gmp-faulty-test.patch \
gnu/packages/patches/gnucash-price-quotes-perl.patch \
gnu/packages/patches/gnutls-doc-fix.patch \
diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm
index 77f69f7b33..008d8c074f 100644
--- a/gnu/packages/multiprecision.scm
+++ b/gnu/packages/multiprecision.scm
@@ -40,8 +40,7 @@
(base32
"12b9s4jn48gbar6dbs5qrlmljdmnq43xy3ji9yjzic0mwp6dmnk8"))
(patches (map search-patch
- '("gmp-arm-asm-nothumb.patch"
- "gmp-faulty-test.patch")))))
+ '("gmp-faulty-test.patch")))))
(build-system gnu-build-system)
(native-inputs `(("m4" ,m4)))
(outputs '("out" "debug"))
diff --git a/gnu/packages/patches/gmp-arm-asm-nothumb.patch b/gnu/packages/patches/gmp-arm-asm-nothumb.patch
deleted file mode 100644
index 666cf58cf6..0000000000
--- a/gnu/packages/patches/gmp-arm-asm-nothumb.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1396602422 -7200
-# Node ID 676e2d0f0e4dd301a7066079d2c9326c25c34a40
-# Parent 0194a75b56b21a9196626430af86c5bd9110c42d
-Conditionalise ARM asm on !__thumb__.
-
-diff -r 0194a75b56b2 -r 676e2d0f0e4d mpn/generic/div_qr_1n_pi1.c
---- a/mpn/generic/div_qr_1n_pi1.c Thu Apr 03 23:58:51 2014 +0200
-+++ b/mpn/generic/div_qr_1n_pi1.c Fri Apr 04 11:07:02 2014 +0200
-@@ -130,7 +130,7 @@
- "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC)
- #endif
-
--#if defined (__arm__) && W_TYPE_SIZE == 32
-+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
- #define add_mssaaaa(m, sh, sl, ah, al, bh, bl) \
- __asm__ ( "adds %2, %5, %6\n\t" \
- "adcs %1, %3, %4\n\t" \
-