Patchwork [3/3] xserver-xorg: Fix build on powerpc

login
register
mail settings
Submitter Khem Raj
Date May 9, 2012, 12:27 a.m.
Message ID <096c4f3ac2f83fc08064afcec5a05824bb96b94e.1336522880.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/27327/
State New
Headers show

Comments

Khem Raj - May 9, 2012, 12:27 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../xorg-xserver/xserver-xorg-1.11.2.inc           |    9 +++--
 .../xserver-xorg-1.11.2/gcc-47-warning.patch       |   33 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
Saul Wold - May 16, 2012, 6:22 p.m.
On 05/09/2012 03:27 AM, Khem Raj wrote:
> Signed-off-by: Khem Raj<raj.khem@gmail.com>
> ---
>   .../xorg-xserver/xserver-xorg-1.11.2.inc           |    9 +++--
>   .../xserver-xorg-1.11.2/gcc-47-warning.patch       |   33 ++++++++++++++++++++
>   2 files changed, 38 insertions(+), 4 deletions(-)
>   create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
>
> 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 f5fa629..6a86af4 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
> @@ -1,10 +1,11 @@
> -SRC_URI += "file://crosscompile.patch"
> -
>   # Misc build failure for master HEAD
> -SRC_URI += "file://fix_open_max_preprocessor_error.patch"
> +SRC_URI += "file://crosscompile.patch \
> +            file://fix_open_max_preprocessor_error.patch \
> +            file://gcc-47-warning.patch \
> +           "
>
>   SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
>   SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
>
> -PR = "r1"
> +PR = "r2"
>
> 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 @@
> +This patch fixes errors on powerpc like below
> +
> +| lnx_video.c: In function 'unmapVidMem':
> +| lnx_video.c:472:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
> +
> +Its in 1.12 branch
> +
> +http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.12-branch&id=eb3377ffb8a7baa26c9831e56ed782d48b28fa71
> +
> +Upstream-Status: Backport
> +
> +Signed-off-by: Khem Raj<raj.khem@gmail.com>
> +
> +Index: xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
> +===================================================================
> +--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c	2012-05-01 06:32:34.186489019 -0700
> ++++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c	2012-05-01 06:49:14.926537452 -0700
> +@@ -469,11 +469,11 @@
> + static void
> + unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
> + {
> +-    memType alignOff = (memType)Base
> +-	- ((memType)Base&  ~(getpagesize() - 1));
> ++    uintptr_t alignOff = (uintptr_t)Base
> ++	- ((uintptr_t)Base&  ~(getpagesize() - 1));
> +
> +-    DebugF("alignment offset: %lx\n",alignOff);
> +-    munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
> ++    DebugF("alignment offset: %lx\n",(unsigned long)alignOff);
> ++    munmap((void*)((uintptr_t)Base - alignOff), (Size + alignOff));
> + }
> +
> +


Merged into OE-Core

Thanks
	Sau!
McClintock Matthew-B29882 - July 6, 2012, 3:58 p.m.
Scott,

Can you apply this patch to denzil branch of oe-core/poky? It fixes
build errors for powerpc on gcc 4.6.4 as well.

-M

On Tue, May 8, 2012 at 7:27 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../xorg-xserver/xserver-xorg-1.11.2.inc           |    9 +++--
>  .../xserver-xorg-1.11.2/gcc-47-warning.patch       |   33 ++++++++++++++++++++
>  2 files changed, 38 insertions(+), 4 deletions(-)
>  create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
>
> 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 f5fa629..6a86af4 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
> @@ -1,10 +1,11 @@
> -SRC_URI += "file://crosscompile.patch"
> -
>  # Misc build failure for master HEAD
> -SRC_URI += "file://fix_open_max_preprocessor_error.patch"
> +SRC_URI += "file://crosscompile.patch \
> +            file://fix_open_max_preprocessor_error.patch \
> +            file://gcc-47-warning.patch \
> +           "
>
>  SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
>  SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
>
> -PR = "r1"
> +PR = "r2"
>
> 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 @@
> +This patch fixes errors on powerpc like below
> +
> +| lnx_video.c: In function 'unmapVidMem':
> +| lnx_video.c:472:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
> +
> +Its in 1.12 branch
> +
> +http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.12-branch&id=eb3377ffb8a7baa26c9831e56ed782d48b28fa71
> +
> +Upstream-Status: Backport
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +
> +Index: xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
> +===================================================================
> +--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c    2012-05-01 06:32:34.186489019 -0700
> ++++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:49:14.926537452 -0700
> +@@ -469,11 +469,11 @@
> + static void
> + unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
> + {
> +-    memType alignOff = (memType)Base
> +-      - ((memType)Base & ~(getpagesize() - 1));
> ++    uintptr_t alignOff = (uintptr_t)Base
> ++      - ((uintptr_t)Base & ~(getpagesize() - 1));
> +
> +-    DebugF("alignment offset: %lx\n",alignOff);
> +-    munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
> ++    DebugF("alignment offset: %lx\n",(unsigned long)alignOff);
> ++    munmap((void*)((uintptr_t)Base - alignOff), (Size + alignOff));
> + }
> +
> +
> --
> 1.7.5.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Scott Garman - July 9, 2012, 8:14 p.m.
On 07/06/2012 08:58 AM, McClintock Matthew-B29882 wrote:
> Scott,
>
> Can you apply this patch to denzil branch of oe-core/poky? It fixes
> build errors for powerpc on gcc 4.6.4 as well.
>
> -M

