mpfr & gmp updates

mpfr & gmp updates

[Marko Lindqvist]

Objective of this patch series is to update gmp to latest versions
before fixing automake-1.13 problems. Doing it the other way around
could mean more work (porting the patch from one gmp version to next)

[PATCH 1/3] mpfr: update to upstream version 3.1.1

gmp-5.1.0 compilation fails with mpfr-3.1.0. Mpfr update fixes
thath.

[PATCH 2/3] gmp: update SRC_URI and HOMEPAGE

Use gmplib SRC_URI instead of gnu mirror one. Latter doesn't
even have latest version available. Old HOMEPAGE URL gave
"page not found".

[PATCH 3/3] gmp: update to upstream version 5.1.0



 - ML

[PATCH 1/3] mpfr: update to upstream version 3.1.1

[Marko Lindqvist]

mpfr_fix_for_automake-1.12.patch part of upstream now.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch    |   35 --------------------
 .../long-long-thumb.patch                          |    0
 .../mpfr/{mpfr_3.1.0.bb => mpfr_3.1.1.bb}          |    7 ++--
 3 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 meta/recipes-support/mpfr/mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch
 rename meta/recipes-support/mpfr/{mpfr-3.1.0 => mpfr-3.1.1}/long-long-thumb.patch (100%)
 rename meta/recipes-support/mpfr/{mpfr_3.1.0.bb => mpfr_3.1.1.bb} (65%)

diff --git a/meta/recipes-support/mpfr/mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch b/meta/recipes-support/mpfr/mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch
deleted file mode 100644
index 5b0a24a..0000000
--- a/meta/recipes-support/mpfr/mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-Status: Pending
-
-this patch avoids these issues with automake 1.12
-
-| configure.ac:304: error: automatic de-ANSI-fication support has been removed
-| tests/Makefile.am:12: error: automatic de-ANSI-fication support has been removed
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@.intel.com>
-2012/05/02
-
-Index: mpfr-3.1.0/configure.ac
-===================================================================
---- mpfr-3.1.0.orig/configure.ac
-+++ mpfr-3.1.0/configure.ac
-@@ -301,7 +301,6 @@ if test "$test_CFLAGS" != set && test -n
- fi
- 
- AM_PROG_CC_C_O
--AM_C_PROTOTYPES
- 
- case $host in
-   *-apple-darwin*)
-Index: mpfr-3.1.0/tests/Makefile.am
-===================================================================
---- mpfr-3.1.0.orig/tests/Makefile.am
-+++ mpfr-3.1.0/tests/Makefile.am
-@@ -9,7 +9,7 @@
- # PARTICULAR PURPOSE.
- 
- 
--AUTOMAKE_OPTIONS = 1.6 gnu $(top_builddir)/ansi2knr
-+AUTOMAKE_OPTIONS = 1.6 gnu
- 
- # tversion is run
- #   * at the beginning so that the user gets a possible version error
diff --git a/meta/recipes-support/mpfr/mpfr-3.1.0/long-long-thumb.patch b/meta/recipes-support/mpfr/mpfr-3.1.1/long-long-thumb.patch
similarity index 100%
rename from meta/recipes-support/mpfr/mpfr-3.1.0/long-long-thumb.patch
rename to meta/recipes-support/mpfr/mpfr-3.1.1/long-long-thumb.patch
diff --git a/meta/recipes-support/mpfr/mpfr_3.1.0.bb b/meta/recipes-support/mpfr/mpfr_3.1.1.bb
similarity index 65%
rename from meta/recipes-support/mpfr/mpfr_3.1.0.bb
rename to meta/recipes-support/mpfr/mpfr_3.1.1.bb
index e7e20ce..7f34e71 100644
--- a/meta/recipes-support/mpfr/mpfr_3.1.0.bb
+++ b/meta/recipes-support/mpfr/mpfr_3.1.1.bb
@@ -3,15 +3,14 @@ LICENSE="GPLv3&LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 		    file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6"
 DEPENDS = "gmp"
-PR = "r2"
+PR = "r0"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2 \
            file://long-long-thumb.patch \
-           file://mpfr_fix_for_automake-1.12.patch \
            "
 
