From: Scott Garman <scott.a.garman@intel.com>
To: McClintock Matthew-B29882 <B29882@freescale.com>,
Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 3/3] xserver-xorg: Fix build on powerpc
Date: Mon, 09 Jul 2012 13:14:48 -0700 [thread overview]
Message-ID: <4FFB3BB8.8020308@intel.com> (raw)
In-Reply-To: <CAEsOVNfdHeAzs3ULW0UkMYCEjOptzSeBNYA=Bva9bJmEkVPp4g@mail.gmail.com>
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
>
--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
prev parent reply other threads:[~2012-07-09 20:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-09 0:27 [PATCH V2 0/3] Enable xserver-xorg for all qemumachines Khem Raj
2012-05-09 0:27 ` [PATCH 1/3] qemumachines: Enable xserver-xorg as default xserver Khem Raj
2012-05-09 0:27 ` [PATCH 2/3] xserver-xf86-config: Add xorg.conf for arm, mips, ppc, sh qemu machines Khem Raj
2012-05-09 0:27 ` [PATCH 3/3] xserver-xorg: Fix build on powerpc Khem Raj
2012-05-16 18:22 ` Saul Wold
2012-07-06 15:58 ` McClintock Matthew-B29882
2012-07-09 20:14 ` Scott Garman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FFB3BB8.8020308@intel.com \
--to=scott.a.garman@intel.com \
--cc=B29882@freescale.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.