Hi Matthew,

I've made a note of this and am going to try getting it into my 
sgarman/denzil-next-1.2.2 branch later today, after I sort out the merge 
issues I encountered last week with some other commits I'd like to include.

Scott

>
> On Tue, May 8, 2012 at 7:27 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>   .../xorg-xserver/xserver-xorg-1.11.2.inc           |    9 +++--
>>   .../xserver-xorg-1.11.2/gcc-47-warning.patch       |   33 ++++++++++++++++++++
>>   2 files changed, 38 insertions(+), 4 deletions(-)
>>   create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
>>
>> 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 f5fa629..6a86af4 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
>> @@ -1,10 +1,11 @@
>> -SRC_URI += "file://crosscompile.patch"
>> -
>>   # Misc build failure for master HEAD
>> -SRC_URI += "file://fix_open_max_preprocessor_error.patch"
>> +SRC_URI += "file://crosscompile.patch \
>> +            file://fix_open_max_preprocessor_error.patch \
>> +            file://gcc-47-warning.patch \
>> +           "
>>
>>   SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
>>   SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
>>
>> -PR = "r1"
>> +PR = "r2"
>>
>> 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 @@
>> +This patch fixes errors on powerpc like below
>> +
>> +| lnx_video.c: In function 'unmapVidMem':
>> +| lnx_video.c:472:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
>> +
>> +Its in 1.12 branch
>> +
>> +http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.12-branch&id=eb3377ffb8a7baa26c9831e56ed782d48b28fa71
>> +
>> +Upstream-Status: Backport
>> +
>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> +
>> +Index: xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
>> +===================================================================
>> +--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c    2012-05-01 06:32:34.186489019 -0700
>> ++++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:49:14.926537452 -0700
>> +@@ -469,11 +469,11 @@
>> + static void
>> + unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
>> + {
>> +-    memType alignOff = (memType)Base
>> +-      - ((memType)Base & ~(getpagesize() - 1));
>> ++    uintptr_t alignOff = (uintptr_t)Base
>> ++      - ((uintptr_t)Base & ~(getpagesize() - 1));
>> +
>> +-    DebugF("alignment offset: %lx\n",alignOff);
>> +-    munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
>> ++    DebugF("alignment offset: %lx\n",(unsigned long)alignOff);
>> ++    munmap((void*)((uintptr_t)Base - alignOff), (Size + alignOff));
>> + }
>> +
>> +
>> --
>> 1.7.5.4
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

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 f5fa629..6a86af4 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
@@ -1,10 +1,11 @@ 
-SRC_URI += "file://crosscompile.patch"
-
 # Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch"
+SRC_URI += "file://crosscompile.patch \
+            file://fix_open_max_preprocessor_error.patch \
+            file://gcc-47-warning.patch \
+           "
 
 SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
 SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
 
-PR = "r1"
+PR = "r2"
 
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 @@ 
+This patch fixes errors on powerpc like below
+
+| lnx_video.c: In function 'unmapVidMem':
+| lnx_video.c:472:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
+
+Its in 1.12 branch 
+
+http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.12-branch&id=eb3377ffb8a7baa26c9831e56ed782d48b28fa71
+
+Upstream-Status: Backport
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
+===================================================================
+--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c	2012-05-01 06:32:34.186489019 -0700
++++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c	2012-05-01 06:49:14.926537452 -0700
+@@ -469,11 +469,11 @@
+ static void
+ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+ {
+-    memType alignOff = (memType)Base 
+-	- ((memType)Base & ~(getpagesize() - 1));
++    uintptr_t alignOff = (uintptr_t)Base 
++	- ((uintptr_t)Base & ~(getpagesize() - 1));
+ 
+-    DebugF("alignment offset: %lx\n",alignOff);
+-    munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
++    DebugF("alignment offset: %lx\n",(unsigned long)alignOff);
++    munmap((void*)((uintptr_t)Base - alignOff), (Size + alignOff));
+ }
+ 
+