On Wed, May 8, 2013 at 7:29 PM, Saul Wold s...@linux.intel.com wrote:
On 05/07/2013 06:00 AM, Bogdan Marinescu wrote:
A number of patches are now part of the upstream.
Tested by compiling and running core-image-minimal/qemux86.
This patch is not applying cleaning, please verify it. see below
Signed-off-by: Bogdan Marinescu bogdan.a.marine...@intel.com
---
.../gmp/gmp-5.1.0/**187b7b1646ee.patch | 44
.../gmp/gmp-5.1.0/obsolete_**automake_macros.patch | 13 --
.../gmp/{gmp-5.1.0 = gmp-5.1.1}/configure.patch |6 +--
meta/recipes-support/gmp/gmp/**gmp_fix_for_x32.patch | 41
--
meta/recipes-support/gmp/gmp_**5.1.0.bb http://gmp_5.1.0.bb
| 15 ---
meta/recipes-support/gmp/gmp_**5.1.1.bb http://gmp_5.1.1.bb
| 10 +
6 files changed, 13 insertions(+), 116 deletions(-)
delete mode 100644 meta/recipes-support/gmp/gmp-**
5.1.0/187b7b1646ee.patch
delete mode 100644 meta/recipes-support/gmp/gmp-**
5.1.0/obsolete_automake_**macros.patch
rename meta/recipes-support/gmp/{gmp-**5.1.0 =
gmp-5.1.1}/configure.patch (97%)
delete mode 100644 meta/recipes-support/gmp/gmp/**gmp_fix_for_x32.patch
delete mode 100644
meta/recipes-support/gmp/gmp_**5.1.0.bbhttp://gmp_5.1.0.bb
create mode 100644
meta/recipes-support/gmp/gmp_**5.1.1.bbhttp://gmp_5.1.1.bb
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 486f8c5..000
--- 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 t...@gmplib.org
-# Date 1357413121 -3600
-# Node ID 187b7b1646ee0ace782768bb36117b**62c8408bb6
-# Parent 87a24013e9ee2cabf74e32282c1858**4a2c669009
-(aarch64): Make add_ss 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_ss(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 adff6ca..000
--- 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 cazf...@gmail.com
-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.0 +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:co**nfig.in http://config.in)
-+AC_CONFIG_HEADERS(config.h:c**onfig.in http://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 fb5435c..591ea79 100644
---