dev-libs/gmp: drop old versions

10 files changed, 0 insertions, 604 deletions

diff --git a/dev-libs/gmp/files/gmp-5.0.0-s390.diff b/dev-libs/gmp/files/gmp-5.0.0-s390.diff
deleted file mode 100644
index 14771a438ede..000000000000
--- a/dev-libs/gmp/files/gmp-5.0.0-s390.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-stolen from SuSE
-
---- configure.in
-+++ configure.in
-@@ -1050,6 +1050,9 @@
-     ;;
- 
- 
-+  s390x-*-*)
-+       path="s390x" ;;
-+
-   # IBM s/370 and similar
-   [s3[6-9]0*-*-*])
-     gcc_cflags="-O2 $fomit_frame_pointer"
---- configure
-+++ configure
-@@ -1050,6 +1050,9 @@
-     ;;
- 
- 
-+  s390x-*-*)
-+       path="s390x" ;;
-+
-   # IBM s/370 and similar
-   s3[6-9]0*-*-*)
-     gcc_cflags="-O2 $fomit_frame_pointer"
---- mpn/s390/gmp-mparam.h
-+++ mpn/s390/gmp-mparam.h
-@@ -20,7 +20,8 @@
- MA 02110-1301, USA. */
- 
- 
--/* GMP_LIMB_BITS etc generated by configure */
-+#define GMP_LIMB_BITS 32
-+#define BYTES_PER_MP_LIMB 4
- 
- 
- /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */
---- mpn/s390x/gmp-mparam.h
-+++ mpn/s390x/gmp-mparam.h
-@@ -0,0 +1,27 @@
-+/* gmp-mparam.h -- Compiler/machine parameter header file.
-+
-+Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc.
-+
-+This file is part of the GNU MP Library.
-+
-+The GNU MP Library is free software; you can redistribute it and/or modify
-+it under the terms of the GNU Library General Public License as published by
-+the Free Software Foundation; either version 2 of the License, or (at your
-+option) any later version.
-+
-+The GNU MP Library is distributed in the hope that it will be useful, but
-+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-+License for more details.
-+
-+You should have received a copy of the GNU Library General Public License
-+along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-+MA 02111-1307, USA. */
-+
-+#define GMP_LIMB_BITS 64
-+#define BYTES_PER_MP_LIMB 8
-+#define BITS_PER_LONGINT 64
-+#define BITS_PER_INT 32
-+#define BITS_PER_SHORTINT 16
-+#define BITS_PER_CHAR 8
diff --git a/dev-libs/gmp/files/gmp-5.0.1-perfpow-test.patch b/dev-libs/gmp/files/gmp-5.0.1-perfpow-test.patch
deleted file mode 100644
index d1b8706082f0..000000000000
--- a/dev-libs/gmp/files/gmp-5.0.1-perfpow-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1267122532 -3600
-# Node ID 794410151f5f966bcb5c3489b6441614990efe7c
-# Parent  948660e2e56d9cfaae035082b8fd473985505fb6
-Fix a test case to work for long long limbs.
-
-2010-02-25  Torbjorn Granlund  <tege@gmplib.org>
-
-	* tests/mpz/t-perfpow.c (check_random): Use mp_limb_t type for limb
-	variables.
-
-diff -r 948660e2e56d -r 794410151f5f tests/mpz/t-perfpow.c
---- a/tests/mpz/t-perfpow.c	Thu Feb 25 16:08:21 2010 +0100
-+++ b/tests/mpz/t-perfpow.c	Thu Feb 25 19:28:52 2010 +0100
-@@ -2,7 +2,7 @@
- 
-    Contributed to the GNU project by Torbjorn Granlund and Martin Boij.
- 
--Copyright 2008, 2009 Free Software Foundation, Inc.
-+Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
- 
- This file is part of the GNU MP Library.
- 
-@@ -109,7 +109,8 @@
- {
-   mpz_t n, np, temp, primes[NRP];
-   int i, j, k, unique, destroy, res;
--  unsigned long int nrprimes, primebits, g, exp[NRP], e;
-+  unsigned long int nrprimes, primebits;
-+  mp_limb_t g, exp[NRP], e;
-   gmp_randstate_ptr rands;
- 
-   rands = RANDS;
-
diff --git a/dev-libs/gmp/files/gmp-5.0.1-x86-nopie-tests.patch b/dev-libs/gmp/files/gmp-5.0.1-x86-nopie-tests.patch
deleted file mode 100644
index e2ec26f4de2c..000000000000
--- a/dev-libs/gmp/files/gmp-5.0.1-x86-nopie-tests.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-2010-07-27	Magnus Granberg	<zorry@gentoo.org>
-
-		#236054
-		tests/Makefile.in	add -nopie to CFLAGS
-		test/misc/Makefile.in	likewise
-		test/mpbsd/Makefile.in	likewise
-		test/mpf/Makefile.in	likewise
-		test/mpn/Makefile.in	likewise
-		test/mpq/Makefile.in	likewise
-		test/mpz/Makefile.in	likewise
-		test/randMakefile.in	likewise
-		test/cxx/Makefile.in		likewise and CXXFLAGS
-
---- a/tests/Makefile.in 2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/Makefile.in 2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/devel/Makefile.in   2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/devel/Makefile.in   2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/misc/Makefile.in    2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/misc/Makefile.in    2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpbsd/Makefile.in   2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpbsd/Makefile.in   2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpf/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpf/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpn/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpn/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpq/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpq/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpz/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpz/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/rand/Makefile.in    2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/rand/Makefile.in    2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/cxx/Makefile.in     2010-02-06 12:43:21.000000000 +0000
-+++ b/tests/cxx/Makefile.in     2010-07-27 01:31:43.000000000 +0000
-@@ -189,13 +189,13 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = @CXXFLAGS@ -nopie
- CYGPATH_W = @CYGPATH_W@
- DEFN_LONG_LONG_LIMB = @DEFN_LONG_LONG_LIMB@
- DEFS = @DEFS@
diff --git a/dev-libs/gmp/files/gmp-5.0.2-unnormalised-dividends.patch b/dev-libs/gmp/files/gmp-5.0.2-unnormalised-dividends.patch
deleted file mode 100644
index f29f2eca1a90..000000000000
--- a/dev-libs/gmp/files/gmp-5.0.2-unnormalised-dividends.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1310730221 -7200
-# Node ID 538dfce27f410b910d5e2f011119269e224d16a3
-# Parent  03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
-(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
-
-diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
---- a/mpn/generic/dcpi1_bdiv_q.c	Thu Jun 16 12:22:24 2011 +0200
-+++ b/mpn/generic/dcpi1_bdiv_q.c	Fri Jul 15 13:43:41 2011 +0200
-@@ -130,7 +129,7 @@
-       qn = nn - qn;
-       while (qn > dn)
- 	{
--	  mpn_sub_1 (np + dn, np + dn, qn, cy);
-+	  mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
- 	  cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
- 	  qp += dn;
- 	  np += dn;
-
diff --git a/dev-libs/gmp/files/gmp-5.0.2-x32-bugfix.patch b/dev-libs/gmp/files/gmp-5.0.2-x32-bugfix.patch
deleted file mode 100644
index a96136fcc3b8..000000000000
--- a/dev-libs/gmp/files/gmp-5.0.2-x32-bugfix.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-UpstreamStatus: Pending
-
-When LONG_MIN is passed to val, -val is undefined.  This patch fixes
-it.  See for details: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50066
-
-Received this patch from H.J. Lu <hjl.tools@gmail.com>
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
-
---- gmp-4.3.2/mpf/iset_si.c.ll	2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpf/iset_si.c	2011-11-30 16:42:35.827944358 -0800
-@@ -31,7 +31,7 @@ mpf_init_set_si (mpf_ptr r, long int val
-   r->_mp_prec = prec;
-   r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB);
- 
--  vl = (mp_limb_t) (unsigned long int) (val >= 0 ? val : -val);
-+  vl = (mp_limb_t) (val >= 0 ? (unsigned long int) val : -(unsigned long int) val);
- 
-   r->_mp_d[0] = vl & GMP_NUMB_MASK;
-   size = vl != 0;
---- gmp-4.3.2/mpf/set_si.c.ll	2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpf/set_si.c	2011-11-30 16:42:47.823878367 -0800
-@@ -27,7 +27,7 @@ mpf_set_si (mpf_ptr dest, long val)
-   mp_size_t size;
-   mp_limb_t vl;
- 
--  vl = (mp_limb_t) (unsigned long int) (val >= 0 ? val : -val);
-+  vl = (mp_limb_t) (val >= 0 ? (unsigned long int) val : -(unsigned long int) val);
- 
-   dest->_mp_d[0] = vl & GMP_NUMB_MASK;
-   size = vl != 0;
---- gmp-4.3.2/mpz/cmp_si.c.ll	2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpz/cmp_si.c	2011-11-30 13:44:25.923319700 -0800
-@@ -27,7 +27,7 @@ _mpz_cmp_si (mpz_srcptr u, signed long i
- {
-   mp_size_t usize = u->_mp_size;
-   mp_size_t vsize;
--  mp_limb_t u_digit;
-+  mp_limb_t u_digit, vl_digit;
- 
- #if GMP_NAIL_BITS != 0
-   /* FIXME.  This isn't very pretty.  */
-@@ -41,11 +41,14 @@ _mpz_cmp_si (mpz_srcptr u, signed long i
- 
-   vsize = 0;
-   if (v_digit > 0)
--    vsize = 1;
-+    {
-+      vsize = 1;
-+      vl_digit = (mp_limb_t) (unsigned long) v_digit;
-+    }
-   else if (v_digit < 0)
-     {
-       vsize = -1;
--      v_digit = -v_digit;
-+      vl_digit = (mp_limb_t) -(unsigned long) v_digit;
-     }
- 
-   if (usize != vsize)
-@@ -56,10 +59,10 @@ _mpz_cmp_si (mpz_srcptr u, signed long i
- 
-   u_digit = u->_mp_d[0];
- 
--  if (u_digit == (mp_limb_t) (unsigned long) v_digit)
-+  if (u_digit == vl_digit)
-     return 0;
- 
--  if (u_digit > (mp_limb_t) (unsigned long) v_digit)
-+  if (u_digit > vl_digit)
-     return usize;
-   else
-     return -usize;
---- gmp-4.3.2/mpz/iset_si.c.ll	2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpz/iset_si.c	2011-11-30 13:44:25.924319695 -0800
-@@ -31,7 +31,7 @@ mpz_init_set_si (mpz_ptr dest, signed lo
-   dest->_mp_alloc = 1;
-   dest->_mp_d = (mp_ptr) (*__gmp_allocate_func) (BYTES_PER_MP_LIMB);
- 
--  vl = (mp_limb_t) (unsigned long int) (val >= 0 ? val : -val);
-+  vl = (mp_limb_t) (val >= 0 ? (unsigned long int) val : -(unsigned long int) val);
- 
-   dest->_mp_d[0] = vl & GMP_NUMB_MASK;
-   size = vl != 0;
---- gmp-4.3.2/mpz/set_si.c.ll	2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpz/set_si.c	2011-11-30 13:44:25.947319574 -0800
-@@ -27,7 +27,7 @@ mpz_set_si (mpz_ptr dest, signed long in
-   mp_size_t size;
-   mp_limb_t vl;
- 
--  vl = (mp_limb_t) (unsigned long int) (val >= 0 ? val : -val);
-+  vl = (mp_limb_t) (val >= 0 ? (unsigned long int) val : -(unsigned long int) val);
- 
-   dest->_mp_d[0] = vl & GMP_NUMB_MASK;
-   size = vl != 0;
diff --git a/dev-libs/gmp/files/gmp-5.0.2-x32-support.patch b/dev-libs/gmp/files/gmp-5.0.2-x32-support.patch
deleted file mode 100644
index 28efee0a5eed..000000000000
--- a/dev-libs/gmp/files/gmp-5.0.2-x32-support.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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-4.3.2/configure
-+++ gmp-4.3.2/configure
-@@ -1499,6 +1499,21 @@
- 	    path_64="x86_64/atom x86_64"
- 	    ;;
- 	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
- 	;;
-     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/files/gmp-5.0.5-x32-support.patch b/dev-libs/gmp/files/gmp-5.0.5-x32-support.patch
deleted file mode 100644
index b6867bf03abe..000000000000
--- a/dev-libs/gmp/files/gmp-5.0.5-x32-support.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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/files/gmp-5.1.0-armv4.patch b/dev-libs/gmp/files/gmp-5.1.0-armv4.patch
deleted file mode 100644
index 0337bd364968..000000000000
--- a/dev-libs/gmp/files/gmp-5.1.0-armv4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-fix missing __gmpn_invert_limb symbols w/armv4 targets
-
---- a/configure
-+++ b/configure
-@@ -582,6 +582,7 @@ case $host in
-     # options fail.
-     case $host_cpu in
-       armsa1 | armv4*)
-+	path="arm"
- 	;;
-       armxscale | arm9te | arm10 | armv5*)
- 	path="arm/v5 arm"
diff --git a/dev-libs/gmp/files/gmp-5.1.0-x32-support.patch b/dev-libs/gmp/files/gmp-5.1.0-x32-support.patch
deleted file mode 100644
index fda361d9b294..000000000000
--- a/dev-libs/gmp/files/gmp-5.1.0-x32-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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.1.0/configure
-+++ gmp-5.1.0/configure
-@@ -5237,6 +5237,22 @@ echo "include_mpn(\`vax/elf.m4')" >> $gmp_tmpconfigm4i
- 	    extra_functions_64="invert_limb_table"
- 	fi
- 
-+	# 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=$CALLING_CONVENTIONS_OBJS_64
-+		SPEED_CYCLECOUNTER_OBJ_x32=$SPEED_CYCLECOUNTER_OBJ_64
-+		cyclecounter_size_x32=$cyclecounter_size_64
-+		extra_functions_x32=$extra_functions_64
-+	    ;;
-+	esac
-+
- 	case $host in
- 	  *-*-solaris*)
- 	    # Sun cc.
-@@ -28611,7 +28627,7 @@ echo "include_mpn(\`x86/darwin.m4')" >> $gmp_tmpconfigm4i
-  ;;
- 	  esac
-           ;;
--        64)
-+        64|x32)
- 
- echo "include_mpn(\`x86_64/x86_64-defs.m4')" >> $gmp_tmpconfigm4i
- 
diff --git a/dev-libs/gmp/files/gmp-5.1.0-x86-nopie-tests.patch b/dev-libs/gmp/files/gmp-5.1.0-x86-nopie-tests.patch
deleted file mode 100644
index f21479f91110..000000000000
--- a/dev-libs/gmp/files/gmp-5.1.0-x86-nopie-tests.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-2010-07-27	Magnus Granberg	<zorry@gentoo.org>
-
-		#236054
-		tests/Makefile.in	add -nopie to CFLAGS
-		test/misc/Makefile.in	likewise
-		test/mpbsd/Makefile.in	likewise
-		test/mpf/Makefile.in	likewise
-		test/mpn/Makefile.in	likewise
-		test/mpq/Makefile.in	likewise
-		test/mpz/Makefile.in	likewise
-		test/randMakefile.in	likewise
-		test/cxx/Makefile.in		likewise and CXXFLAGS
-
---- a/tests/Makefile.in 2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/Makefile.in 2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/devel/Makefile.in   2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/devel/Makefile.in   2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/misc/Makefile.in    2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/misc/Makefile.in    2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpf/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpf/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpn/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpn/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpq/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpq/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpz/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpz/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/rand/Makefile.in    2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/rand/Makefile.in    2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/cxx/Makefile.in     2010-02-06 12:43:21.000000000 +0000
-+++ b/tests/cxx/Makefile.in     2010-07-27 01:31:43.000000000 +0000
-@@ -189,13 +189,13 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = @CXXFLAGS@ -nopie
- CYGPATH_W = @CYGPATH_W@
- DEFN_LONG_LONG_LIMB = @DEFN_LONG_LONG_LIMB@
- DEFS = @DEFS@