summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-02-24 13:14:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-24 16:29:46 (GMT)
commitc867e31f7e3d23f0423029769770c495f26ee679 (patch)
tree036d7ed359aac272e62ca4d3e40f620e40ec5700 /meta/recipes-support
parent7c46f0b1095bb4e9b38512714d2798a6c976c3eb (diff)
downloadpoky-c867e31f7e3d23f0423029769770c495f26ee679.tar.gz
mpfr: add patch to fix build for thumb
(From OE-Core rev: 68bc9416d9e4beb027133e151b1bb3ecadd2ee26) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/mpfr/mpfr-3.1.0/long-long-thumb.patch39
-rw-r--r--meta/recipes-support/mpfr/mpfr_3.1.0.bb6
2 files changed, 43 insertions, 2 deletions
diff --git a/meta/recipes-support/mpfr/mpfr-3.1.0/long-long-thumb.patch b/meta/recipes-support/mpfr/mpfr-3.1.0/long-long-thumb.patch
new file mode 100644
index 0000000..ca7100e
--- /dev/null
+++ b/meta/recipes-support/mpfr/mpfr-3.1.0/long-long-thumb.patch
@@ -0,0 +1,39 @@
1From 84021b1e236508169be65e802a9c0a25fc9a8827 Mon Sep 17 00:00:00 2001
2From: Phil Blundell <philb@gnu.org>
3Date: Mon, 27 Oct 2008 22:26:35 +0000
4Subject: [PATCH] mpfr: crusade against inline assembler
5
6Without 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
25Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
26
27Upstream-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.0.bb b/meta/recipes-support/mpfr/mpfr_3.1.0.bb
index 8e67fc2..102ec69 100644
--- a/meta/recipes-support/mpfr/mpfr_3.1.0.bb
+++ b/meta/recipes-support/mpfr/mpfr_3.1.0.bb
@@ -3,9 +3,11 @@ LICENSE="GPLv3&LGPLv3"
3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
4 file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" 4 file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6"
5DEPENDS = "gmp" 5DEPENDS = "gmp"
6PR = "r0" 6PR = "r1"
7 7
8SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2" 8SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2 \
9 file://long-long-thumb.patch \
10"
9 11
10SRC_URI[md5sum] = "238ae4a15cc3a5049b723daef5d17938" 12SRC_URI[md5sum] = "238ae4a15cc3a5049b723daef5d17938"
11SRC_URI[sha256sum] = "74a7bbbad168dd1cc414f1c9210b8fc16ccfc8e422d34b3371a8978e31eab680" 13SRC_URI[sha256sum] = "74a7bbbad168dd1cc414f1c9210b8fc16ccfc8e422d34b3371a8978e31eab680"