diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-08-15 14:51:49 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-16 22:40:27 +0100 |
commit | 470327eb1f5c6076b3ee5489350522783fc43868 (patch) | |
tree | 6e79400acd889dcae7943426447db192f157ee17 | |
parent | 78bef0898cb17f4c8dcb01bdcba3bc0fff0e87a6 (diff) | |
download | poky-470327eb1f5c6076b3ee5489350522783fc43868.tar.gz |
mpfr: Upgrade to 4.0.1
Drop patch present in 4.0.1 already
Depend on autoconf-archive to fix
| configure:14652: error: possibly undefined macro: AX_PTHREAD
(From OE-Core rev: 118eccfa2ae199f22c7b2702211de1b4691c184f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/mpfr/mpfr/long-long-thumb.patch | 39 | ||||
-rw-r--r-- | meta/recipes-support/mpfr/mpfr_4.0.1.bb (renamed from meta/recipes-support/mpfr/mpfr_3.1.5.bb) | 10 |
2 files changed, 4 insertions, 45 deletions
diff --git a/meta/recipes-support/mpfr/mpfr/long-long-thumb.patch b/meta/recipes-support/mpfr/mpfr/long-long-thumb.patch deleted file mode 100644 index ca7100eb29..0000000000 --- a/meta/recipes-support/mpfr/mpfr/long-long-thumb.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 84021b1e236508169be65e802a9c0a25fc9a8827 Mon Sep 17 00:00:00 2001 | ||
2 | From: Phil Blundell <philb@gnu.org> | ||
3 | Date: Mon, 27 Oct 2008 22:26:35 +0000 | ||
4 | Subject: [PATCH] mpfr: crusade against inline assembler | ||
5 | |||
6 | Without this, build fails for thumb: | ||
7 | | {standard input}: Assembler messages: | ||
8 | | {standard input}:199: Error: selected processor does not support Thumb mode `umull sl,r0,r2,r1' | ||
9 | | {standard input}:214: Error: selected processor does not support Thumb mode `umull sl,r2,r1,fp' | ||
10 | | {standard input}:219: Error: instruction not supported in Thumb16 mode -- `adds fp,r0,sl' | ||
11 | | {standard input}:220: Error: unshifted register required -- `adc r2,r2,#0' | ||
12 | | {standard input}:235: Error: selected processor does not support Thumb mode `umull r0,sl,r1,r3' | ||
13 | | {standard input}:244: Error: selected processor does not support Thumb mode `umull fp,ip,r1,r3' | ||
14 | | {standard input}:253: Error: instruction not supported in Thumb16 mode -- `adds r3,sl,fp' | ||
15 | | {standard input}:254: Error: unshifted register required -- `adc ip,ip,#0' | ||
16 | | {standard input}:259: Error: instruction not supported in Thumb16 mode -- `adds sl,r1,r0' | ||
17 | | {standard input}:642: Error: selected processor does not support Thumb mode `umull r0,r2,r3,r1' | ||
18 | | ../arm-oe-linux-gnueabi-libtool --tag=CC --mode=compile arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mthumb-interwork -mtune=xscale --sysroot=/OE/shr-core/tmp-eglibc/sysroots/spitz -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_LOCALE_H=1 -DHAVE_WCHAR_H=1 -DHAVE_STDARG=1 -DHAVE_SYS_TIME_H=1 -DHAVE_ALLOCA_H=1 -DHAVE_STDINT_H=1 -DHAVE_VA_COPY=1 -DHAVE_SETLOCALE=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_LONG_LONG=1 -DHAVE_INTMAX_T=1 -DMPFR_HAVE_INTMAX_MAX=1 -DMPFR_HAVE_FESETROUND=1 -DHAVE_ROUND=1 -DHAVE_TRUNC=1 -DHAVE_FLOOR=1 -DHAVE_CEIL=1 -DHAVE_NEARBYINT=1 -DLT_OBJDIR=\".libs/\" -DHAVE_ATTRIBUTE_MODE=1 -DHAVE___GMPN_ROOTREM=1 -DHAVE___GMPN_SBPI1_DIVAPPR_Q=1 -I. -O2 -pipe -g -feliminate-unused-debug-types -ffloat-store -c -o pow.lo pow.c | ||
19 | | {standard input}:1154: Error: selected processor does not support Thumb mode `umull r0,r1,sl,ip' | ||
20 | | {standard input}:1166: Error: selected processor does not support Thumb mode `umull r3,r2,ip,r0' | ||
21 | | {standard input}:1171: Error: instruction not supported in Thumb16 mode -- `adds r0,r1,r3' | ||
22 | | {standard input}:1172: Error: unshifted register required -- `adc r2,r2,#0' | ||
23 | | make[2]: *** [mul.lo] Error 1 | ||
24 | |||
25 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
26 | |||
27 | Upstream-Status: Pending | ||
28 | |||
29 | --- mpfr.old/src/mpfr-longlong.h 2008-01-01 03:29:09.000000000 +0000 | ||
30 | +++ mpfr/src/mpfr-longlong.h 2008-10-27 21:46:44.000000000 +0000 | ||
31 | @@ -406,7 +406,7 @@ | ||
32 | "rIJ" ((USItype) (bl))) | ||
33 | #endif | ||
34 | |||
35 | -#if defined (__arm__) && W_TYPE_SIZE == 32 | ||
36 | +#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__) | ||
37 | #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ | ||
38 | __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3" \ | ||
39 | : "=r" (sh), "=&r" (sl) \ | ||
diff --git a/meta/recipes-support/mpfr/mpfr_3.1.5.bb b/meta/recipes-support/mpfr/mpfr_4.0.1.bb index a78c0bd486..f85a846e33 100644 --- a/meta/recipes-support/mpfr/mpfr_3.1.5.bb +++ b/meta/recipes-support/mpfr/mpfr_4.0.1.bb | |||
@@ -7,13 +7,11 @@ inherit autotools texinfo | |||
7 | 7 | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ |
9 | file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" | 9 | file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" |
10 | DEPENDS = "gmp" | 10 | DEPENDS = "gmp autoconf-archive" |
11 | 11 | ||
12 | SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz \ | 12 | SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz" |
13 | file://long-long-thumb.patch \ | 13 | SRC_URI[md5sum] = "b8dd19bd9bb1ec8831a6a582a7308073" |
14 | " | 14 | SRC_URI[sha256sum] = "67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e" |
15 | SRC_URI[md5sum] = "c4ac246cf9795a4491e7766002cd528f" | ||
16 | SRC_URI[sha256sum] = "015fde82b3979fbe5f83501986d328331ba8ddf008c1ff3da3c238f49ca062bc" | ||
17 | 15 | ||
18 | UPSTREAM_CHECK_URI = "http://www.mpfr.org/mpfr-current/" | 16 | UPSTREAM_CHECK_URI = "http://www.mpfr.org/mpfr-current/" |
19 | 17 | ||