summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-02-21 14:45:37 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-22 23:57:27 +0000
commit746f277acc908c75a1578c018b5dd03fb88bcb1a (patch)
tree835066aa5bfd3545e44ff2856df95b994dd6f564 /meta
parent2eed027552b8e4928d51d7854e7d29a04cc2989d (diff)
downloadpoky-746f277acc908c75a1578c018b5dd03fb88bcb1a.tar.gz
gmp: Upgrade to 6.2.0
Drop amd64 patch, the bsfq has been replaced with bsfl for count_trailing_zeros Forward port rest of patches to 6.2.0 (From OE-Core rev: 35c052db4e081d363bcca350383adb0ac8c321d3) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gmp/gmp-6.1.2/amd64.patch18
-rw-r--r--meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch (renamed from meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch)0
-rw-r--r--meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch (renamed from meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch)16
-rw-r--r--meta/recipes-support/gmp/gmp/use-includedir.patch (renamed from meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch)3
-rw-r--r--meta/recipes-support/gmp/gmp_6.2.0.bb (renamed from meta/recipes-support/gmp/gmp_6.1.2.bb)5
5 files changed, 13 insertions, 29 deletions
diff --git a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
deleted file mode 100644
index 3935589f8b..0000000000
--- a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Upstream-Status: Pending
2
3Index: gmp-6.1.2/longlong.h
4===================================================================
5--- gmp-6.1.2.orig/longlong.h
6+++ gmp-6.1.2/longlong.h
7@@ -1036,8 +1036,10 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype
8 count is only an int. */
9 #define count_trailing_zeros(count, x) \
10 do { \
11+ UDItype __cbtmp; \
12 ASSERT ((x) != 0); \
13- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \
14+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \
15+ (count) = __cbtmp; \
16 } while (0)
17 #endif /* __amd64__ */
18
diff --git a/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch b/meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch
index 325ffe491f..325ffe491f 100644
--- a/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch
+++ b/meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch
diff --git a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch
index 1e47924ccc..56564db505 100644
--- a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch
+++ b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch
@@ -18,13 +18,11 @@ Upstream-Status: Inappropriate[OE-Specific]
18 configure.ac | 11 ----------- 18 configure.ac | 11 -----------
19 1 file changed, 11 deletions(-) 19 1 file changed, 11 deletions(-)
20 20
21Index: gmp-6.1.2/configure.ac 21--- a/configure.ac
22=================================================================== 22+++ b/configure.ac
23--- gmp-6.1.2.orig/configure.ac 23@@ -625,17 +625,6 @@ case $host in
24+++ gmp-6.1.2/configure.ac 24 any_32_testlist="sizeof-void*-4"
25@@ -604,15 +604,6 @@ case $host in 25 any_64_testlist="sizeof-void*-8"
26 any_32_testlist="sizeof-long-4"
27 any_64_testlist="sizeof-long-8"
28 26
29- # This is needed for clang, which is not content with flags like -mfpu=neon 27- # This is needed for clang, which is not content with flags like -mfpu=neon
30- # alone. 28- # alone.
@@ -33,12 +31,14 @@ Index: gmp-6.1.2/configure.ac
33- gcc_cflags_fpmode="-mfloat-abi=softfp" ;; 31- gcc_cflags_fpmode="-mfloat-abi=softfp" ;;
34- *-*-*eabihf) 32- *-*-*eabihf)
35- gcc_cflags_fpmode="-mfloat-abi=hard" ;; 33- gcc_cflags_fpmode="-mfloat-abi=hard" ;;
34- *-*-mingw*)
35- limb_64=longlong ;;
36- esac 36- esac
37- 37-
38 # FIXME: We make mandatory compiler options optional here. We should 38 # FIXME: We make mandatory compiler options optional here. We should
39 # either enforce them, or organise to strip paths as the corresponding 39 # either enforce them, or organise to strip paths as the corresponding
40 # options fail. 40 # options fail.
41@@ -746,8 +737,6 @@ case $host in 41@@ -780,8 +769,6 @@ case $host in
42 ;; 42 ;;
43 *) 43 *)
44 path="arm" 44 path="arm"
diff --git a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch b/meta/recipes-support/gmp/gmp/use-includedir.patch
index 6b089cf39c..d27317cdf6 100644
--- a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch
+++ b/meta/recipes-support/gmp/gmp/use-includedir.patch
@@ -1,4 +1,7 @@
1exec includedir should be pointing to general yocto includdir
2
1Upstream-Status: Pending 3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
2 5
3Index: gmp-6.1.2/Makefile.am 6Index: gmp-6.1.2/Makefile.am
4=================================================================== 7===================================================================
diff --git a/meta/recipes-support/gmp/gmp_6.1.2.bb b/meta/recipes-support/gmp/gmp_6.2.0.bb
index c745dbbfe7..a19c74fca8 100644
--- a/meta/recipes-support/gmp/gmp_6.1.2.bb
+++ b/meta/recipes-support/gmp/gmp_6.2.0.bb
@@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
9 9
10REVISION = "" 10REVISION = ""
11SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ 11SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \
12 file://amd64.patch \
13 file://use-includedir.patch \ 12 file://use-includedir.patch \
14 file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ 13 file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \
15 file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \ 14 file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \
16 " 15 "
17SRC_URI[md5sum] = "8ddbb26dc3bd4e2302984debba1406a5" 16SRC_URI[md5sum] = "c24161e0dd44cae78cd5f67193492a21"
18SRC_URI[sha256sum] = "5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2" 17SRC_URI[sha256sum] = "f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea"
19 18
20acpaths = "" 19acpaths = ""
21 20