From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Mar 2013 11:38:01 +0000 (+0000)
Subject: gmp: bump to version 5.1.1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=93581de0ec4cfc77ea6006b6283d034f82b45b93;p=buildroot.git

gmp: bump to version 5.1.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---

diff --git a/package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch b/package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch
deleted file mode 100644
index 1b835a569c..0000000000
--- a/package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1357413121 -3600
-# Node ID 187b7b1646ee0ace782768bb36117b62c8408bb6
-# Parent  87a24013e9ee2cabf74e32282c18584a2c669009
-(aarch64): Make add_ssaaaa and sub_ddmmss actually work.
-
-Taken upstream from http://gmplib.org:8000/gmp/rev/187b7b1646ee.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-diff -r 87a24013e9ee -r 187b7b1646ee longlong.h
---- a/longlong.h	Fri Jan 04 16:32:01 2013 +0100
-+++ b/longlong.h	Sat Jan 05 20:12:01 2013 +0100
-@@ -530,23 +530,16 @@
- #endif /* __arm__ */
- 
- #if defined (__aarch64__) && W_TYPE_SIZE == 64
-+/* FIXME: Extend the immediate range for the low word by using both
-+   ADDS and SUBS, since they set carry in the same way.  */
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
--  __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3"			\
-+  __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3"			\
- 	   : "=r" (sh), "=&r" (sl)					\
--	   : "r" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
-+	   : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
- #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
--  do {									\
--    if (__builtin_constant_p (bl))					\
--      {									\
--	__asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3"			\
--		 : "=r" (sh), "=&r" (sl)				\
--		 : "r" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \
--      }									\
--    else /* only bh might be a constant */				\
--      __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3"			\
--	       : "=r" (sh), "=&r" (sl)					\
--	       : "r" (ah), "rZ" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\
--    } while (0)
-+  __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3"			\
-+	   : "=r,r" (sh), "=&r,&r" (sl)					\
-+	   : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC)
- #define umul_ppmm(ph, pl, m0, m1) \
-   do {									\
-     UDItype __m0 = (m0), __m1 = (m1);					\
-
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 24fbb3db61..e895a485f8 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -4,19 +4,13 @@
 #
 #############################################################
 
-GMP_VERSION = 5.1.0
+GMP_VERSION = 5.1.1
 GMP_SITE = ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION)
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
 GMP_INSTALL_STAGING = YES
 GMP_LICENSE = LGPLv3+
 GMP_LICENSE_FILES = COPYING.LIB
-
 GMP_DEPENDENCIES = host-m4
 
-# Bad ARM assembly breaks on pure thumb
-ifeq ($(ARCH),arm)
-GMP_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -marm"
-endif
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))