~ruther/guix-local

e414a7dec365233ad505595bbebaff5d30e72f19 — Andreas Enge 10 years ago e946b60
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.
3 files changed, 1 insertions(+), 24 deletions(-)

M gnu-system.am
M gnu/packages/multiprecision.scm
D gnu/packages/patches/gmp-arm-asm-nothumb.patch
M gnu-system.am => gnu-system.am +0 -1
@@ 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			\

M gnu/packages/multiprecision.scm => gnu/packages/multiprecision.scm +1 -2
@@ 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"))

D gnu/packages/patches/gmp-arm-asm-nothumb.patch => gnu/packages/patches/gmp-arm-asm-nothumb.patch +0 -21
@@ 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"					\