-SRC_URI[md5sum] = "238ae4a15cc3a5049b723daef5d17938"
-SRC_URI[sha256sum] = "74a7bbbad168dd1cc414f1c9210b8fc16ccfc8e422d34b3371a8978e31eab680"
+SRC_URI[md5sum] = "e90e0075bb1b5f626c6e31aaa9c64e3b"
+SRC_URI[sha256sum] = "7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd"
 S = "${WORKDIR}/mpfr-${PV}"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
1.7.10.4

[PATCH 2/3] gmp: update SRC_URI and HOMEPAGE

[Marko Lindqvist]

Fetch from gmplib.org instead of gnu mirror.
List gmplib.org as homepage instead of old broken URL.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 meta/recipes-support/gmp/gmp.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc
index 789d6d0..823811f 100644
--- a/meta/recipes-support/gmp/gmp.inc
+++ b/meta/recipes-support/gmp/gmp.inc
@@ -1,9 +1,9 @@
 SECTION = "devel"
 DESCRIPTION = "GNU multiprecision arithmetic library"
-HOMEPAGE = "http://www.swox.com/gmp/"
+HOMEPAGE = "http://gmplib.org/"
 LICENSE = "GPLv3 LGPLv3"
 
-SRC_URI = "${GNU_MIRROR}/gmp/gmp-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.gmplib.org/pub/gmp-${PV}/gmp-${PV}.tar.bz2 \
 	   file://configure.patch \
 	   file://amd64.patch "
 
-- 
1.7.10.4

[PATCH 3/3] gmp: update to upstream version 5.1.0

[Marko Lindqvist]

New version of configure.patch added for gmp-5.1.0. Old patch
moved to gmp-4.2.1 specific directory.
gmp_fix_for_automake-1.12.patch part of upstŕeam so removed
gmp-5 version, gmp-4.2.1 version remains.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../gmp/{gmp => gmp-4.2.1}/configure.patch         |    0
 meta/recipes-support/gmp/gmp-5.1.0/configure.patch |  210 ++++++++++++++++++++
 .../gmp/gmp/gmp_fix_for_automake-1.12.patch        |   48 -----
 .../gmp/{gmp_5.0.5.bb => gmp_5.1.0.bb}             |    5 +-
 4 files changed, 212 insertions(+), 51 deletions(-)
 rename meta/recipes-support/gmp/{gmp => gmp-4.2.1}/configure.patch (100%)
 create mode 100644 meta/recipes-support/gmp/gmp-5.1.0/configure.patch
 delete mode 100644 meta/recipes-support/gmp/gmp/gmp_fix_for_automake-1.12.patch
 rename meta/recipes-support/gmp/{gmp_5.0.5.bb => gmp_5.1.0.bb} (60%)

