r46617 - in /packages/gmp/trunk/debian: changelog patches/arm-asm-nothumb.patch patches/series

[smr at users.alioth.debian.org]

Author: smr
Date: Sat Apr  5 04:44:55 2014
New Revision: 46617

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46617
Log:
Fix ARM thumb build.

Added:
    packages/gmp/trunk/debian/patches/arm-asm-nothumb.patch
Modified:
    packages/gmp/trunk/debian/changelog
    packages/gmp/trunk/debian/patches/series

Modified: packages/gmp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/changelog?rev=46617&op=diff
==============================================================================
--- packages/gmp/trunk/debian/changelog	(original)
+++ packages/gmp/trunk/debian/changelog	Sat Apr  5 04:44:55 2014
@@ -1,3 +1,10 @@
+gmp (2:6.0.0+dfsg-2) unstable; urgency=medium
+
+  * patches/arm-asm-nothumb.patch: Don't use assmbly on ARM Thumb
+    devices.  Closes: #742814
+
+ -- Steve M. Robbins <smr at debian.org>  Fri, 04 Apr 2014 23:39:40 -0500
+
 gmp (2:6.0.0+dfsg-1) unstable; urgency=medium
 
   * New upstream.  Closes: #742564.

Added: packages/gmp/trunk/debian/patches/arm-asm-nothumb.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/patches/arm-asm-nothumb.patch?rev=46617&op=file
==============================================================================
--- packages/gmp/trunk/debian/patches/arm-asm-nothumb.patch	(added)
+++ packages/gmp/trunk/debian/patches/arm-asm-nothumb.patch	Sat Apr  5 04:44:55 2014
@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Torbjorn Granlund <tege at 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"					\
+

Modified: packages/gmp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/patches/series?rev=46617&op=diff
==============================================================================
--- packages/gmp/trunk/debian/patches/series	(original)
+++ packages/gmp/trunk/debian/patches/series	Sat Apr  5 04:44:55 2014
@@ -1 +1 @@
-
+arm-asm-nothumb.patch