summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-05-10 13:58:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-21 09:59:04 +0100
commit0d2b369053a45ab248dcc7c49b7a9425eecaca57 (patch)
treea5cba50693fa608dec3fa6fee3f2cab6e8c2ef2c
parent21d5cf88e58ca849faa7abf12f8ec35ceee96ecf (diff)
downloadpoky-0d2b369053a45ab248dcc7c49b7a9425eecaca57.tar.gz
xserver-xorg: Fix build for mips64
mips64 N64 ABI has different size for int and pointer which means the compiler will complain about conversions which works fine for 32 bit since sizes are same. amd64 is taken care of already so we take care of mips64 with this patch by understanding the difference in sizes in compiler.h (From OE-Core rev: de21917ba83f104a2d53941f40a9b2b8d35dce49) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc1
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch29
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index fc41568a5f..595ab77278 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -2,6 +2,7 @@
2SRC_URI += "file://crosscompile.patch \ 2SRC_URI += "file://crosscompile.patch \
3 file://fix_open_max_preprocessor_error.patch \ 3 file://fix_open_max_preprocessor_error.patch \
4 file://gcc-47-warning.patch \ 4 file://gcc-47-warning.patch \
5 file://mips64-compiler.patch \
5 " 6 "
6 7
7SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" 8SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch
new file mode 100644
index 0000000000..e6bc95b449
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch
@@ -0,0 +1,29 @@
1on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well
2so we end up with incompatible conversion errors
3
4This patch choses the right values for mips64
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending
9Index: xorg-server-1.11.2/hw/xfree86/common/compiler.h
10===================================================================
11--- xorg-server-1.11.2.orig/hw/xfree86/common/compiler.h 2012-05-10 12:19:59.485599046 -0700
12+++ xorg-server-1.11.2/hw/xfree86/common/compiler.h 2012-05-10 12:20:53.109602488 -0700
13@@ -104,6 +104,7 @@
14
15 # if !defined(__arm__)
16 # if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
17+ && !defined(__mips64) \
18 && !(defined(__alpha__) && defined(linux)) \
19 && !(defined(__ia64__) && defined(linux)) \
20
21@@ -708,7 +709,7 @@
22 }
23
24 # elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
25-# ifdef __arm32__
26+# if defined (__arm32__) || defined (__mips64)
27 # define PORT_SIZE long
28 # else
29 # define PORT_SIZE short