guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: gmp: Drop patch included in release 6.1.0.


From: Andreas Enge
Subject: 01/01: gnu: gmp: Drop patch included in release 6.1.0.
Date: Wed, 02 Dec 2015 19:22:51 +0000

andreas pushed a commit to branch core-updates
in repository guix.

commit e414a7dec365233ad505595bbebaff5d30e72f19
Author: Andreas Enge <address@hidden>
Date:   Wed Dec 2 20:03:51 2015 +0100

    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.
---
 gnu-system.am                                  |    1 -
 gnu/packages/multiprecision.scm                |    3 +--
 gnu/packages/patches/gmp-arm-asm-nothumb.patch |   21 ---------------------
 3 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index 4363e61..0eb2f28 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 77f69f7..008d8c0 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 666cf58..0000000
--- a/gnu/packages/patches/gmp-arm-asm-nothumb.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <address@hidden>
-# 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"                                 \
-



reply via email to

[Prev in Thread] Current Thread [Next in Thread]