summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch44
-rw-r--r--meta/recipes-support/gmp/gmp-5.1.0/obsolete_automake_macros.patch13
-rw-r--r--meta/recipes-support/gmp/gmp-5.1.1/configure.patch (renamed from meta/recipes-support/gmp/gmp-5.1.0/configure.patch)6
-rw-r--r--meta/recipes-support/gmp/gmp.inc2
-rw-r--r--meta/recipes-support/gmp/gmp/gmp_fix_for_x32.patch41
-rw-r--r--meta/recipes-support/gmp/gmp_5.1.0.bb15
-rw-r--r--meta/recipes-support/gmp/gmp_5.1.1.bb10
7 files changed, 14 insertions, 117 deletions
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 @@
1Upstream-status: Backport
2
3# HG changeset patch
4# User Torbjorn Granlund <tege@gmplib.org>
5# Date 1357413121 -3600
6# Node ID 187b7b1646ee0ace782768bb36117b62c8408bb6
7# Parent 87a24013e9ee2cabf74e32282c18584a2c669009
8(aarch64): Make add_ssaaaa and sub_ddmmss actually work.
9
10diff -r 87a24013e9ee -r 187b7b1646ee longlong.h
11--- a/longlong.h Fri Jan 04 16:32:01 2013 +0100
12+++ b/longlong.h Sat Jan 05 20:12:01 2013 +0100
13@@ -530,23 +530,16 @@
14 #endif /* __arm__ */
15
16 #if defined (__aarch64__) && W_TYPE_SIZE == 64
17+/* FIXME: Extend the immediate range for the low word by using both
18+ ADDS and SUBS, since they set carry in the same way. */
19 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
20- __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3" \
21+ __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3" \
22 : "=r" (sh), "=&r" (sl) \
23- : "r" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
24+ : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
25 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
26- do { \
27- if (__builtin_constant_p (bl)) \
28- { \
29- __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \
30- : "=r" (sh), "=&r" (sl) \
31- : "r" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \
32- } \
33- else /* only bh might be a constant */ \
34- __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \
35- : "=r" (sh), "=&r" (sl) \
36- : "r" (ah), "rZ" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\
37- } while (0)
38+ __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3" \
39+ : "=r,r" (sh), "=&r,&r" (sl) \
40+ : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC)
41 #define umul_ppmm(ph, pl, m0, m1) \
42 do { \
43 UDItype __m0 = (m0), __m1 = (m1); \
44
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 @@
1Upstream-Status: Accepted
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd gmp-5.1.0/configure.in gmp-5.1.0/configure.in
5--- gmp-5.1.0/configure.in 2012-12-18 21:05:09.000000000 +0200
6+++ gmp-5.1.0/configure.in 2013-01-02 06:00:41.552958778 +0200
7@@ -67,7 +67,7 @@
8 dnl so update there too if changing anything.
9 dnl
10 AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
11-AM_CONFIG_HEADER(config.h:config.in)
12+AC_CONFIG_HEADERS(config.h:config.in)
13 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
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
115 ]) 115 ])
116 116
117 117
118diff -Nurd gmp-5.1.0/configure.in gmp-5.1.0/configure.in 118diff -Nurd gmp-5.1.0/configure.ac gmp-5.1.0/configure.ac
119--- gmp-5.1.0/configure.in 2012-12-18 21:05:09.000000000 +0200 119--- gmp-5.1.0/configure.ac 2012-12-18 21:05:09.000000000 +0200
120+++ gmp-5.1.0/configure.in 2013-01-02 05:19:26.977013073 +0200 120+++ gmp-5.1.0/configure.ac 2013-01-02 05:19:26.977013073 +0200
121@@ -29,13 +29,6 @@ 121@@ -29,13 +29,6 @@
122 AC_PREREQ(2.59) 122 AC_PREREQ(2.59)
123 AC_INIT(GNU MP, GMP_VERSION, [gmp-bugs@gmplib.org, see http://gmplib.org/manual/Reporting-Bugs.html], gmp) 123 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"
3HOMEPAGE = "http://gmplib.org/" 3HOMEPAGE = "http://gmplib.org/"
4LICENSE = "GPLv3 LGPLv3" 4LICENSE = "GPLv3 LGPLv3"
5 5
6REVISION = "a" 6REVISION = ""
7 7
8SRC_URI = "ftp://ftp.gmplib.org/pub/gmp-${PV}/gmp-${PV}${REVISION}.tar.bz2 \ 8SRC_URI = "ftp://ftp.gmplib.org/pub/gmp-${PV}/gmp-${PV}${REVISION}.tar.bz2 \
9 file://configure.patch \ 9 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 @@
1Upstream-Status: Pending
2
3Add X32 support in gmp configure.
4
5Patch Originator: H J Lu @ Intel
6Patch modified for Yocto by Nitin Kamble
7Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
8
9--- gmp-4.3.2/configure.in.x32 2011-08-12 15:03:06.143548291 -0700
10+++ gmp-4.3.2/configure.in 2011-08-12 15:06:20.580595316 -0700
11@@ -1499,6 +1499,21 @@ case $host in
12 path_64="x86_64/atom x86_64"
13 ;;
14 esac
15+
16+ # X32 support.
17+ case x"$path_64" in
18+ xx86_64*)
19+ abilist="x32 64 32"
20+ path_x32="$path_64"
21+ limb_x32=longlong
22+ cclist_x32="gcc"
23+ gcc_x32_cflags="-O2 -mx32"
24+ any_x32_testlist="sizeof-long-4"
25+ CALLING_CONVENTIONS_OBJS_x32='amd64call.lo amd64check$U.lo'
26+ SPEED_CYCLECOUNTER_OBJ_x32=x86_64.lo
27+ cyclecounter_size_x32=2
28+ ;;
29+ esac
30 ;;
31 esac
32 ;;
33@@ -3039,7 +3058,7 @@ if test "$gmp_asm_syntax_testing" != no;
34 GMP_INCLUDE_MPN(x86/darwin.m4) ;;
35 esac
36 ;;
37- 64)
38+ 64|x32)
39 GMP_INCLUDE_MPN(x86_64/x86_64-defs.m4)
40 case $host in
41 *-*-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 @@
1require gmp.inc
2LICENSE="LGPLv3&GPLv3"
3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
4 file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
5
6SRC_URI_append = " file://use-includedir.patch \
7 file://gmp_fix_for_x32.patch \
8 file://187b7b1646ee.patch \
9 file://obsolete_automake_macros.patch \
10 "
11
12PR = "r2"
13
14SRC_URI[md5sum] = "cf6d7cb5915f29ce0fc41d042205c080"
15SRC_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 @@
1require gmp.inc
2LICENSE="LGPLv3&GPLv3"
3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
4 file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
5
6SRC_URI_append = " file://use-includedir.patch \
7 "
8
9SRC_URI[md5sum] = "2fa018a7cd193c78494525f236d02dd6"
10SRC_URI[sha256sum] = "a0d4779f48b36519dfaceb5f987a7c76fcac223258bebea3bb2244310970afad"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 19:35:30 +0000