diff --git a/meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch b/meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch deleted file mode 100644 index 486f8c58f6..0000000000 --- a/meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch +++ /dev/null @@ -1,44 +0,0 @@ -Upstream-status: Backport - -# HG changeset patch -# User Torbjorn Granlund -# 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/obsolete_automake_macros.patch b/meta/recipes-support/gmp/gmp-5.1.0/obsolete_automake_macros.patch deleted file mode 100644 index adff6ca19c..0000000000 --- a/meta/recipes-support/gmp/gmp-5.1.0/obsolete_automake_macros.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Accepted - -Signed-off-by: Marko Lindqvist -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 06:00:41.552958778 +0200 -@@ -67,7 +67,7 @@ - dnl so update there too if changing anything. - dnl - AM_INIT_AUTOMAKE([1.8 gnu no-dependencies]) --AM_CONFIG_HEADER(config.h:config.in) -+AC_CONFIG_HEADERS(config.h:config.in) - AM_MAINTAINER_MODE diff --git a/meta/recipes-support/gmp/gmp-5.1.0/configure.patch b/meta/recipes-support/gmp/gmp-5.1.1/configure.patch similarity index 97% rename from meta/recipes-support/gmp/gmp-5.1.0/configure.patch rename to meta/recipes-support/gmp/gmp-5.1.1/configure.patch index fb5435cb40..591ea79051 100644 --- a/meta/recipes-support/gmp/gmp-5.1.0/configure.patch +++ b/meta/recipes-support/gmp/gmp-5.1.1/configure.patch @@ -115,9 +115,9 @@ diff -Nurd gmp-5.1.0/acinclude.m4 gmp-5.1.0/acinclude.m4 ]) -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 +diff -Nurd gmp-5.1.0/configure.ac gmp-5.1.0/configure.ac +--- gmp-5.1.0/configure.ac 2012-12-18 21:05:09.000000000 +0200 ++++ gmp-5.1.0/configure.ac 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) diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc index 709d8c4d7c..bec06ecd69 100644 --- a/meta/recipes-support/gmp/gmp.inc +++ b/meta/recipes-support/gmp/gmp.inc @@ -3,7 +3,7 @@ DESCRIPTION = "GNU multiprecision arithmetic library" HOMEPAGE = "http://gmplib.org/" LICENSE = "GPLv3 LGPLv3" -REVISION = "a" +REVISION = "" SRC_URI = "ftp://ftp.gmplib.org/pub/gmp-${PV}/gmp-${PV}${REVISION}.tar.bz2 \ file://configure.patch \ diff --git a/meta/recipes-support/gmp/gmp/gmp_fix_for_x32.patch b/meta/recipes-support/gmp/gmp/gmp_fix_for_x32.patch deleted file mode 100644 index 76d3a004d3..0000000000 --- a/meta/recipes-support/gmp/gmp/gmp_fix_for_x32.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Pending - -Add X32 support in gmp configure. - -Patch Originator: H J Lu @ Intel -Patch modified for Yocto by Nitin Kamble -Signed Off By: Nitin A Kamble 2011/11/21 - ---- gmp-4.3.2/configure.in.x32 2011-08-12 15:03:06.143548291 -0700 -+++ gmp-4.3.2/configure.in 2011-08-12 15:06:20.580595316 -0700 -@@ -1499,6 +1499,21 @@ case $host in - path_64="x86_64/atom x86_64" - ;; - esac -+ -+ # X32 support. -+ case x"$path_64" in -+ xx86_64*) -+ abilist="x32 64 32" -+ path_x32="$path_64" -+ limb_x32=longlong -+ cclist_x32="gcc" -+ gcc_x32_cflags="-O2 -mx32" -+ any_x32_testlist="sizeof-long-4" -+ CALLING_CONVENTIONS_OBJS_x32='amd64call.lo amd64check$U.lo' -+ SPEED_CYCLECOUNTER_OBJ_x32=x86_64.lo -+ cyclecounter_size_x32=2 -+ ;; -+ esac - ;; - esac - ;; -@@ -3039,7 +3058,7 @@ if test "$gmp_asm_syntax_testing" != no; - GMP_INCLUDE_MPN(x86/darwin.m4) ;; - esac - ;; -- 64) -+ 64|x32) - GMP_INCLUDE_MPN(x86_64/x86_64-defs.m4) - case $host in - *-*-darwin*) diff --git a/meta/recipes-support/gmp/gmp_5.1.0.bb b/meta/recipes-support/gmp/gmp_5.1.0.bb deleted file mode 100644 index 3c3d985973..0000000000 --- a/meta/recipes-support/gmp/gmp_5.1.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require gmp.inc -LICENSE="LGPLv3&GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790" - -SRC_URI_append = " file://use-includedir.patch \ - file://gmp_fix_for_x32.patch \ - file://187b7b1646ee.patch \ - file://obsolete_automake_macros.patch \ - " - -PR = "r2" - -SRC_URI[md5sum] = "cf6d7cb5915f29ce0fc41d042205c080" -SRC_URI[sha256sum] = "ed5239a62aeaba6cfc8d50ec36fb59215618f98c248d4bb05ca9bccd990794dc" diff --git a/meta/recipes-support/gmp/gmp_5.1.1.bb b/meta/recipes-support/gmp/gmp_5.1.1.bb new file mode 100644 index 0000000000..d6dcb97f3e --- /dev/null +++ b/meta/recipes-support/gmp/gmp_5.1.1.bb @@ -0,0 +1,10 @@ +require gmp.inc +LICENSE="LGPLv3&GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790" + +SRC_URI_append = " file://use-includedir.patch \ + " + +SRC_URI[md5sum] = "2fa018a7cd193c78494525f236d02dd6" +SRC_URI[sha256sum] = "a0d4779f48b36519dfaceb5f987a7c76fcac223258bebea3bb2244310970afad"