diff --git a/meta/recipes-support/gmp/gmp/configure.patch b/meta/recipes-support/gmp/gmp-4.2.1/configure.patch
similarity index 100%
rename from meta/recipes-support/gmp/gmp/configure.patch
rename to meta/recipes-support/gmp/gmp-4.2.1/configure.patch
diff --git a/meta/recipes-support/gmp/gmp-5.1.0/configure.patch b/meta/recipes-support/gmp/gmp-5.1.0/configure.patch
new file mode 100644
index 0000000..fb5435c
--- /dev/null
+++ b/meta/recipes-support/gmp/gmp-5.1.0/configure.patch
@@ -0,0 +1,210 @@
+Upstream-Status: Pending
+
+Updated to apply to gmp-5.1.0
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+
+diff -Nurd gmp-5.1.0/acinclude.m4 gmp-5.1.0/acinclude.m4
+--- gmp-5.1.0/acinclude.m4	2012-12-18 21:05:09.000000000 +0200
++++ gmp-5.1.0/acinclude.m4	2013-01-02 05:19:26.977013073 +0200
+@@ -30,29 +30,29 @@
+ dnl    conftest.exe - various DOS compilers
+
+
+-define(IA64_PATTERN,
++define([IA64_PATTERN],
+ [[ia64*-*-* | itanium-*-* | itanium2-*-*]])
+
+ dnl  Need to be careful not to match m6811, m6812, m68hc11 and m68hc12, all
+ dnl  of which config.sub accepts.  (Though none of which are likely to work
+ dnl  with GMP.)
+ dnl
+-define(M68K_PATTERN,
++define([M68K_PATTERN],
+ [[m68k-*-* | m68[0-9][0-9][0-9]-*-*]])
+
+-define(POWERPC64_PATTERN,
++define([POWERPC64_PATTERN],
+ [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]])
+
+-define(S390_PATTERN,
++define([S390_PATTERN],
+ [[s390-*-* | z900esa-*-* | z990esa-*-* | z9esa-*-* | z10esa-*-* | z196esa-*-*]])
+
+-define(S390X_PATTERN,
++define([S390X_PATTERN],
+ [[s390x-*-* | z900-*-* | z990-*-* | z9-*-* | z10-*-* | z196-*-*]])
+
+-define(X86_PATTERN,
++define([X86_PATTERN],
+ [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]])
+
+-define(X86_64_PATTERN,
++define([X86_64_PATTERN],
+ [[athlon64-*-* | k8-*-* | k10-*-* | bobcat-*-* | bulldozer-*-* | pentium4-*-* | atom-*-* | core2-*-* | corei*-*-* | x86_64-*-* | nano-*-*]])
+
+ dnl  GMP_FAT_SUFFIX(DSTVAR, DIRECTORY)
+@@ -70,7 +70,7 @@
+ dnl      x86/k6      ->  k6
+ dnl      x86/k6/mmx  ->  k6_mmx
+
+-define(GMP_FAT_SUFFIX,
++define([GMP_FAT_SUFFIX],
+ [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]])
+
+
+@@ -79,7 +79,7 @@
+ dnl  Emit code to remove any occurrence of ITEM from $LISTVAR.  ITEM can be a
+ dnl  shell expression like $foo if desired.
+
+-define(GMP_REMOVE_FROM_LIST,
++define([GMP_REMOVE_FROM_LIST],
+ [remove_from_list_tmp=
+ for remove_from_list_i in $[][$1]; do
+   if test $remove_from_list_i = [$2]; then :;
+@@ -95,12 +95,12 @@
+ dnl  ----------------------
+ dnl  Strip entries */subdir from $path and $fat_path.
+
+-define(GMP_STRIP_PATH,
++define([GMP_STRIP_PATH],
+ [GMP_STRIP_PATH_VAR(path, [$1])
+ GMP_STRIP_PATH_VAR(fat_path, [$1])
+ ])
+
+-define(GMP_STRIP_PATH_VAR,
++define([GMP_STRIP_PATH_VAR],
+ [tmp_path=
+ for i in $[][$1]; do
+   case $i in
+@@ -121,7 +121,7 @@
+ dnl  Dummy value for GMP_LIMB_BITS is enough
+ dnl  for all current configure-time uses of gmp.h.
+
+-define(GMP_INCLUDE_GMP_H,
++define([GMP_INCLUDE_GMP_H],
+ [[#define __GMP_WITHIN_CONFIGURE 1   /* ignore template stuff */
+ #define GMP_NAIL_BITS $GMP_NAIL_BITS
+ #define GMP_LIMB_BITS 123
+@@ -136,7 +136,7 @@
+ dnl  FILE.  The regexps here aren't very rugged, but are enough for gmp.
+ dnl  /dev/null as a parameter prevents a hang if $2 is accidentally omitted.
+
+-define(GMP_HEADER_GETVAL,
++define([GMP_HEADER_GETVAL],
+ [patsubst(patsubst(
+ esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]),
+ [^.*$1[ 	]+],[]),
+@@ -150,7 +150,7 @@
+ dnl  autoconf time.  Two digits like 3.0 if patchlevel <= 0, or three digits
+ dnl  like 3.0.1 if patchlevel > 0.
+
+-define(GMP_VERSION,
++define([GMP_VERSION],
+ [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl
+ .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl
+ .GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)])
+@@ -1512,7 +1512,9 @@
+ echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4
+
+ # All CPUs use asm-defs.m4
+-echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i
++echo -n ["include("] >>$gmp_tmpconfigm4i
++echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i
++echo [")"] >>$gmp_tmpconfigm4i
+ ])
+
+
+diff -Nurd gmp-5.1.0/configure.in gmp-5.1.0/configure.in
+--- gmp-5.1.0/configure.in	2012-12-18 21:05:09.000000000 +0200
++++ gmp-5.1.0/configure.in	2013-01-02 05:19:26.977013073 +0200
+@@ -29,13 +29,6 @@
+ AC_PREREQ(2.59)
+ AC_INIT(GNU MP, GMP_VERSION, [gmp-bugs@gmplib.org, see http://gmplib.org/manual/Reporting-Bugs.html], gmp)
+ AC_CONFIG_SRCDIR(gmp-impl.h)
+-m4_pattern_forbid([^[ \t]*GMP_])
+-m4_pattern_allow(GMP_LDFLAGS)
+-m4_pattern_allow(GMP_LIMB_BITS)
+-m4_pattern_allow(GMP_MPARAM_H_SUGGEST)
+-m4_pattern_allow(GMP_NAIL_BITS)
+-m4_pattern_allow(GMP_NUMB_BITS)
+-m4_pattern_allow(GMP_NONSTD_ABI)
+
+ # If --target is not used then $target_alias is empty, but if say
+ # "./configure athlon-pc-freebsd3.5" is used, then all three of
+@@ -314,7 +307,7 @@
+ # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is
+ # called.  User selections of CC etc are respected.
+ #
+-# Care is taken not to use macros like AC_TRY_COMPILE during the GMP
++# Care is taken not to use macros like AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) during the GMP
+ # pre-testing, since they of course depend on AC_PROG_CC, and also some of
+ # them cache their results, which is not wanted.
+ #
+@@ -406,7 +399,7 @@
+ # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring
+ # c89 over cc here.  But note that on HP-UX c89 provides a castrated
+ # environment, and would want to be excluded somehow.  Maybe
+-# AC_PROG_CC_STDC already does enough to stick cc into ANSI mode and
++#  already does enough to stick cc into ANSI mode and
+ # we don't need to worry.
+ #
+ cclist="gcc cc"
+@@ -1727,7 +1720,7 @@
+ CFLAGS_or_unset=${CFLAGS-'(unset)'}
+ CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
+
+-cat >&AC_FD_CC <<EOF
++cat >&AS_MESSAGE_LOG_FD() <<EOF
+ User:
+ ABI=$ABI
+ CC=$CC
+@@ -2147,7 +2140,6 @@
+
+ # The C compiler and preprocessor, put into ANSI mode if possible.
+ AC_PROG_CC
+-AC_PROG_CC_STDC
+ AC_PROG_CPP
+
+
+@@ -2169,11 +2161,11 @@
+
+ # The C++ compiler, if desired.
+ want_cxx=no
++AC_PROG_CXX
+ if test $enable_cxx != no; then
+   test_CXXFLAGS=${CXXFLAGS+set}
+-  AC_PROG_CXX
+
+-  echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC
++  echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD()
+   cxxflags_ac_prog_cxx=$CXXFLAGS
+   cxxflags_list=ac_prog_cxx
+
+@@ -2289,7 +2281,7 @@
+ fi
+
+
+-cat >&AC_FD_CC <<EOF
++cat >&AS_MESSAGE_LOG_FD() <<EOF
+ Decided:
+ ABI=$ABI
+ CC=$CC
+@@ -3638,7 +3630,7 @@
+ # FIXME: Upcoming version of autoconf/automake may not like broken lines.
+ #        Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
+
+-AC_OUTPUT(Makefile							\
++AC_CONFIG_FILES([Makefile							\
+   mpf/Makefile mpn/Makefile mpq/Makefile				\
+   mpz/Makefile printf/Makefile scanf/Makefile rand/Makefile cxx/Makefile \
+   tests/Makefile tests/devel/Makefile					\
+@@ -3647,7 +3639,8 @@
+   tests/cxx/Makefile							\
+   doc/Makefile tune/Makefile						\
+   demos/Makefile demos/calc/Makefile demos/expr/Makefile		\
+-  gmp.h:gmp-h.in)
++  gmp.h:gmp-h.in])
++AC_OUTPUT
+
+ AC_MSG_NOTICE([summary of build options:
diff --git a/meta/recipes-support/gmp/gmp/gmp_fix_for_automake-1.12.patch b/meta/recipes-support/gmp/gmp/gmp_fix_for_automake-1.12.patch
deleted file mode 100644
index 8ff1bcf..0000000
--- a/meta/recipes-support/gmp/gmp/gmp_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Upstream-Status: Pending
-
-automake 1.12 has depricated automatic de-ANSI-fication support
-
-this patch avoids these kinds of errors:
-
-| configure.in:2240: error: automatic de-ANSI-fication support has been removed
-| Makefile.am:28: error: automatic de-ANSI-fication support has been removed
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2012/05/02
-
-Index: gmp-5.0.4/configure.in
-===================================================================
---- gmp-5.0.4.orig/configure.in
-+++ gmp-5.0.4/configure.in
-@@ -59,7 +59,7 @@ dnl
- dnl  Note that there's a copy of these options in the top-level Makefile.am,
- dnl  so update there too if changing anything.
- dnl
--AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr])
-+AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
- AM_CONFIG_HEADER(config.h:config.in)
- AM_MAINTAINER_MODE
- 
-@@ -2236,9 +2236,6 @@ fi
- echo "      MPN_PATH=\"$path\""
- 
- 
--# Automake ansi2knr support.
--AM_C_PROTOTYPES
--
- CL_AS_NOEXECSTACK
- 
- GMP_PROG_AR
-Index: gmp-5.0.4/Makefile.am
-===================================================================
---- gmp-5.0.4.orig/Makefile.am
-+++ gmp-5.0.4/Makefile.am
-@@ -25,7 +25,7 @@
- # Makefiles in subdirectories, but here we must omit it so automake gives
- # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr".
- #
--AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
-+AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies
- 
- 
- # Libtool -version-info for libgmp.la and libmp.la.  See "Versioning" in the
diff --git a/meta/recipes-support/gmp/gmp_5.0.5.bb b/meta/recipes-support/gmp/gmp_5.1.0.bb
similarity index 60%
rename from meta/recipes-support/gmp/gmp_5.0.5.bb
rename to meta/recipes-support/gmp/gmp_5.1.0.bb
index d91340c..9cb80fe 100644
--- a/meta/recipes-support/gmp/gmp_5.0.5.bb
+++ b/meta/recipes-support/gmp/gmp_5.1.0.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 
 SRC_URI_append = " file://use-includedir.patch \
                    file://gmp_fix_for_x32.patch \
-                   file://gmp_fix_for_automake-1.12.patch \
                    "
 
-SRC_URI[md5sum] = "041487d25e9c230b0c42b106361055fe"
-SRC_URI[sha256sum] = "1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9"
+SRC_URI[md5sum] = "362cf515aff8dc240958ce47418e4c78"
+SRC_URI[sha256sum] = "dfd9aba98fe5caa54a715b4584c7d45eb0ee0c8be9a3181164ad2fad5eefc796"
-- 
1.7.10.4

Re: [PATCH 3/3] gmp: update to upstream version 5.1.0

[Marcin Juszkiewicz]

W dniu 02.01.2013 19:37, Marko Lindqvist pisze:
> New version of configure.patch added for gmp-5.1.0. Old patch
> moved to gmp-4.2.1 specific directory.
> gmp_fix_for_automake-1.12.patch part of upstŕeam so removed
> gmp-5 version, gmp-4.2.1 version remains.

This update broke our AArch64 builds. Will have to check why and fix it.

[PATCH] gmp: add patch from upstream to unbreak AArch64

[Marcin Juszkiewicz]

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 .../gmp/gmp-5.1.0/187b7b1646ee.patch               | 44 ++++++++++++++++++++++
 meta/recipes-support/gmp/gmp_5.1.0.bb              |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch

diff --git a/meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch b/meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch
new file mode 100644
index 0000000..486f8c5
--- /dev/null
+++ b/meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch
@@ -0,0 +1,44 @@
+Upstream-status: Backport
+
+# 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.
+
+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/meta/recipes-support/gmp/gmp_5.1.0.bb b/meta/recipes-support/gmp/gmp_5.1.0.bb
index 9cb80fe..eb5ef33 100644
--- a/meta/recipes-support/gmp/gmp_5.1.0.bb
+++ b/meta/recipes-support/gmp/gmp_5.1.0.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 
 SRC_URI_append = " file://use-includedir.patch \
                    file://gmp_fix_for_x32.patch \
+                   file://187b7b1646ee.patch \
                    "
 
 SRC_URI[md5sum] = "362cf515aff8dc240958ce47418e4c78"
-- 
1.8.0