All of lore.kernel.org
 help / color / mirror / Atom feed
From: nitin.a.kamble@intel.com
To: hjl.tools@gmail.com, openembedded-core@lists.openembedded.org
Subject: [PATCH 09/11] xproto: fix compilation with x32 toolchain
Date: Fri,  2 Dec 2011 12:20:07 -0800	[thread overview]
Message-ID: <f55ff8cd65d3996c448705253aea7954dc946f7b.1322856805.git.nitin.a.kamble@intel.com> (raw)
In-Reply-To: <a92d45d71d2d4aec2774e8feb23fcfdffaa8b2bc.1322856805.git.nitin.a.kamble@intel.com>
In-Reply-To: <cover.1322856805.git.nitin.a.kamble@intel.com>

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Don't always define LONG64 for AMD64

X32 defines __amd64__/amd64 with 32bit long.  We should simply check
__LP64__ before defining LONG64 without checking __amd64__/amd64.

This fixes compilation with x32 toolchain.

Signed-Off-By: H.J. Lu <hjl.tools@gmail.com>
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1
---
 .../xorg-proto/xproto/xproto_fix_for_x32.patch     |   22 ++++++++++++++++++++
 meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb  |    4 ++-
 2 files changed, 25 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch

diff --git a/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch b/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
new file mode 100644
index 0000000..c9fbb6f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
@@ -0,0 +1,22 @@
+UpstreamStatus: Pending
+
+Don't always define LONG64 for AMD64
+    
+X32 defines __amd64__/amd64 with 32bit long.  We should simply check
+__LP64__ before defining LONG64 without checking __amd64__/amd64.
+
+This fixes compilation with x32 toolchain.
+
+Received this patch from H.J. Lu <hjl.tools@gmail.com>
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1
+
+--- xproto-7.0.22/Xmd.h.x32	2009-07-11 04:19:50.000000000 -0700
++++ xproto-7.0.22/Xmd.h	2011-11-30 17:14:19.290395893 -0800
+@@ -62,7 +62,6 @@ SOFTWARE.
+      defined(__ia64__) || defined(ia64) || \
+      defined(__sparc64__) || \
+      defined(__s390x__) || \
+-     defined(__amd64__) || defined(amd64) || \
+      defined(__powerpc64__)
+ #  define LONG64				/* 32/64-bit architecture */
+ # endif
diff --git a/meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb b/meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb
index 54f8482..8f76314 100644
--- a/meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb
+++ b/meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb
@@ -8,9 +8,11 @@ System."
 LICENSE = "MIT & MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b9e051107d5628966739a0b2e9b32676"
 
-PR = "r0"
+PR = "r1"
 PE = "1"
 
+SRC_URI += "file://xproto_fix_for_x32.patch"
+
 EXTRA_OECONF_append = " --enable-specs=no"
 BBCLASSEXTEND = "native nativesdk"
 
-- 
1.7.6.4




  parent reply	other threads:[~2011-12-02 20:26 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-02 20:19 [PATCH 00/11] recipe fixes for x32 toolchain nitin.a.kamble
2011-12-02 20:19 ` [PATCH 01/11] gst-fluendo-mpegdemux: rework the CC hack nitin.a.kamble
2011-12-03 17:53   ` Khem Raj
2011-12-05 16:59     ` Kamble, Nitin A
2011-12-02 20:20 ` [PATCH 02/11] mdadm: fix CC definition in the Makefile nitin.a.kamble
2011-12-03 18:08   ` Paul Menzel
2011-12-05 16:58     ` Kamble, Nitin A
2011-12-02 20:20 ` [PATCH 03/11] openssl-1.0.0e: fix to wotk with x32 toolchain nitin.a.kamble
2011-12-02 20:20 ` [PATCH 04/11] gmp: fix the recipe for x32 target nitin.a.kamble
2011-12-02 20:20 ` [PATCH 05/11] mesa-dri, mesa-xlib: fix compilation with x32 toolchain nitin.a.kamble
2011-12-02 20:20 ` [PATCH 06/11] glib-2.0: fix compilatoin " nitin.a.kamble
2011-12-02 20:20 ` [PATCH 07/11] libxt: " nitin.a.kamble
2011-12-02 20:20 ` [PATCH 08/11] liboil: patch source code for x32 nitin.a.kamble
2011-12-02 20:20 ` nitin.a.kamble [this message]
2011-12-02 20:20 ` [PATCH 10/11] libaio: " nitin.a.kamble
2011-12-02 20:20 ` [PATCH 11/11] libatomics-ops: " nitin.a.kamble
2011-12-05 22:47 ` [PATCH 00/11] recipe fixes for x32 toolchain Richard Purdie

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=f55ff8cd65d3996c448705253aea7954dc946f7b.1322856805.git.nitin.a.kamble@intel.com \
    --to=nitin.a.kamble@intel.com \
    --cc=hjl.tools@gmail.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.