diff options
author | Bernhard Guillon <Bernhard.Guillon@hale.at> | 2011-09-15 10:23:58 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-16 13:30:24 +0100 |
commit | 14666c0b6383aab7cda9e96ba617fc852a632ad8 (patch) | |
tree | 0622191551d117e83af83a07270e6e9eff44cb82 /meta/recipes-support/liboil | |
parent | 0b9e2fa758ed6649f98007c47a66ce1363f132d7 (diff) | |
download | poky-14666c0b6383aab7cda9e96ba617fc852a632ad8.tar.gz |
liboil-0.3.17: add upstream Fix-enable-vfp-flag patch
Add upstream 1921498bcc06408e8b051a3a9e9ce4182998f748 patch to fix
compiling with vfp
Without this patch this error occours on arm with vfp and softfloat:
| math_vfp_asm.S:273: Error: selected processor does not support `fnegd d12,d4'
| math_vfp_asm.S:273: Error: selected processor does not support `fstmiad r0!,{d12,d13,d14,d15}'
| math_vfp_asm.S:273: Error: selected processor does not support `fmxr fpscr,lr'
| make[3]: *** [math_vfp_asm.lo] Error 1
(From OE-Core rev: f7f129b60d33e2758a3a9cc66a98251e1325664d)
Signed-off-by: Bernhard Guillon <Bernhard.Guillon@hale.at>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/liboil')
-rw-r--r-- | meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch | 39 | ||||
-rw-r--r-- | meta/recipes-support/liboil/liboil_0.3.17.bb | 3 |
2 files changed, 41 insertions, 1 deletions
diff --git a/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch b/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch new file mode 100644 index 0000000000..5b7dd4e7f1 --- /dev/null +++ b/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 1921498bcc06408e8b051a3a9e9ce4182998f748 Mon Sep 17 00:00:00 2001 | ||
2 | From: David Schleef <ds@schleef.org> | ||
3 | Date: Fri, 8 Apr 2011 10:05:49 -0700 | ||
4 | Subject: [PATCH 10/10] Fix --enable-vfp flag | ||
5 | |||
6 | Patch from Christophe Lyon, fixes #36084. | ||
7 | --- | ||
8 | configure.ac | 4 ++-- | ||
9 | liboil/arm/Makefile.am | 1 + | ||
10 | 2 files changed, 3 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index 98c81fb..407d88c 100644 | ||
14 | --- a/configure.ac | ||
15 | +++ b/configure.ac | ||
16 | @@ -188,8 +188,8 @@ fi | ||
17 | AC_ARG_ENABLE(vfp, | ||
18 | AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]), | ||
19 | enable_vfp=$enableval,enable_vfp=yes) | ||
20 | -if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then | ||
21 | - AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"], | ||
22 | +if test "x$enable_vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then | ||
23 | + AS_COMPILER_FLAG(["-mfpu=vfp"], | ||
24 | [VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"], | ||
25 | true) | ||
26 | #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"], | ||
27 | diff --git a/liboil/arm/Makefile.am b/liboil/arm/Makefile.am | ||
28 | index ead08ed..cd8d9fa 100644 | ||
29 | --- a/liboil/arm/Makefile.am | ||
30 | +++ b/liboil/arm/Makefile.am | ||
31 | @@ -6,4 +6,5 @@ libarm_la_SOURCES = \ | ||
32 | math_vfp_asm.S | ||
33 | |||
34 | libarm_la_CFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS) | ||
35 | +libarm_la_CCASFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS) | ||
36 | |||
37 | -- | ||
38 | 1.7.6 | ||
39 | |||
diff --git a/meta/recipes-support/liboil/liboil_0.3.17.bb b/meta/recipes-support/liboil/liboil_0.3.17.bb index 64e1ddd2f9..10a845e42f 100644 --- a/meta/recipes-support/liboil/liboil_0.3.17.bb +++ b/meta/recipes-support/liboil/liboil_0.3.17.bb | |||
@@ -10,11 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ad80780d9c5205d63481a0184e199a15 \ | |||
10 | file://testsuite/trans.c;endline=29;md5=380ecd43121fe3dcc0d8d7e5984f283d" | 10 | file://testsuite/trans.c;endline=29;md5=380ecd43121fe3dcc0d8d7e5984f283d" |
11 | 11 | ||
12 | DEPENDS = "glib-2.0" | 12 | DEPENDS = "glib-2.0" |
13 | PR = "r3" | 13 | PR = "r4" |
14 | 14 | ||
15 | SRC_URI = "http://liboil.freedesktop.org/download/${BPN}-${PV}.tar.gz \ | 15 | SRC_URI = "http://liboil.freedesktop.org/download/${BPN}-${PV}.tar.gz \ |
16 | file://no-tests.patch \ | 16 | file://no-tests.patch \ |
17 | file://fix-unaligned-whitelist.patch \ | 17 | file://fix-unaligned-whitelist.patch \ |
18 | file://0001-Fix-enable-vfp-flag.patch \ | ||
18 | " | 19 | " |
19 | 20 | ||
20 | SRC_URI[md5sum] = "47dc734f82faeb2964d97771cfd2e701" | 21 | SRC_URI[md5sum] = "47dc734f82faeb2964d97771cfd2e701" |