summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2019-08-23 17:20:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-28 11:31:22 +0100
commitbc1cedc3eab0aacf03d973fe4396a42d17ab085e (patch)
tree695b4ea2f1ec292100382a0f8f61a77e6724bcff
parent7e158306e6a49a1b9e777c253c8ba38b16612b32 (diff)
downloadpoky-bc1cedc3eab0aacf03d973fe4396a42d17ab085e.tar.gz
libffi: Make it build for MIPS o32
This solves the following errors: src/mips/o32.S: Assembler messages: src/mips/o32.S:286: Error: opcode not supported on this processor: mips32r2 (mips32r2) `s.d $f12,((16*4)-10*4)($fp)' src/mips/o32.S:287: Error: opcode not supported on this processor: mips32r2 (mips32r2) `s.d $f14,((16*4)-8*4)($fp)' (From OE-Core rev: 250d85144c0118aebfce105f02425c25cb028087) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch31
-rw-r--r--meta/recipes-support/libffi/libffi_3.3~rc0.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch b/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch
new file mode 100644
index 0000000000..00a30a3554
--- /dev/null
+++ b/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch
@@ -0,0 +1,31 @@
1From 4149a7627a998731cc246d3f58a36808745d04c8 Mon Sep 17 00:00:00 2001
2From: Carl Hurd <carl@Carls-MacBook-Pro.local>
3Date: Wed, 18 Jul 2018 09:04:32 -0400
4Subject: [PATCH] Fixed missed #ifndef for __mips_soft_float
5
6Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
7---
8Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/442]
9
10 src/mips/o32.S | 2 ++
11 1 file changed, 2 insertions(+)
12
13diff --git a/src/mips/o32.S b/src/mips/o32.S
14index 44e74cb..799139b 100644
15--- a/src/mips/o32.S
16+++ b/src/mips/o32.S
17@@ -282,9 +282,11 @@ $LCFI12:
18 li $13, 1 # FFI_O32
19 bne $16, $13, 1f # Skip fp save if FFI_O32_SOFT_FLOAT
20
21+#ifndef __mips_soft_float
22 # Store all possible float/double registers.
23 s.d $f12, FA_0_0_OFF2($fp)
24 s.d $f14, FA_1_0_OFF2($fp)
25+#endif
26 1:
27 # prepare arguments for ffi_closure_mips_inner_O32
28 REG_L a0, 4($15) # cif
29--
302.21.0
31
diff --git a/meta/recipes-support/libffi/libffi_3.3~rc0.bb b/meta/recipes-support/libffi/libffi_3.3~rc0.bb
index dadde0b2a0..3e2845546e 100644
--- a/meta/recipes-support/libffi/libffi_3.3~rc0.bb
+++ b/meta/recipes-support/libffi/libffi_3.3~rc0.bb
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3610bb17683a0089ed64055416b2ae1b"
12 12
13SRC_URI = "https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz \ 13SRC_URI = "https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz \
14 file://not-win32.patch \ 14 file://not-win32.patch \
15 file://0001-Fixed-missed-ifndef-for-__mips_soft_float.patch \
15 " 16 "
16SRC_URI[md5sum] = "8d2a82a78faf10a5e53c27d986e8f04e" 17SRC_URI[md5sum] = "8d2a82a78faf10a5e53c27d986e8f04e"
17SRC_URI[sha256sum] = "403d67aabf1c05157855ea2b1d9950263fb6316536c8c333f5b9ab1eb2f20ecf" 18SRC_URI[sha256sum] = "403d67aabf1c05157855ea2b1d9950263fb6316536c8c333f5b9ab1eb2f20ecf"