<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, May 8, 2013 at 7:29 PM, Saul Wold <span dir="ltr"><<a href="mailto:sgw@linux.intel.com" target="_blank">sgw@linux.intel.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">On 05/07/2013 06:00 AM, Bogdan Marinescu wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
A number of patches are now part of the upstream.<br>
Tested by compiling and running core-image-minimal/qemux86.<br>
<br>
</blockquote>
<br></div>
This patch is not applying cleaning, please verify it. see below<div><div class="h5"><br>
<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Signed-off-by: Bogdan Marinescu <<a href="mailto:bogdan.a.marinescu@intel.com" target="_blank">bogdan.a.marinescu@intel.com</a>><br>
---<br>
.../gmp/gmp-5.1.0/<u></u>187b7b1646ee.patch | 44 --------------------<br>
.../gmp/gmp-5.1.0/obsolete_<u></u>automake_macros.patch | 13 ------<br>
.../gmp/{gmp-5.1.0 => gmp-5.1.1}/configure.patch | 6 +--<br>
meta/recipes-support/gmp/gmp/<u></u>gmp_fix_for_x32.patch | 41 ------------------<br>
meta/recipes-support/gmp/<a href="http://gmp_5.1.0.bb" target="_blank">gmp_<u></u>5.1.0.bb</a> | 15 -------<br>
meta/recipes-support/gmp/<a href="http://gmp_5.1.1.bb" target="_blank">gmp_<u></u>5.1.1.bb</a> | 10 +++++<br>
6 files changed, 13 insertions(+), 116 deletions(-)<br>
delete mode 100644 meta/recipes-support/gmp/gmp-<u></u>5.1.0/187b7b1646ee.patch<br>
delete mode 100644 meta/recipes-support/gmp/gmp-<u></u>5.1.0/obsolete_automake_<u></u>macros.patch<br>
rename meta/recipes-support/gmp/{gmp-<u></u>5.1.0 => gmp-5.1.1}/configure.patch (97%)<br>
delete mode 100644 meta/recipes-support/gmp/gmp/<u></u>gmp_fix_for_x32.patch<br>
delete mode 100644 meta/recipes-support/gmp/<a href="http://gmp_5.1.0.bb" target="_blank">gmp_<u></u>5.1.0.bb</a><br>
create mode 100644 meta/recipes-support/gmp/<a href="http://gmp_5.1.1.bb" target="_blank">gmp_<u></u>5.1.1.bb</a><br>
<br>
diff --git a/meta/recipes-support/gmp/<u></u>gmp-5.1.0/187b7b1646ee.patch b/meta/recipes-support/gmp/<u></u>gmp-5.1.0/187b7b1646ee.patch<br>
deleted file mode 100644<br>
index 486f8c5..0000000<br>
--- a/meta/recipes-support/gmp/<u></u>gmp-5.1.0/187b7b1646ee.patch<br>
+++ /dev/null<br>
@@ -1,44 +0,0 @@<br>
-Upstream-status: Backport<br>
-<br>
-# HG changeset patch<br>
-# User Torbjorn Granlund <<a href="mailto:tege@gmplib.org" target="_blank">tege@gmplib.org</a>><br>
-# Date 1357413121 -3600<br>
-# Node ID 187b7b1646ee0ace782768bb36117b<u></u>62c8408bb6<br>
-# Parent 87a24013e9ee2cabf74e32282c1858<u></u>4a2c669009<br>
-(aarch64): Make add_ssaaaa and sub_ddmmss actually work.<br>
-<br>
-diff -r 87a24013e9ee -r 187b7b1646ee longlong.h<br>
---- a/longlong.h Fri Jan 04 16:32:01 2013 +0100<br>
-+++ b/longlong.h Sat Jan 05 20:12:01 2013 +0100<br>
-@@ -530,23 +530,16 @@<br>
- #endif /* __arm__ */<br>
-<br>
- #if defined (__aarch64__) && W_TYPE_SIZE == 64<br>
-+/* FIXME: Extend the immediate range for the low word by using both<br>
-+ ADDS and SUBS, since they set carry in the same way. */<br>
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \<br>
-- __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3" \<br>
-+ __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3" \<br>
- : "=r" (sh), "=&r" (sl) \<br>
-- : "r" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)<br>
-+ : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)<br>
- #define sub_ddmmss(sh, sl, ah, al, bh, bl) \<br>
-- do { \<br>
-- if (__builtin_constant_p (bl)) \<br>
-- { \<br>
-- __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \<br>
-- : "=r" (sh), "=&r" (sl) \<br>
-- : "r" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \<br>
-- } \<br>
-- else /* only bh might be a constant */ \<br>
-- __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \<br>
-- : "=r" (sh), "=&r" (sl) \<br>
-- : "r" (ah), "rZ" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\<br>
-- } while (0)<br>
-+ __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3" \<br>
-+ : "=r,r" (sh), "=&r,&r" (sl) \<br>
-+ : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC)<br>
- #define umul_ppmm(ph, pl, m0, m1) \<br>
- do { \<br>
- UDItype __m0 = (m0), __m1 = (m1); \<br>
-<br>
diff --git a/meta/recipes-support/gmp/<u></u>gmp-5.1.0/obsolete_automake_<u></u>macros.patch b/meta/recipes-support/gmp/<u></u>gmp-5.1.0/obsolete_automake_<u></u>macros.patch<br>
deleted file mode 100644<br>
index adff6ca..0000000<br>
--- a/meta/recipes-support/gmp/<u></u>gmp-5.1.0/obsolete_automake_<u></u>macros.patch<br>
+++ /dev/null<br>
@@ -1,13 +0,0 @@<br>
-Upstream-Status: Accepted<br>
-<br>
-Signed-off-by: Marko Lindqvist <<a href="mailto:cazfi74@gmail.com" target="_blank">cazfi74@gmail.com</a>><br>
-diff -Nurd gmp-5.1.0/<a href="http://configure.in" target="_blank">configure.in</a> gmp-5.1.0/<a href="http://configure.in" target="_blank">configure.in</a><br>
---- gmp-5.1.0/<a href="http://configure.in" target="_blank">configure.in</a> 2012-12-18 21:05:09.000000000 +0200<br>
-+++ gmp-5.1.0/<a href="http://configure.in" target="_blank">configure.in</a> 2013-01-02 06:00:41.552958778 +0200<br>
-@@ -67,7 +67,7 @@<br>
- dnl so update there too if changing anything.<br>
- dnl<br>
- AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])<br>
--AM_CONFIG_HEADER(config.h:<a href="http://config.in" target="_blank">co<u></u>nfig.in</a>)<br>
-+AC_CONFIG_HEADERS(config.h:<a href="http://config.in" target="_blank">c<u></u>onfig.in</a>)<br>
- AM_MAINTAINER_MODE<br>
diff --git a/meta/recipes-support/gmp/<u></u>gmp-5.1.0/configure.patch b/meta/recipes-support/gmp/<u></u>gmp-5.1.1/configure.patch<br>
similarity index 97%<br>
rename from meta/recipes-support/gmp/gmp-<u></u>5.1.0/configure.patch<br>
rename to meta/recipes-support/gmp/gmp-<u></u>5.1.1/configure.patch<br>
index fb5435c..591ea79 100644<br>
--- a/meta/recipes-support/gmp/<u></u>gmp-5.1.0/configure.patch<br>
+++ b/meta/recipes-support/gmp/<u></u>gmp-5.1.1/configure.patch<br>
@@ -115,9 +115,9 @@ diff -Nurd gmp-5.1.0/acinclude.m4 gmp-5.1.0/acinclude.m4<br>
])<br>
<br>
<br>
-diff -Nurd gmp-5.1.0/<a href="http://configure.in" target="_blank">configure.in</a> gmp-5.1.0/<a href="http://configure.in" target="_blank">configure.in</a><br>
---- gmp-5.1.0/<a href="http://configure.in" target="_blank">configure.in</a> 2012-12-18 21:05:09.000000000 +0200<br>
-+++ gmp-5.1.0/<a href="http://configure.in" target="_blank">configure.in</a> 2013-01-02 05:19:26.977013073 +0200<br>
+diff -Nurd gmp-5.1.0/<a href="http://configure.ac" target="_blank">configure.ac</a> gmp-5.1.0/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
+--- gmp-5.1.0/<a href="http://configure.ac" target="_blank">configure.ac</a> 2012-12-18 21:05:09.000000000 +0200<br>
++++ gmp-5.1.0/<a href="http://configure.ac" target="_blank">configure.ac</a> 2013-01-02 05:19:26.977013073 +0200<br>
@@ -29,13 +29,6 @@<br>
AC_PREREQ(2.59)<br>
AC_INIT(GNU MP, GMP_VERSION, [<a href="mailto:gmp-bugs@gmplib.org" target="_blank">gmp-bugs@gmplib.org</a>, see <a href="http://gmplib.org/manual/Reporting-Bugs.html" target="_blank">http://gmplib.org/manual/<u></u>Reporting-Bugs.html</a>], gmp)<br>
diff --git a/meta/recipes-support/gmp/<u></u>gmp/gmp_fix_for_x32.patch b/meta/recipes-support/gmp/<u></u>gmp/gmp_fix_for_x32.patch<br>
deleted file mode 100644<br>
index 76d3a00..0000000<br>
--- a/meta/recipes-support/gmp/<u></u>gmp/gmp_fix_for_x32.patch<br>
+++ /dev/null<br>
@@ -1,41 +0,0 @@<br>
-Upstream-Status: Pending<br>
-<br>
-Add X32 support in gmp configure.<br>
-<br>
-Patch Originator: H J Lu @ Intel<br>
-Patch modified for Yocto by Nitin Kamble<br>
-Signed Off By: Nitin A Kamble <<a href="mailto:nitin.a.kamble@intel.com" target="_blank">nitin.a.kamble@intel.com</a>> 2011/11/21<br>
-<br>
---- gmp-4.3.2/configure.in.x32 2011-08-12 15:03:06.143548291 -0700<br>
-+++ gmp-4.3.2/<a href="http://configure.in" target="_blank">configure.in</a> 2011-08-12 15:06:20.580595316 -0700<br>
-@@ -1499,6 +1499,21 @@ case $host in<br>
- path_64="x86_64/atom x86_64"<br>
- ;;<br>
- esac<br>
-+<br>
-+ # X32 support.<br>
-+ case x"$path_64" in<br>
-+ xx86_64*)<br>
-+ abilist="x32 64 32"<br>
-+ path_x32="$path_64"<br>
-+ limb_x32=longlong<br>
-+ cclist_x32="gcc"<br>
-+ gcc_x32_cflags="-O2 -mx32"<br>
-+ any_x32_testlist="sizeof-long-<u></u>4"<br>
-+ CALLING_CONVENTIONS_OBJS_x32='<u></u>amd64call.lo amd64check$U.lo'<br>
-+ SPEED_CYCLECOUNTER_OBJ_x32=<u></u>x86_64.lo<br>
-+ cyclecounter_size_x32=2<br>
-+ ;;<br>
-+ esac<br>
- ;;<br>
- esac<br>
- ;;<br>
-@@ -3039,7 +3058,7 @@ if test "$gmp_asm_syntax_testing" != no;<br>
- GMP_INCLUDE_MPN(x86/darwin.m4) ;;<br>
- esac<br>
- ;;<br>
-- 64)<br>
-+ 64|x32)<br>
- GMP_INCLUDE_MPN(x86_64/x86_64-<u></u>defs.m4)<br>
- case $host in<br>
- *-*-darwin*)<br>
diff --git a/meta/recipes-support/gmp/<a href="http://gmp_5.1.0.bb" target="_blank">gmp<u></u>_5.1.0.bb</a> b/meta/recipes-support/gmp/<a href="http://gmp_5.1.0.bb" target="_blank">gmp<u></u>_5.1.0.bb</a><br>
deleted file mode 100644<br>
index 6591ebe..0000000<br>
--- a/meta/recipes-support/gmp/<a href="http://gmp_5.1.0.bb" target="_blank">gmp<u></u>_5.1.0.bb</a><br>
+++ /dev/null<br>
@@ -1,15 +0,0 @@<br>
-require gmp.inc<br>
-LICENSE="LGPLv3&GPLv3"<br>
-LIC_FILES_CHKSUM = "file://COPYING;md5=<u></u>d32239bcb673463ab874e80d47fae5<u></u>04 \<br>
- file://version.c;endline=18;<u></u>md5=<u></u>d8c56b52b9092346b9f93b4da65ef7<u></u>90"<br>
-<br>
-PR = "r1"<br>
-<br>
-SRC_URI_append = " file://use-includedir.patch \<br>
- file://gmp_fix_for_x32.patch \<br>
- file://187b7b1646ee.patch \<br>
- file://obsolete_automake_<u></u>macros.patch \<br>
- "<br>
-<br>
-SRC_URI[md5sum] = "<u></u>362cf515aff8dc240958ce47418e4c<u></u>78"<br>
-SRC_URI[sha256sum] = "<u></u>dfd9aba98fe5caa54a715b4584c7d4<u></u>5eb0ee0c8be9a3181164ad2fad5eef<u></u>c796"<br>
</blockquote>
<br></div></div>
These checksums are different that what's in OE-Core!<br>
<br>
PR = "r2"<br>
<br>
SRC_URI[md5sum] = "<u></u>cf6d7cb5915f29ce0fc41d042205c0<u></u>80"<br>
SRC_URI[sha256sum] = "<u></u>ed5239a62aeaba6cfc8d50ec36fb59<u></u>215618f98c248d4bb05ca9bccd9907<u></u>94dc"<br>
<br>
Are you using a current master?<br></blockquote><div><br></div><div style>I wasn't using the current master, sorry about that. I've sent v2 of this patch.</div><div style><br></div><div style>Thanks,</div><div style>
Bogdan</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Sau!<div class="HOEnZb"><div class="h5"><br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
diff --git a/meta/recipes-support/gmp/<a href="http://gmp_5.1.1.bb" target="_blank">gmp<u></u>_5.1.1.bb</a> b/meta/recipes-support/gmp/<a href="http://gmp_5.1.1.bb" target="_blank">gmp<u></u>_5.1.1.bb</a><br>
new file mode 100644<br>
index 0000000..d6dcb97<br>
--- /dev/null<br>
+++ b/meta/recipes-support/gmp/<a href="http://gmp_5.1.1.bb" target="_blank">gmp<u></u>_5.1.1.bb</a><br>
@@ -0,0 +1,10 @@<br>
+require gmp.inc<br>
+LICENSE="LGPLv3&GPLv3"<br>
+LIC_FILES_CHKSUM = "file://COPYING;md5=<u></u>d32239bcb673463ab874e80d47fae5<u></u>04 \<br>
+ file://version.c;endline=18;<u></u>md5=<u></u>d8c56b52b9092346b9f93b4da65ef7<u></u>90"<br>
+<br>
+SRC_URI_append = " file://use-includedir.patch \<br>
+ "<br>
+<br>
+SRC_URI[md5sum] = "<u></u>2fa018a7cd193c78494525f236d02d<u></u>d6"<br>
+SRC_URI[sha256sum] = "<u></u>a0d4779f48b36519dfaceb5f987a7c<u></u>76fcac223258bebea3bb2244310970<u></u>afad"<br>
<br>
</blockquote>
</div></div></blockquote></div><br></div></div>