summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorJianchuan Wang <jianchuan.wang@windriver.com>2014-10-17 09:51:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-24 17:36:15 +0100
commitcaebcda4126b690784389e53113ffc3169447ae6 (patch)
treec3cddc006f33685c06556e517ff89c1aabd2911a /meta/recipes-extended
parentc908f5e257ec753a015e253a079a8ebf7e13d09a (diff)
downloadpoky-caebcda4126b690784389e53113ffc3169447ae6.tar.gz
libaio: fix for mips64
Add mips64 support in the libaio.h - add macro PADDED/PADDEDptr/PADDEDul in the mips64 for structure iocb to be matched userland with kernel (From OE-Core rev: ce0a999efe5c9bfd4780bd2b7c24e99f580474c0) Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/libaio/libaio/libaio_fix_for_mips64.patch42
-rw-r--r--meta/recipes-extended/libaio/libaio_0.3.109.bb1
2 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-extended/libaio/libaio/libaio_fix_for_mips64.patch b/meta/recipes-extended/libaio/libaio/libaio_fix_for_mips64.patch
new file mode 100644
index 0000000000..0ef9f147be
--- /dev/null
+++ b/meta/recipes-extended/libaio/libaio/libaio_fix_for_mips64.patch
@@ -0,0 +1,42 @@
1From 62fd97fbc5c53835baa18f210fca593fc8b5c636 Mon Sep 17 00:00:00 2001
2From: Jianchuan Wang <jianchuan.wang@windriver.com>
3Date: Wed, 15 Oct 2014 07:04:02 +0800
4Subject: [PATCH] libaio: fix for mips64
5
6Add mips64 support in the libaio.h
7 - add macro PADDED/PADDEDptr/PADDEDul in the mips64 for structure iocb
8 to be matched userland with kernel
9
10Upstream-Status: Backport
11
12Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
13---
14 src/libaio.h | 12 ++++++++++++
15 1 file changed, 12 insertions(+)
16
17diff --git a/src/libaio.h b/src/libaio.h
18index ff99188..64ea8f3 100644
19--- a/src/libaio.h
20+++ b/src/libaio.h
21@@ -95,6 +95,18 @@ typedef enum io_iocb_cmd {
22 #define PADDED(x, y) unsigned y; x
23 #define PADDEDptr(x, y) unsigned y; x
24 #define PADDEDul(x, y) unsigned y; unsigned long x
25+#elif defined(__mips64)
26+# if defined (__MIPSEB__) /* big endian, 64 bits */
27+#define PADDED(x, y) unsigned y; x
28+#define PADDEDptr(x,y) x
29+#define PADDEDul(x, y) unsigned long x
30+# elif defined(__MIPSEL__) /* little endian, 64 bits */
31+#define PADDED(x, y) x, y
32+#define PADDEDptr(x, y) x
33+#define PADDEDul(x, y) unsigned long x
34+# else
35+# error "mips64: neither mipseb nor mipsel?"
36+# endif
37 #elif defined(__mips__)
38 # if defined (__MIPSEB__) /* big endian, 32 bits */
39 #define PADDED(x, y) unsigned y; x
40--
411.8.2.1
42
diff --git a/meta/recipes-extended/libaio/libaio_0.3.109.bb b/meta/recipes-extended/libaio/libaio_0.3.109.bb
index 978f5f5fb5..0483c711b9 100644
--- a/meta/recipes-extended/libaio/libaio_0.3.109.bb
+++ b/meta/recipes-extended/libaio/libaio_0.3.109.bb
@@ -15,6 +15,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/liba/libaio/libaio_${PV}.orig.tar.gz \
15 file://libaio-generic.patch \ 15 file://libaio-generic.patch \
16 file://libaio-aarch64.patch \ 16 file://libaio-aarch64.patch \
17 file://libaio_fix_for_mips_syscalls.patch \ 17 file://libaio_fix_for_mips_syscalls.patch \
18 file://libaio_fix_for_mips64.patch \
18" 19"
19 20
20SRC_URI[md5sum] = "435a5b16ca6198eaf01155263d855756" 21SRC_URI[md5sum] = "435a5b16ca6198eaf01155263d855756"