From bdb20fedfed12afd0db14c2559db734b376270fa Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 22 May 2012 23:12:49 +0000
Subject: Redo x32 patch for newer versions.

(Portage version: 2.2.0_alpha102/cvs/Linux x86_64)
---
 dev-libs/gmp/ChangeLog                         |  6 +++-
 dev-libs/gmp/files/gmp-5.0.5-x32-support.patch | 41 ++++++++++++++++++++++++++
 dev-libs/gmp/gmp-5.0.5.ebuild                  |  4 +--
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 dev-libs/gmp/files/gmp-5.0.5-x32-support.patch

(limited to 'dev-libs/gmp')

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index b6137d195e70..5b249b741629 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gmp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.168 2012/05/06 18:16:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.169 2012/05/22 23:12:49 vapier Exp $
+
+  22 May 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/gmp-5.0.5-x32-support.patch, gmp-5.0.5.ebuild:
+  Redo x32 patch for newer versions.
 
 *gmp-5.0.5 (06 May 2012)
 
diff --git a/dev-libs/gmp/files/gmp-5.0.5-x32-support.patch b/dev-libs/gmp/files/gmp-5.0.5-x32-support.patch
new file mode 100644
index 000000000000..b6867bf03abe
--- /dev/null
+++ b/dev-libs/gmp/files/gmp-5.0.5-x32-support.patch
@@ -0,0 +1,41 @@
+Upstream-Status: Pending
+
+Add X32 support in gmp configure.
+
+Patch Originator: H J Lu @ Intel
+Patch modified for Yocto by Nitin Kamble
+Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
+
+--- gmp-5.0.5/configure
++++ gmp-5.0.5/configure
+@@ -5189,6 +5189,21 @@
+ 	esac
+ 	;;
+     esac
++
++	# X32 support.
++	case x"$path_64" in
++	  xx86_64*)
++		abilist="x32 64 32"
++		path_x32="$path_64"
++		limb_x32=longlong
++		cclist_x32="gcc"
++		gcc_x32_cflags="-O2 -mx32"
++		any_x32_testlist="sizeof-long-4"
++		CALLING_CONVENTIONS_OBJS_x32='amd64call.lo amd64check$U.lo'
++		SPEED_CYCLECOUNTER_OBJ_x32=x86_64.lo
++		cyclecounter_size_x32=2
++	    ;;
++	esac
+     ;;
+ 
+ 
+@@ -3039,7 +3058,7 @@
+  ;;
+ 	  esac
+           ;;
+-        64)
++        64|x32)
+ 
+ echo "include_mpn(\`x86_64/x86_64-defs.m4')" >> $gmp_tmpconfigm4i
+ 
diff --git a/dev-libs/gmp/gmp-5.0.5.ebuild b/dev-libs/gmp/gmp-5.0.5.ebuild
index 12f8f9d632fa..fc8421522b9b 100644
--- a/dev-libs/gmp/gmp-5.0.5.ebuild
+++ b/dev-libs/gmp/gmp-5.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.5.ebuild,v 1.1 2012/05/06 18:16:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.5.ebuild,v 1.2 2012/05/22 23:12:49 vapier Exp $
 
 inherit flag-o-matic eutils libtool unpacker toolchain-funcs
 
@@ -28,7 +28,7 @@ src_unpack() {
 	cd "${S}"
 	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
 	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${PN}-5.0.2-x32-support.patch
+	epatch "${FILESDIR}"/${PN}-5.0.5-x32-support.patch
 
 	# disable -fPIE -pie in the tests for x86  #236054
 	if use x86 && gcc-specs-pie ; then
-- 
cgit v1.2.3-65-gdbad