From 0f2614bab7f46f0417030a539473a874fc2b805d Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 2 Jan 2013 20:37:08 +0200 Subject: mpfr: update to upstream version 3.1.1 mpfr_fix_for_automake-1.12.patch part of upstream now. (From OE-Core rev: 49dd3fb76c59b5baeec4820575db4e8e9c17d417) Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../mpfr/mpfr-3.1.0/long-long-thumb.patch | 39 ---------------------- .../mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch | 35 ------------------- .../mpfr/mpfr-3.1.1/long-long-thumb.patch | 39 ++++++++++++++++++++++ meta/recipes-support/mpfr/mpfr_3.1.0.bb | 17 ---------- meta/recipes-support/mpfr/mpfr_3.1.1.bb | 16 +++++++++ 5 files changed, 55 insertions(+), 91 deletions(-) delete mode 100644 meta/recipes-support/mpfr/mpfr-3.1.0/long-long-thumb.patch delete mode 100644 meta/recipes-support/mpfr/mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch create mode 100644 meta/recipes-support/mpfr/mpfr-3.1.1/long-long-thumb.patch delete mode 100644 meta/recipes-support/mpfr/mpfr_3.1.0.bb create mode 100644 meta/recipes-support/mpfr/mpfr_3.1.1.bb 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 deleted file mode 100644 index ca7100eb29..0000000000 --- a/meta/recipes-support/mpfr/mpfr-3.1.0/long-long-thumb.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 84021b1e236508169be65e802a9c0a25fc9a8827 Mon Sep 17 00:00:00 2001 -From: Phil Blundell -Date: Mon, 27 Oct 2008 22:26:35 +0000 -Subject: [PATCH] mpfr: crusade against inline assembler - -Without this, build fails for thumb: -| {standard input}: Assembler messages: -| {standard input}:199: Error: selected processor does not support Thumb mode `umull sl,r0,r2,r1' -| {standard input}:214: Error: selected processor does not support Thumb mode `umull sl,r2,r1,fp' -| {standard input}:219: Error: instruction not supported in Thumb16 mode -- `adds fp,r0,sl' -| {standard input}:220: Error: unshifted register required -- `adc r2,r2,#0' -| {standard input}:235: Error: selected processor does not support Thumb mode `umull r0,sl,r1,r3' -| {standard input}:244: Error: selected processor does not support Thumb mode `umull fp,ip,r1,r3' -| {standard input}:253: Error: instruction not supported in Thumb16 mode -- `adds r3,sl,fp' -| {standard input}:254: Error: unshifted register required -- `adc ip,ip,#0' -| {standard input}:259: Error: instruction not supported in Thumb16 mode -- `adds sl,r1,r0' -| {standard input}:642: Error: selected processor does not support Thumb mode `umull r0,r2,r3,r1' -| ../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 -| {standard input}:1154: Error: selected processor does not support Thumb mode `umull r0,r1,sl,ip' -| {standard input}:1166: Error: selected processor does not support Thumb mode `umull r3,r2,ip,r0' -| {standard input}:1171: Error: instruction not supported in Thumb16 mode -- `adds r0,r1,r3' -| {standard input}:1172: Error: unshifted register required -- `adc r2,r2,#0' -| make[2]: *** [mul.lo] Error 1 - -Signed-off-by: Martin Jansa - -Upstream-Status: Pending - ---- mpfr.old/src/mpfr-longlong.h 2008-01-01 03:29:09.000000000 +0000 -+++ mpfr/src/mpfr-longlong.h 2008-10-27 21:46:44.000000000 +0000 -@@ -406,7 +406,7 @@ - "rIJ" ((USItype) (bl))) - #endif - --#if defined (__arm__) && W_TYPE_SIZE == 32 -+#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__) - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ - __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3" \ - : "=r" (sh), "=&r" (sl) \ diff --git a/meta/recipes-support/mpfr/mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch b/meta/recipes-support/mpfr/mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch deleted file mode 100644 index 5b0a24aa3e..0000000000 --- a/meta/recipes-support/mpfr/mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status: Pending - -this patch avoids these issues with automake 1.12 - -| configure.ac:304: error: automatic de-ANSI-fication support has been removed -| tests/Makefile.am:12: error: automatic de-ANSI-fication support has been removed - -Signed-Off-By: Nitin A Kamble -2012/05/02 - -Index: mpfr-3.1.0/configure.ac -=================================================================== ---- mpfr-3.1.0.orig/configure.ac -+++ mpfr-3.1.0/configure.ac -@@ -301,7 +301,6 @@ if test "$test_CFLAGS" != set && test -n - fi - - AM_PROG_CC_C_O --AM_C_PROTOTYPES - - case $host in - *-apple-darwin*) -Index: mpfr-3.1.0/tests/Makefile.am -=================================================================== ---- mpfr-3.1.0.orig/tests/Makefile.am -+++ mpfr-3.1.0/tests/Makefile.am -@@ -9,7 +9,7 @@ - # PARTICULAR PURPOSE. - - --AUTOMAKE_OPTIONS = 1.6 gnu $(top_builddir)/ansi2knr -+AUTOMAKE_OPTIONS = 1.6 gnu - - # tversion is run - # * at the beginning so that the user gets a possible version error diff --git a/meta/recipes-support/mpfr/mpfr-3.1.1/long-long-thumb.patch b/meta/recipes-support/mpfr/mpfr-3.1.1/long-long-thumb.patch new file mode 100644 index 0000000000..ca7100eb29 --- /dev/null +++ b/meta/recipes-support/mpfr/mpfr-3.1.1/long-long-thumb.patch @@ -0,0 +1,39 @@ +From 84021b1e236508169be65e802a9c0a25fc9a8827 Mon Sep 17 00:00:00 2001 +From: Phil Blundell +Date: Mon, 27 Oct 2008 22:26:35 +0000 +Subject: [PATCH] mpfr: crusade against inline assembler + +Without this, build fails for thumb: +| {standard input}: Assembler messages: +| {standard input}:199: Error: selected processor does not support Thumb mode `umull sl,r0,r2,r1' +| {standard input}:214: Error: selected processor does not support Thumb mode `umull sl,r2,r1,fp' +| {standard input}:219: Error: instruction not supported in Thumb16 mode -- `adds fp,r0,sl' +| {standard input}:220: Error: unshifted register required -- `adc r2,r2,#0' +| {standard input}:235: Error: selected processor does not support Thumb mode `umull r0,sl,r1,r3' +| {standard input}:244: Error: selected processor does not support Thumb mode `umull fp,ip,r1,r3' +| {standard input}:253: Error: instruction not supported in Thumb16 mode -- `adds r3,sl,fp' +| {standard input}:254: Error: unshifted register required -- `adc ip,ip,#0' +| {standard input}:259: Error: instruction not supported in Thumb16 mode -- `adds sl,r1,r0' +| {standard input}:642: Error: selected processor does not support Thumb mode `umull r0,r2,r3,r1' +| ../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 +| {standard input}:1154: Error: selected processor does not support Thumb mode `umull r0,r1,sl,ip' +| {standard input}:1166: Error: selected processor does not support Thumb mode `umull r3,r2,ip,r0' +| {standard input}:1171: Error: instruction not supported in Thumb16 mode -- `adds r0,r1,r3' +| {standard input}:1172: Error: unshifted register required -- `adc r2,r2,#0' +| make[2]: *** [mul.lo] Error 1 + +Signed-off-by: Martin Jansa + +Upstream-Status: Pending + +--- mpfr.old/src/mpfr-longlong.h 2008-01-01 03:29:09.000000000 +0000 ++++ mpfr/src/mpfr-longlong.h 2008-10-27 21:46:44.000000000 +0000 +@@ -406,7 +406,7 @@ + "rIJ" ((USItype) (bl))) + #endif + +-#if defined (__arm__) && W_TYPE_SIZE == 32 ++#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__) + #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3" \ + : "=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 deleted file mode 100644 index e7e20cefbc..0000000000 --- a/meta/recipes-support/mpfr/mpfr_3.1.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -require mpfr.inc -LICENSE="GPLv3&LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" -DEPENDS = "gmp" -PR = "r2" - -SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2 \ - file://long-long-thumb.patch \ - file://mpfr_fix_for_automake-1.12.patch \ - " - -SRC_URI[md5sum] = "238ae4a15cc3a5049b723daef5d17938" -SRC_URI[sha256sum] = "74a7bbbad168dd1cc414f1c9210b8fc16ccfc8e422d34b3371a8978e31eab680" -S = "${WORKDIR}/mpfr-${PV}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/mpfr/mpfr_3.1.1.bb b/meta/recipes-support/mpfr/mpfr_3.1.1.bb new file mode 100644 index 0000000000..7f34e7141b --- /dev/null +++ b/meta/recipes-support/mpfr/mpfr_3.1.1.bb @@ -0,0 +1,16 @@ +require mpfr.inc +LICENSE="GPLv3&LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" +DEPENDS = "gmp" +PR = "r0" + +SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2 \ + file://long-long-thumb.patch \ + " + +SRC_URI[md5sum] = "e90e0075bb1b5f626c6e31aaa9c64e3b" +SRC_URI[sha256sum] = "7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd" +S = "${WORKDIR}/mpfr-${PV}" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf