diff options
Diffstat (limited to 'dev-libs/gmp/files')
| -rw-r--r-- | dev-libs/gmp/files/4.2.2/mpf_set_str.c.diff | 38 | ||||
| -rw-r--r-- | dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch | 20 | ||||
| -rw-r--r-- | dev-libs/gmp/files/gmp-4.2.1-s390.diff | 68 | ||||
| -rw-r--r-- | dev-libs/gmp/files/gmp-4.2.2-ABI-multilib.patch | 262 | ||||
| -rw-r--r-- | dev-libs/gmp/files/gmp-4.2.2-cstdio-stdfile.patch | 14 | ||||
| -rw-r--r-- | dev-libs/gmp/files/gmp-4.2.3-ABI-multilib.patch | 262 | ||||
| -rw-r--r-- | dev-libs/gmp/files/gmp-gcc4.4-mips.patch | 57 |
7 files changed, 0 insertions, 721 deletions
diff --git a/dev-libs/gmp/files/4.2.2/mpf_set_str.c.diff b/dev-libs/gmp/files/4.2.2/mpf_set_str.c.diff deleted file mode 100644 index 9ea58b9..0000000 --- a/dev-libs/gmp/files/4.2.2/mpf_set_str.c.diff +++ /dev/null @@ -1,38 +0,0 @@ -*** mpf/set_str.c 30 Aug 2007 18:19:41 -0000 ---- mpf/set_str.c 10 Dec 2007 04:47:18 -0000 -*************** mpf_set_str (mpf_ptr x, const char *str, -*** 272,277 **** - - if (expptr != 0) -! /* FIXME: Should do some error checking here. */ -! exp_in_base = strtol (expptr, (char **) 0, exp_base); - else - exp_in_base = 0; ---- 272,298 ---- - - if (expptr != 0) -! { -! /* Scan and convert the exponent, in base exp_base. */ -! long dig, neg = -(long) ('-' == expptr[0]); -! expptr -= neg; /* conditional increment */ -! c = (unsigned char) *expptr++; -! dig = digit_value[c]; -! if (dig >= exp_base) -! { -! TMP_FREE; -! return -1; -! } -! exp_in_base = dig; -! c = (unsigned char) *expptr++; -! dig = digit_value[c]; -! while (dig < exp_base) -! { -! exp_in_base = exp_in_base * exp_base; -! exp_in_base += dig; -! c = (unsigned char) *expptr++; -! dig = digit_value[c]; -! } -! exp_in_base = (exp_in_base ^ neg) - neg; /* conditional negation */ -! } - else - exp_in_base = 0; diff --git a/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch b/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch deleted file mode 100644 index 093bec1..0000000 --- a/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch +++ /dev/null @@ -1,20 +0,0 @@ -fixed executable stack - -http://bugs.gentoo.org/115038 - ---- gmp-4.1.4/configure -+++ gmp-4.1.4/configure -@@ -21689,6 +21689,13 @@ - fi - echo "')" >> $gmp_configm4 - echo "define(\`__CONFIG_M4_INCLUDED__')" >> $gmp_configm4 -+# Gentoo hack -+case $host_os in -+ *linux*) -+ echo '.section .note.GNU-stack,"",%progbits' >> $gmp_configm4 -+ echo '.previous' >> $gmp_configm4 -+ ;; -+esac - - # Create Makefiles - # FIXME: Upcoming version of autoconf/automake may not like broken lines. diff --git a/dev-libs/gmp/files/gmp-4.2.1-s390.diff b/dev-libs/gmp/files/gmp-4.2.1-s390.diff deleted file mode 100644 index 82dbb72..0000000 --- a/dev-libs/gmp/files/gmp-4.2.1-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. */ - - --/* BITS_PER_MP_LIMB etc generated by configure */ -+#define BITS_PER_MP_LIMB 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 BITS_PER_MP_LIMB 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-4.2.2-ABI-multilib.patch b/dev-libs/gmp/files/gmp-4.2.2-ABI-multilib.patch deleted file mode 100644 index efded7b..0000000 --- a/dev-libs/gmp/files/gmp-4.2.2-ABI-multilib.patch +++ /dev/null @@ -1,262 +0,0 @@ -Gentoo uses ABI env var already - ---- gmp-4.2.1/configure -+++ gmp-4.2.1/configure -@@ -489,7 +489,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS ABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR AR ac_ct_AR LIBGMP_DLL SED LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS GMPABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR AR ac_ct_AR LIBGMP_DLL SED LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -930,10 +930,10 @@ - ac_env_target_alias_value=$target_alias - ac_cv_env_target_alias_set=${target_alias+set} - ac_cv_env_target_alias_value=$target_alias --ac_env_ABI_set=${ABI+set} --ac_env_ABI_value=$ABI --ac_cv_env_ABI_set=${ABI+set} --ac_cv_env_ABI_value=$ABI -+ac_env_GMPABI_set=${GMPABI+set} -+ac_env_GMPABI_value=$GMPABI -+ac_cv_env_GMPABI_set=${GMPABI+set} -+ac_cv_env_GMPABI_value=$GMPABI - ac_env_CC_set=${CC+set} - ac_env_CC_value=$CC - ac_cv_env_CC_set=${CC+set} -@@ -1091,7 +1091,7 @@ - include additional configurations [automatic] - - Some influential environment variables: -- ABI desired ABI (for processors supporting more than one ABI) -+ GMPABI desired ABI (for processors supporting more than one ABI) - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a -@@ -2670,7 +2670,7 @@ - # (64-bit), but not both, so there's no option to choose the desired - # mode, we must instead detect which of the two it is. This is done by - # checking sizeof(long), either 4 or 8 bytes respectively. Do this in -- # ABI=1.0 too, in case someone tries to build that with a 2.0w gcc. -+ # GMPABI=1.0 too, in case someone tries to build that with a 2.0w gcc. - # - gcc_cflags="-O2" - gcc_cflags_optlist="arch" -@@ -2694,11 +2694,11 @@ - # gcc 2.7.2.3 knows -mpa-risc-1-0 and -mpa-risc-1-1 - # gcc 2.95 adds -mpa-risc-2-0, plus synonyms -march=1.0, 1.1 and 2.0 - # -- # We don't use -mpa-risc-2-0 in ABI=1.0 because 64-bit registers may not -+ # We don't use -mpa-risc-2-0 in GMPABI=1.0 because 64-bit registers may not - # be saved by the kernel on an old system. Actually gcc (as of 3.2) - # only adds a few float instructions with -mpa-risc-2-0, so it would - # probably be safe, but let's not take the chance. In any case, a -- # configuration like --host=hppa2.0 ABI=1.0 is far from optimal. -+ # configuration like --host=hppa2.0 GMPABI=1.0 is far from optimal. - # - case $host_cpu in - hppa1.0*) gcc_cflags_arch="-mpa-risc-1-0" ;; -@@ -2733,9 +2733,9 @@ - cc_20n_cflags="+DA2.0 +e +O2 -Wl,+vnocompatwarnings" - cc_20n_testlist="hpc-hppa-2-0" - -- # ABI=2.0w is available for hppa2.0w and hppa2.0, but not for -+ # GMPABI=2.0w is available for hppa2.0w and hppa2.0, but not for - # hppa2.0n, on the assumption that that the latter indicates a -- # desire for ABI=2.0n. -+ # desire for GMPABI=2.0n. - case $host in - hppa2.0n-*-*) ;; - *) -@@ -3203,7 +3203,7 @@ - # mode, but not set our ABI. For some reason it's sparc where this - # keeps coming up, presumably users there are accustomed to driving the - # compiler mode that way. The effect of our testlist setting is to -- # reject ABI=64 in favour of ABI=32 if the user has forced the flags to -+ # reject GMPABI=64 in favour of GMPABI=32 if the user has forced the flags to - # 32-bit mode. - # - abilist="32" -@@ -3308,12 +3308,12 @@ - case $host_cpu in - sparc64 | sparcv9* | ultrasparc*) - case $host in -- # Solaris 6 and earlier cannot run ABI=64 since it doesn't save -- # registers properly, so ABI=32 is left as the only choice. -+ # Solaris 6 and earlier cannot run GMPABI=64 since it doesn't save -+ # registers properly, so GMPABI=32 is left as the only choice. - # - *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*) ;; - -- # BSD sparc64 ports are 64-bit-only systems, so ABI=64 is the only -+ # BSD sparc64 ports are 64-bit-only systems, so GMPABI=64 is the only - # choice. In fact they need no special compiler flags, gcc -m64 - # is the default, but it doesn't hurt to add it. v9 CPUs always - # use the sparc64 port, since the plain 32-bit sparc ports don't -@@ -3399,7 +3399,7 @@ - # -O, but lets assume that's no longer true. - # - # -m32 forces 32-bit mode on a bi-arch 32/64 amd64 build of gcc. -m64 is -- # the default in such a build (we think), so -m32 is essential for ABI=32. -+ # the default in such a build (we think), so -m32 is essential for GMPABI=32. - # This is, of course, done for any $host_cpu, not just x86_64, so we can - # get such a gcc into the right mode to cross-compile to say i486-*-*. - # -@@ -3639,7 +3639,7 @@ - - cat >&5 <<EOF - User: --ABI=$ABI -+GMPABI=$GMPABI - CC=$CC - CFLAGS=$CFLAGS_or_unset - CPPFLAGS=$CPPFLAGS_or_unset -@@ -3660,24 +3660,24 @@ - # If the user specifies an ABI then it must be in $abilist, after that - # $abilist is restricted to just that choice. - # --if test -n "$ABI"; then -+if test -n "$GMPABI"; then - found=no - for abi in $abilist; do -- if test $abi = "$ABI"; then found=yes; break; fi -+ if test $abi = "$GMPABI"; then found=yes; break; fi - done - if test $found = no; then -- { { echo "$as_me:$LINENO: error: ABI=$ABI is not among the following valid choices: $abilist" >&5 --echo "$as_me: error: ABI=$ABI is not among the following valid choices: $abilist" >&2;} -+ { { echo "$as_me:$LINENO: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&5 -+echo "$as_me: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&2;} - { (exit 1); exit 1; }; } - fi -- abilist="$ABI" -+ abilist="$GMPABI" - fi - - found_compiler=no - - for abi in $abilist; do - -- echo "checking ABI=$abi" -+ echo "checking GMPABI=$abi" - - # Suppose abilist="64 32", then for abi=64, will have abi1="_64" and - # abi2="_64". For abi=32, will have abi1="_32" and abi2="". This is how -@@ -5128,7 +5128,7 @@ - # For -march settings which enable SSE2 we exclude certain bad - # gcc versions and we need an OS knowing how to save xmm regs. - # -- # This is only for ABI=32, any 64-bit gcc is good and any OS -+ # This is only for GMPABI=32, any 64-bit gcc is good and any OS - # knowing x86_64 will know xmm. - # - # -march=k8 was only introduced in gcc 3.3, so we shouldn't need -@@ -6368,16 +6368,16 @@ - done - fi - -- ABI="$abi" -+ GMPABI="$abi" - CC="$cc" - CFLAGS="$cflags" - CPPFLAGS="$cppflags" - - - # Could easily have this in config.h too, if desired. -- ABI_nodots=`echo $ABI | sed 's/\./_/'` -+ GMPABI_nodots=`echo $GMPABI | sed 's/\./_/'` - --echo "define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')" >> $gmp_tmpconfigm4p -+echo "define_not_for_expansion(\`HAVE_ABI_$GMPABI_nodots')" >> $gmp_tmpconfigm4p - - - -@@ -8830,12 +8830,12 @@ - # If there's any sse2 or mmx in the path, check whether the assembler - # supports it, and remove if not. - # --# We only need this in ABI=32, for ABI=64 on x86_64 we can assume a new -+# We only need this in GMPABI=32, for GMPABI=64 on x86_64 we can assume a new - # enough assembler. - # - case $host in - i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | athlon64-*-* | core2-*-* | x86_64-*-*) -- if test "$ABI" = 32; then -+ if test "$GMPABI" = 32; then - case "$path $fat_path" in - *mmx*) echo "$as_me:$LINENO: checking if the assembler knows about MMX instructions" >&5 - echo $ECHO_N "checking if the assembler knows about MMX instructions... $ECHO_C" >&6 -@@ -9019,7 +9019,7 @@ - - cat >&5 <<EOF - Decided: --ABI=$ABI -+GMPABI=$GMPABI - CC=$CC - CFLAGS=$CFLAGS - CPPFLAGS=$CPPFLAGS -@@ -9028,7 +9028,7 @@ - CXXFLAGS=$CXXFLAGS - path=$path - EOF --echo "using ABI=\"$ABI\"" -+echo "using GMPABI=\"$GMPABI\"" - echo " CC=\"$CC\"" - echo " CFLAGS=\"$CFLAGS\"" - echo " CPPFLAGS=\"$CPPFLAGS\"" -@@ -30005,7 +30005,7 @@ - - case $host in - *-*-aix*) -- case $ABI in -+ case $GMPABI in - 64 | aix64) - echo "include_mpn(\`powerpc64/aix.m4')" >> $gmp_tmpconfigm4i - ;; -@@ -30015,7 +30015,7 @@ - esac - ;; - *-*-linux* | *-*-*bsd*) -- case $ABI in -+ case $GMPABI in - mode64) - echo "include_mpn(\`powerpc64/elf.m4')" >> $gmp_tmpconfigm4i - ;; -@@ -30025,7 +30025,7 @@ - esac - ;; - *-*-darwin*) -- case $ABI in -+ case $GMPABI in - mode64) - echo "include_mpn(\`powerpc64/darwin.m4')" >> $gmp_tmpconfigm4i - ;; -@@ -30048,7 +30048,7 @@ - - ;; - sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*) -- case $ABI in -+ case $GMPABI in - 64) - - echo "$as_me:$LINENO: checking if the assembler accepts \".register\"" >&5 -@@ -30130,7 +30130,7 @@ - echo "define(<ALIGN_FILL_0x90>,<$gmp_cv_asm_align_fill_0x90>)" >> $gmp_tmpconfigm4 - - -- case $ABI in -+ case $GMPABI in - 32) - - echo "include_mpn(\`x86/x86-defs.m4')" >> $gmp_tmpconfigm4i -@@ -34032,7 +34032,7 @@ - s,@WANT_MPBSD_TRUE@,$WANT_MPBSD_TRUE,;t t - s,@WANT_MPBSD_FALSE@,$WANT_MPBSD_FALSE,;t t - s,@GMP_NAIL_BITS@,$GMP_NAIL_BITS,;t t --s,@ABI@,$ABI,;t t -+s,@GMPABI@,$GMPABI,;t t - s,@HAVE_HOST_CPU_FAMILY_power@,$HAVE_HOST_CPU_FAMILY_power,;t t - s,@HAVE_HOST_CPU_FAMILY_powerpc@,$HAVE_HOST_CPU_FAMILY_powerpc,;t t - s,@GMP_LDFLAGS@,$GMP_LDFLAGS,;t t diff --git a/dev-libs/gmp/files/gmp-4.2.2-cstdio-stdfile.patch b/dev-libs/gmp/files/gmp-4.2.2-cstdio-stdfile.patch deleted file mode 100644 index d30abd6..0000000 --- a/dev-libs/gmp/files/gmp-4.2.2-cstdio-stdfile.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/228915 - -pull in cstdio to fix building with gcc-4.3.1 - ---- gmp-4.2.2/gmp-h.in -+++ gmp-4.2.2/gmp-h.in -@@ -517,6 +517,7 @@ - #if defined (__cplusplus) - extern "C" { - #ifdef _GMP_H_HAVE_FILE -+#include <cstdio> - using std::FILE; - #endif - #endif diff --git a/dev-libs/gmp/files/gmp-4.2.3-ABI-multilib.patch b/dev-libs/gmp/files/gmp-4.2.3-ABI-multilib.patch deleted file mode 100644 index 312a1a3..0000000 --- a/dev-libs/gmp/files/gmp-4.2.3-ABI-multilib.patch +++ /dev/null @@ -1,262 +0,0 @@ -Gentoo uses ABI env var already - ---- gmp-4.2.3/configure -+++ gmp-4.2.3/configure -@@ -489,7 +489,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS ABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR ASMFLAGS AR ac_ct_AR LIBGMP_DLL SED LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS GMPABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR ASMFLAGS AR ac_ct_AR LIBGMP_DLL SED LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -930,10 +930,10 @@ - ac_env_target_alias_value=$target_alias - ac_cv_env_target_alias_set=${target_alias+set} - ac_cv_env_target_alias_value=$target_alias --ac_env_ABI_set=${ABI+set} --ac_env_ABI_value=$ABI --ac_cv_env_ABI_set=${ABI+set} --ac_cv_env_ABI_value=$ABI -+ac_env_GMPABI_set=${GMPABI+set} -+ac_env_GMPABI_value=$GMPABI -+ac_cv_env_GMPABI_set=${GMPABI+set} -+ac_cv_env_GMPABI_value=$GMPABI - ac_env_CC_set=${CC+set} - ac_env_CC_value=$CC - ac_cv_env_CC_set=${CC+set} -@@ -1091,7 +1091,7 @@ - include additional configurations [automatic] - - Some influential environment variables: -- ABI desired ABI (for processors supporting more than one ABI) -+ GMPABI desired ABI (for processors supporting more than one ABI) - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a -@@ -2670,7 +2670,7 @@ - # (64-bit), but not both, so there's no option to choose the desired - # mode, we must instead detect which of the two it is. This is done by - # checking sizeof(long), either 4 or 8 bytes respectively. Do this in -- # ABI=1.0 too, in case someone tries to build that with a 2.0w gcc. -+ # GMPABI=1.0 too, in case someone tries to build that with a 2.0w gcc. - # - gcc_cflags="-O2" - gcc_cflags_optlist="arch" -@@ -2694,11 +2694,11 @@ - # gcc 2.7.2.3 knows -mpa-risc-1-0 and -mpa-risc-1-1 - # gcc 2.95 adds -mpa-risc-2-0, plus synonyms -march=1.0, 1.1 and 2.0 - # -- # We don't use -mpa-risc-2-0 in ABI=1.0 because 64-bit registers may not -+ # We don't use -mpa-risc-2-0 in GMPABI=1.0 because 64-bit registers may not - # be saved by the kernel on an old system. Actually gcc (as of 3.2) - # only adds a few float instructions with -mpa-risc-2-0, so it would - # probably be safe, but let's not take the chance. In any case, a -- # configuration like --host=hppa2.0 ABI=1.0 is far from optimal. -+ # configuration like --host=hppa2.0 GMPABI=1.0 is far from optimal. - # - case $host_cpu in - hppa1.0*) gcc_cflags_arch="-mpa-risc-1-0" ;; -@@ -2733,9 +2733,9 @@ - cc_20n_cflags="+DA2.0 +e +O2 -Wl,+vnocompatwarnings" - cc_20n_testlist="hpc-hppa-2-0" - -- # ABI=2.0w is available for hppa2.0w and hppa2.0, but not for -+ # GMPABI=2.0w is available for hppa2.0w and hppa2.0, but not for - # hppa2.0n, on the assumption that that the latter indicates a -- # desire for ABI=2.0n. -+ # desire for GMPABI=2.0n. - case $host in - hppa2.0n-*-*) ;; - *) -@@ -3203,7 +3203,7 @@ - # mode, but not set our ABI. For some reason it's sparc where this - # keeps coming up, presumably users there are accustomed to driving the - # compiler mode that way. The effect of our testlist setting is to -- # reject ABI=64 in favour of ABI=32 if the user has forced the flags to -+ # reject GMPABI=64 in favour of GMPABI=32 if the user has forced the flags to - # 32-bit mode. - # - abilist="32" -@@ -3308,12 +3308,12 @@ - case $host_cpu in - sparc64 | sparcv9* | ultrasparc*) - case $host in -- # Solaris 6 and earlier cannot run ABI=64 since it doesn't save -- # registers properly, so ABI=32 is left as the only choice. -+ # Solaris 6 and earlier cannot run GMPABI=64 since it doesn't save -+ # registers properly, so GMPABI=32 is left as the only choice. - # - *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*) ;; - -- # BSD sparc64 ports are 64-bit-only systems, so ABI=64 is the only -+ # BSD sparc64 ports are 64-bit-only systems, so GMPABI=64 is the only - # choice. In fact they need no special compiler flags, gcc -m64 - # is the default, but it doesn't hurt to add it. v9 CPUs always - # use the sparc64 port, since the plain 32-bit sparc ports don't -@@ -3399,7 +3399,7 @@ - # -O, but lets assume that's no longer true. - # - # -m32 forces 32-bit mode on a bi-arch 32/64 amd64 build of gcc. -m64 is -- # the default in such a build (we think), so -m32 is essential for ABI=32. -+ # the default in such a build (we think), so -m32 is essential for GMPABI=32. - # This is, of course, done for any $host_cpu, not just x86_64, so we can - # get such a gcc into the right mode to cross-compile to say i486-*-*. - # -@@ -3639,7 +3639,7 @@ - - cat >&5 <<EOF - User: --ABI=$ABI -+GMPABI=$GMPABI - CC=$CC - CFLAGS=$CFLAGS_or_unset - CPPFLAGS=$CPPFLAGS_or_unset -@@ -3660,24 +3660,24 @@ - # If the user specifies an ABI then it must be in $abilist, after that - # $abilist is restricted to just that choice. - # --if test -n "$ABI"; then -+if test -n "$GMPABI"; then - found=no - for abi in $abilist; do -- if test $abi = "$ABI"; then found=yes; break; fi -+ if test $abi = "$GMPABI"; then found=yes; break; fi - done - if test $found = no; then -- { { echo "$as_me:$LINENO: error: ABI=$ABI is not among the following valid choices: $abilist" >&5 --echo "$as_me: error: ABI=$ABI is not among the following valid choices: $abilist" >&2;} -+ { { echo "$as_me:$LINENO: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&5 -+echo "$as_me: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&2;} - { (exit 1); exit 1; }; } - fi -- abilist="$ABI" -+ abilist="$GMPABI" - fi - - found_compiler=no - - for abi in $abilist; do - -- echo "checking ABI=$abi" -+ echo "checking GMPABI=$abi" - - # Suppose abilist="64 32", then for abi=64, will have abi1="_64" and - # abi2="_64". For abi=32, will have abi1="_32" and abi2="". This is how -@@ -5128,7 +5128,7 @@ - # For -march settings which enable SSE2 we exclude certain bad - # gcc versions and we need an OS knowing how to save xmm regs. - # -- # This is only for ABI=32, any 64-bit gcc is good and any OS -+ # This is only for GMPABI=32, any 64-bit gcc is good and any OS - # knowing x86_64 will know xmm. - # - # -march=k8 was only introduced in gcc 3.3, so we shouldn't need -@@ -6368,16 +6368,16 @@ - done - fi - -- ABI="$abi" -+ GMPABI="$abi" - CC="$cc" - CFLAGS="$cflags" - CPPFLAGS="$cppflags" - - - # Could easily have this in config.h too, if desired. -- ABI_nodots=`echo $ABI | sed 's/\./_/'` -+ GMPABI_nodots=`echo $GMPABI | sed 's/\./_/'` - --echo "define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')" >> $gmp_tmpconfigm4p -+echo "define_not_for_expansion(\`HAVE_ABI_$GMPABI_nodots')" >> $gmp_tmpconfigm4p - - - -@@ -8830,12 +8830,12 @@ - # If there's any sse2 or mmx in the path, check whether the assembler - # supports it, and remove if not. - # --# We only need this in ABI=32, for ABI=64 on x86_64 we can assume a new -+# We only need this in GMPABI=32, for GMPABI=64 on x86_64 we can assume a new - # enough assembler. - # - case $host in - i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | athlon64-*-* | core2-*-* | x86_64-*-*) -- if test "$ABI" = 32; then -+ if test "$GMPABI" = 32; then - case "$path $fat_path" in - *mmx*) echo "$as_me:$LINENO: checking if the assembler knows about MMX instructions" >&5 - echo $ECHO_N "checking if the assembler knows about MMX instructions... $ECHO_C" >&6 -@@ -9019,7 +9019,7 @@ - - cat >&5 <<EOF - Decided: --ABI=$ABI -+GMPABI=$GMPABI - CC=$CC - CFLAGS=$CFLAGS - CPPFLAGS=$CPPFLAGS -@@ -9028,7 +9028,7 @@ - CXXFLAGS=$CXXFLAGS - path=$path - EOF --echo "using ABI=\"$ABI\"" -+echo "using GMPABI=\"$GMPABI\"" - echo " CC=\"$CC\"" - echo " CFLAGS=\"$CFLAGS\"" - echo " CPPFLAGS=\"$CPPFLAGS\"" -@@ -30005,7 +30005,7 @@ - - case $host in - *-*-aix*) -- case $ABI in -+ case $GMPABI in - 64 | aix64) - echo "include_mpn(\`powerpc64/aix.m4')" >> $gmp_tmpconfigm4i - ;; -@@ -30015,7 +30015,7 @@ - esac - ;; - *-*-linux* | *-*-*bsd*) -- case $ABI in -+ case $GMPABI in - mode64) - echo "include_mpn(\`powerpc64/elf.m4')" >> $gmp_tmpconfigm4i - ;; -@@ -30025,7 +30025,7 @@ - esac - ;; - *-*-darwin*) -- case $ABI in -+ case $GMPABI in - mode64) - echo "include_mpn(\`powerpc64/darwin.m4')" >> $gmp_tmpconfigm4i - ;; -@@ -30048,7 +30048,7 @@ - - ;; - sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*) -- case $ABI in -+ case $GMPABI in - 64) - - echo "$as_me:$LINENO: checking if the assembler accepts \".register\"" >&5 -@@ -30130,7 +30130,7 @@ - echo "define(<ALIGN_FILL_0x90>,<$gmp_cv_asm_align_fill_0x90>)" >> $gmp_tmpconfigm4 - - -- case $ABI in -+ case $GMPABI in - 32) - - echo "include_mpn(\`x86/x86-defs.m4')" >> $gmp_tmpconfigm4i -@@ -34032,7 +34032,7 @@ - s,@WANT_MPBSD_TRUE@,$WANT_MPBSD_TRUE,;t t - s,@WANT_MPBSD_FALSE@,$WANT_MPBSD_FALSE,;t t - s,@GMP_NAIL_BITS@,$GMP_NAIL_BITS,;t t --s,@ABI@,$ABI,;t t -+s,@GMPABI@,$GMPABI,;t t - s,@HAVE_HOST_CPU_FAMILY_power@,$HAVE_HOST_CPU_FAMILY_power,;t t - s,@HAVE_HOST_CPU_FAMILY_powerpc@,$HAVE_HOST_CPU_FAMILY_powerpc,;t t - s,@GMP_LDFLAGS@,$GMP_LDFLAGS,;t t diff --git a/dev-libs/gmp/files/gmp-gcc4.4-mips.patch b/dev-libs/gmp/files/gmp-gcc4.4-mips.patch deleted file mode 100644 index a3d4215..0000000 --- a/dev-libs/gmp/files/gmp-gcc4.4-mips.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/gmp-impl.h b/gmp-impl.h -index bf0dc65..330422f 100644 ---- a/gmp-impl.h -+++ b/gmp-impl.h -@@ -2812,6 +2812,10 @@ typedef int SItype __attribute__ ((mode (SI))); - typedef unsigned int USItype __attribute__ ((mode (SI))); - typedef int DItype __attribute__ ((mode (DI))); - typedef unsigned int UDItype __attribute__ ((mode (DI))); -+#if BITS_PER_MP_LIMB == 64 -+typedef int TItype __attribute__ ((mode (TI))); -+typedef unsigned int UTItype __attribute__ ((mode (TI))); -+#endif - #else - typedef unsigned char UQItype; - typedef long SItype; -diff --git a/longlong.h b/longlong.h -index 3e2aa15..e8db21d 100644 ---- a/longlong.h -+++ b/longlong.h -@@ -1012,27 +1012,23 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ((UWtype *, UWtype, UWtype, UWtype)); - #endif /* __m88000__ */ - - #if defined (__mips) && W_TYPE_SIZE == 32 --#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 - #define umul_ppmm(w1, w0, u, v) \ -- __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) --#else --#define umul_ppmm(w1, w0, u, v) \ -- __asm__ ("multu %2,%3\n\tmflo %0\n\tmfhi %1" \ -- : "=d" (w0), "=d" (w1) : "d" (u), "d" (v)) --#endif -+ do { \ -+ UDItype __x = (UDItype) (USItype) (u) * (USItype) (v); \ -+ (w1) = (USItype) (__x >> 32); \ -+ (w0) = (USItype) (__x); \ -+ } while (0) - #define UMUL_TIME 10 - #define UDIV_TIME 100 - #endif /* __mips */ - - #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 --#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 - #define umul_ppmm(w1, w0, u, v) \ -- __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) --#else --#define umul_ppmm(w1, w0, u, v) \ -- __asm__ ("dmultu %2,%3\n\tmflo %0\n\tmfhi %1" \ -- : "=d" (w0), "=d" (w1) : "d" (u), "d" (v)) --#endif -+ do { \ -+ UTItype __x = (UTItype) (UDItype) (u) * (UDItype) (v); \ -+ (w1) = (UDItype) (__x >> 64); \ -+ (w0) = (UDItype) (__x); \ -+ } while (0) - #define UMUL_TIME 20 - #define UDIV_TIME 140 - #endif /* __mips */ |