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>
This commit is contained in:
Khem Raj
2020-02-21 14:45:37 -08:00
committed by Richard Purdie
parent 2eed027552
commit 746f277acc
5 changed files with 13 additions and 29 deletions

View File

@@ -1,18 +0,0 @@
Upstream-Status: Pending
Index: gmp-6.1.2/longlong.h
===================================================================
--- gmp-6.1.2.orig/longlong.h
+++ gmp-6.1.2/longlong.h
@@ -1036,8 +1036,10 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype
count is only an int. */
#define count_trailing_zeros(count, x) \
do { \
+ UDItype __cbtmp; \
ASSERT ((x) != 0); \
- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \
+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \
+ (count) = __cbtmp; \
} while (0)
#endif /* __amd64__ */

View File

@@ -18,13 +18,11 @@ Upstream-Status: Inappropriate[OE-Specific]
configure.ac | 11 -----------
1 file changed, 11 deletions(-)
Index: gmp-6.1.2/configure.ac
===================================================================
--- gmp-6.1.2.orig/configure.ac
+++ gmp-6.1.2/configure.ac
@@ -604,15 +604,6 @@ case $host in
any_32_testlist="sizeof-long-4"
any_64_testlist="sizeof-long-8"
--- a/configure.ac
+++ b/configure.ac
@@ -625,17 +625,6 @@ case $host in
any_32_testlist="sizeof-void*-4"
any_64_testlist="sizeof-void*-8"
- # This is needed for clang, which is not content with flags like -mfpu=neon
- # alone.
@@ -33,12 +31,14 @@ Index: gmp-6.1.2/configure.ac
- gcc_cflags_fpmode="-mfloat-abi=softfp" ;;
- *-*-*eabihf)
- gcc_cflags_fpmode="-mfloat-abi=hard" ;;
- *-*-mingw*)
- limb_64=longlong ;;
- esac
-
# FIXME: We make mandatory compiler options optional here. We should
# either enforce them, or organise to strip paths as the corresponding
# options fail.
@@ -746,8 +737,6 @@ case $host in
@@ -780,8 +769,6 @@ case $host in
;;
*)
path="arm"

View File

@@ -1,4 +1,7 @@
exec includedir should be pointing to general yocto includdir
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: gmp-6.1.2/Makefile.am
===================================================================

View File

@@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
REVISION = ""
SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \
file://amd64.patch \
file://use-includedir.patch \
file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \
file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \
"
SRC_URI[md5sum] = "8ddbb26dc3bd4e2302984debba1406a5"
SRC_URI[sha256sum] = "5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2"
SRC_URI[md5sum] = "c24161e0dd44cae78cd5f67193492a21"
SRC_URI[sha256sum] = "f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea"
acpaths = ""