summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
new file mode 100644
index 0000000..ed4eaac
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
@@ -0,0 +1,33 @@
1This patch fixes errors on powerpc like below
2
3| lnx_video.c: In function 'unmapVidMem':
4| lnx_video.c:472:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
5
6Its in 1.12 branch
7
8http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.12-branch&id=eb3377ffb8a7baa26c9831e56ed782d48b28fa71
9
10Upstream-Status: Backport
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14Index: xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
15===================================================================
16--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:32:34.186489019 -0700
17+++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:49:14.926537452 -0700
18@@ -469,11 +469,11 @@
19 static void
20 unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
21 {
22- memType alignOff = (memType)Base
23- - ((memType)Base & ~(getpagesize() - 1));
24+ uintptr_t alignOff = (uintptr_t)Base
25+ - ((uintptr_t)Base & ~(getpagesize() - 1));
26
27- DebugF("alignment offset: %lx\n",alignOff);
28- munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
29+ DebugF("alignment offset: %lx\n",(unsigned long)alignOff);
30+ munmap((void*)((uintptr_t)Base - alignOff), (Size + alignOff));
31 }
32
33