diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-12-22 10:25:09 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-12-22 10:25:09 +0000 |
| commit | 3128648f161122c8612d13787392ab3a70ee71f7 (patch) | |
| tree | b297c4be7314606c3d171f371cd322dbf0a933ea /dev-libs/gmp/files | |
| parent | Fixing a bug within the init-script, using 'exit 1' isn't allowed (thanks to ... (diff) | |
| download | gentoo-2-3128648f161122c8612d13787392ab3a70ee71f7.tar.gz gentoo-2-3128648f161122c8612d13787392ab3a70ee71f7.tar.bz2 gentoo-2-3128648f161122c8612d13787392ab3a70ee71f7.zip | |
old
(Portage version: 2.1.2_rc3-r9)
Diffstat (limited to 'dev-libs/gmp/files')
18 files changed, 0 insertions, 1456 deletions
diff --git a/dev-libs/gmp/files/4.1.4/gmp-impl.h.MPF_SIGNIFICANT_DIGITS.diff b/dev-libs/gmp/files/4.1.4/gmp-impl.h.MPF_SIGNIFICANT_DIGITS.diff deleted file mode 100644 index 3e4716e4a7f9..000000000000 --- a/dev-libs/gmp/files/4.1.4/gmp-impl.h.MPF_SIGNIFICANT_DIGITS.diff +++ /dev/null @@ -1,25 +0,0 @@ -Index: gmp-impl.h -=================================================================== -RCS file: /home/cvsfiles/gmp/gmp-impl.h,v -retrieving revision 1.281.2.14 -retrieving revision 1.281.2.15 -diff -c -r1.281.2.14 -r1.281.2.15 -*** gmp-impl.h 13 Jan 2005 01:32:36 -0000 1.281.2.14 ---- gmp-impl.h 23 May 2005 17:54:15 -0000 1.281.2.15 -*************** -*** 2783,2789 **** - #define MPF_SIGNIFICANT_DIGITS(n, base, prec) \ - do { \ - ASSERT (base >= 2 && base < numberof (mp_bases)); \ -! (n) = 2 + (size_t) ((((prec) - 1) * BITS_PER_MP_LIMB) \ - * mp_bases[(base)].chars_per_bit_exactly); \ - } while (0) - ---- 2783,2789 ---- - #define MPF_SIGNIFICANT_DIGITS(n, base, prec) \ - do { \ - ASSERT (base >= 2 && base < numberof (mp_bases)); \ -! (n) = 2 + (size_t) ((((size_t) (prec) - 1) * GMP_NUMB_BITS) \ - * mp_bases[(base)].chars_per_bit_exactly); \ - } while (0) - diff --git a/dev-libs/gmp/files/4.1.4/gmp-impl.h.MPN_SIZEINBASE.diff b/dev-libs/gmp/files/4.1.4/gmp-impl.h.MPN_SIZEINBASE.diff deleted file mode 100644 index 3a5e93fd3619..000000000000 --- a/dev-libs/gmp/files/4.1.4/gmp-impl.h.MPN_SIZEINBASE.diff +++ /dev/null @@ -1,25 +0,0 @@ -Index: gmp-impl.h -=================================================================== -RCS file: /home/cvsfiles/gmp/gmp-impl.h,v -retrieving revision 1.281.2.13 -diff -c -1 -r1.281.2.13 gmp-impl.h -*** gmp-impl.h 29 Sep 2004 20:04:54 -0000 1.281.2.13 ---- gmp-impl.h 13 Jan 2005 01:08:01 -0000 -*************** -*** 1844,1846 **** - int __lb_base, __cnt; \ -! mp_size_t __totbits; \ - \ ---- 1844,1846 ---- - int __lb_base, __cnt; \ -! size_t __totbits; \ - \ -*************** -*** 1857,1859 **** - count_leading_zeros (__cnt, (ptr)[(size)-1]); \ -! __totbits = (size) * GMP_NUMB_BITS - (__cnt - GMP_NAIL_BITS); \ - \ ---- 1857,1859 ---- - count_leading_zeros (__cnt, (ptr)[(size)-1]); \ -! __totbits = (size_t) (size) * GMP_NUMB_BITS - (__cnt - GMP_NAIL_BITS);\ - \ diff --git a/dev-libs/gmp/files/4.1.4/gmp-impl.h.x86.ULONG_PARITY.diff b/dev-libs/gmp/files/4.1.4/gmp-impl.h.x86.ULONG_PARITY.diff deleted file mode 100644 index 40d97fa01bab..000000000000 --- a/dev-libs/gmp/files/4.1.4/gmp-impl.h.x86.ULONG_PARITY.diff +++ /dev/null @@ -1,35 +0,0 @@ -Index: gmp-impl.h -=================================================================== -RCS file: /home/cvsfiles/gmp/gmp-impl.h,v -retrieving revision 1.281.2.12 -diff -u -r1.281.2.12 gmp-impl.h ---- gmp-impl.h 22 Apr 2004 23:59:53 -0000 1.281.2.12 -+++ gmp-impl.h 29 Sep 2004 19:22:23 -0000 -@@ -2188,14 +2188,24 @@ - there's an even number. */ - - #if defined (__GNUC__) && ! defined (NO_ASM) && HAVE_HOST_CPU_FAMILY_x86 -+/* Some clever GCC maintainer decided to change the meaning of the q register -+ flag with GCC version 3.1. He added a Q flag with the old meaning at the -+ same time. This forces us to use a conditional on GCC version. */ -+#if __GMP_GNUC_PREREQ (3,1) -+#define __GMP_qm "=Qm" -+#define __GMP_q "=Q" -+#else -+#define __GMP_qm "=qm" -+#define __GMP_q "=q" -+#endif - #define ULONG_PARITY(p, n) \ - do { \ - char __p; \ - unsigned long __n = (n); \ - __n ^= (__n >> 16); \ -- asm ("xorb %h1, %b1\n" \ -- "setpo %0\n" \ -- : "=qm" (__p), "=q" (__n) \ -+ asm ("xorb %h1, %b1\n\t" \ -+ "setpo %0" \ -+ : __GMP_qm (__p), __GMP_q (__n)\ - : "1" (__n)); \ - (p) = __p; \ - } while (0) diff --git a/dev-libs/gmp/files/4.1.4/mpn_rootrem.c.diff b/dev-libs/gmp/files/4.1.4/mpn_rootrem.c.diff deleted file mode 100644 index aabdf9fd9c46..000000000000 --- a/dev-libs/gmp/files/4.1.4/mpn_rootrem.c.diff +++ /dev/null @@ -1,25 +0,0 @@ -Index: mpn/generic/rootrem.c -=================================================================== -RCS file: /home/cvsfiles/gmp/mpn/generic/rootrem.c,v -retrieving revision 1.10 -retrieving revision 1.11 -diff -c -r1.10 -r1.11 -*** mpn/generic/rootrem.c 12 Jan 2003 02:23:05 -0000 1.10 ---- mpn/generic/rootrem.c 8 Apr 2005 09:30:42 -0000 1.11 -*************** -*** 94,100 **** - - xn = (xnb + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; - -! qp = TMP_ALLOC_LIMBS (un + 1); - xp = TMP_ALLOC_LIMBS (xn + 1); - - /* Set initial root to only ones. This is an overestimate of the actual root ---- 94,100 ---- - - xn = (xnb + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; - -! qp = TMP_ALLOC_LIMBS (PP_ALLOC); - xp = TMP_ALLOC_LIMBS (xn + 1); - - /* Set initial root to only ones. This is an overestimate of the actual root diff --git a/dev-libs/gmp/files/amd64.patch b/dev-libs/gmp/files/amd64.patch deleted file mode 100644 index a07d72c691bf..000000000000 --- a/dev-libs/gmp/files/amd64.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- gmp-impl.h 22 Apr 2004 23:59:53 -0000 1.281.2.12 -+++ gmp-impl.h 29 Sep 2004 19:22:23 -0000 -@@ -2188,14 +2188,24 @@ - there's an even number. */ - - #if defined (__GNUC__) && ! defined (NO_ASM) && HAVE_HOST_CPU_FAMILY_x86 -+/* Some clever GCC maintainer decided to change the meaning of the q register -+ flag with GCC version 3.1. He added a Q flag with the old meaning at the -+ same time. This forces us to use a conditional on GCC version. */ -+#if __GMP_GNUC_PREREQ (3,1) -+#define __GMP_qm "=Qm" -+#define __GMP_q "=Q" -+#else -+#define __GMP_qm "=qm" -+#define __GMP_q "=q" -+#endif - #define ULONG_PARITY(p, n) \ - do { \ - char __p; \ - unsigned long __n = (n); \ - __n ^= (__n >> 16); \ -- asm ("xorb %h1, %b1\n" \ -- "setpo %0\n" \ -- : "=qm" (__p), "=q" (__n) \ -+ asm ("xorb %h1, %b1\n\t" \ -+ "setpo %0" \ -+ : __GMP_qm (__p), __GMP_q (__n)\ - : "1" (__n)); \ - (p) = __p; \ - } while (0) diff --git a/dev-libs/gmp/files/digest-gmp-4.1.4 b/dev-libs/gmp/files/digest-gmp-4.1.4 deleted file mode 100644 index 395d063a4570..000000000000 --- a/dev-libs/gmp/files/digest-gmp-4.1.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 aa5e5fb3a7cdebe8c5b681a6cf4a670e gmp-4.1.4.tar.gz 2201302 -RMD160 858fe33a84f209a8659c6d262a41596f5c7c3c0d gmp-4.1.4.tar.gz 2201302 -SHA256 ce71ebe8ad0e328c7c188803a726b2ddaad9b2ff072cfbaee9c788c733983cb8 gmp-4.1.4.tar.gz 2201302 diff --git a/dev-libs/gmp/files/digest-gmp-4.1.4-r1 b/dev-libs/gmp/files/digest-gmp-4.1.4-r1 deleted file mode 100644 index d58b9daad5d3..000000000000 --- a/dev-libs/gmp/files/digest-gmp-4.1.4-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 aa5e5fb3a7cdebe8c5b681a6cf4a670e gmp-4.1.4.tar.gz 2201302 -RMD160 858fe33a84f209a8659c6d262a41596f5c7c3c0d gmp-4.1.4.tar.gz 2201302 -SHA256 ce71ebe8ad0e328c7c188803a726b2ddaad9b2ff072cfbaee9c788c733983cb8 gmp-4.1.4.tar.gz 2201302 -MD5 9f534278bbe3f66fe99b0e3496ac6cca gmp-man-4.1.4.pdf 652184 -RMD160 1725341508d40f018097b8faa023a10a780cceb2 gmp-man-4.1.4.pdf 652184 -SHA256 50c72e69c6dcdb966d7932770f6cf5e3b1ab3aea8d2172adc93fc49a7f80dc16 gmp-man-4.1.4.pdf 652184 diff --git a/dev-libs/gmp/files/digest-gmp-4.1.4-r2 b/dev-libs/gmp/files/digest-gmp-4.1.4-r2 deleted file mode 100644 index 46a348460726..000000000000 --- a/dev-libs/gmp/files/digest-gmp-4.1.4-r2 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 0aa7d3b3f5b5ec5951e7dddd6f65e891 gmp-4.1.4.tar.bz2 1681267 -RMD160 bde4d1f217606f79490372eed8356039b06d4aac gmp-4.1.4.tar.bz2 1681267 -SHA256 1a6ed0ea17b24ea8864c4df516d20c41fac97a448559ddee5a8477aeeecca1a3 gmp-4.1.4.tar.bz2 1681267 -MD5 9f534278bbe3f66fe99b0e3496ac6cca gmp-man-4.1.4.pdf 652184 -RMD160 1725341508d40f018097b8faa023a10a780cceb2 gmp-man-4.1.4.pdf 652184 -SHA256 50c72e69c6dcdb966d7932770f6cf5e3b1ab3aea8d2172adc93fc49a7f80dc16 gmp-man-4.1.4.pdf 652184 diff --git a/dev-libs/gmp/files/digest-gmp-4.1.4-r3 b/dev-libs/gmp/files/digest-gmp-4.1.4-r3 deleted file mode 100644 index 46a348460726..000000000000 --- a/dev-libs/gmp/files/digest-gmp-4.1.4-r3 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 0aa7d3b3f5b5ec5951e7dddd6f65e891 gmp-4.1.4.tar.bz2 1681267 -RMD160 bde4d1f217606f79490372eed8356039b06d4aac gmp-4.1.4.tar.bz2 1681267 -SHA256 1a6ed0ea17b24ea8864c4df516d20c41fac97a448559ddee5a8477aeeecca1a3 gmp-4.1.4.tar.bz2 1681267 -MD5 9f534278bbe3f66fe99b0e3496ac6cca gmp-man-4.1.4.pdf 652184 -RMD160 1725341508d40f018097b8faa023a10a780cceb2 gmp-man-4.1.4.pdf 652184 -SHA256 50c72e69c6dcdb966d7932770f6cf5e3b1ab3aea8d2172adc93fc49a7f80dc16 gmp-man-4.1.4.pdf 652184 diff --git a/dev-libs/gmp/files/digest-gmp-4.2 b/dev-libs/gmp/files/digest-gmp-4.2 deleted file mode 100644 index fb55947b93a2..000000000000 --- a/dev-libs/gmp/files/digest-gmp-4.2 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 aa4a4534e8870ab8ba3c093239057cca gmp-4.2.tar.bz2 1726594 -RMD160 6ae9b4dc0d8517795f10528e7928fbf15fb1d2d2 gmp-4.2.tar.bz2 1726594 -SHA256 374d658b7168bea13bb23cc4fb2fd4c12b449191325b46bb4e78b9a59c8d889e gmp-4.2.tar.bz2 1726594 -MD5 fc03fead381d8307e90e73d0c789bc89 gmp-man-4.2.pdf 994954 -RMD160 a200db375245209a52604656c28eb8bcc61832d0 gmp-man-4.2.pdf 994954 -SHA256 c0cf53d949b5829f9401051ce63f39ed6ec92d082f713d8e9f26b38d3f02bed6 gmp-man-4.2.pdf 994954 diff --git a/dev-libs/gmp/files/gmp-4.1.4-ABI-multilib.patch b/dev-libs/gmp/files/gmp-4.1.4-ABI-multilib.patch deleted file mode 100644 index c8ef35eda26a..000000000000 --- a/dev-libs/gmp/files/gmp-4.1.4-ABI-multilib.patch +++ /dev/null @@ -1,130 +0,0 @@ -Gentoo uses ABI env var already - ---- gmp-4.1.4/configure -+++ gmp-4.1.4/configure -@@ -743,10 +743,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} -@@ -894,7 +894,7 @@ - --with-tags=TAGS include additional configurations [CXX,GCJ] - - 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 -@@ -2723,7 +2723,7 @@ - - cat >&5 <<EOF - configure:1083: User: --ABI=$ABI -+GMPABI=$GMPABI - CC=$CC - CFLAGS=$CFLAGS_or_unset - CPPFLAGS=$CPPFLAGS_or_unset -@@ -2743,17 +2743,17 @@ - # 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:2752: 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:2752: 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 -@@ -3242,13 +3242,13 @@ - 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/\./_/'` -+ ABI_nodots=`echo $GMPABI | sed 's/\./_/'` - - echo "define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')" >> $gmp_tmpconfigm4p - -@@ -5144,7 +5144,7 @@ - - cat >&5 <<EOF - configure:1482: Decided: --ABI=$ABI -+GMPABI=$GMPABI - CC=$CC - CFLAGS=$CFLAGS - CPPFLAGS=$CPPFLAGS -@@ -5153,7 +5153,7 @@ - CXXFLAGS=$CXXFLAGS - path=$path - EOF --echo "using ABI=\"$ABI\"" -+echo "using GMPABI=\"$GMPABI\"" - echo " CC=\"$CC\"" - echo " CFLAGS=\"$CFLAGS\"" - echo " CPPFLAGS=\"$CPPFLAGS\"" -@@ -19833,7 +19833,7 @@ - - case $host in - powerpc*-*-aix*) -- case $ABI in -+ case $GMPABI in - 64 | aix64) - echo "include_mpn(\`powerpc64/aix.m4')" >> $gmp_tmpconfigm4i - ;; -@@ -19843,7 +19843,7 @@ - esac - ;; - powerpc*-*-linux*) -- case $ABI in -+ case $GMPABI in - 64) - echo "include_mpn(\`powerpc64/linux64.m4')" >> $gmp_tmpconfigm4i - ;; -@@ -19857,7 +19857,7 @@ - - ;; - sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*) -- case $ABI in -+ case $GMPABI in - 64) - - echo "$as_me:19863: checking if the assembler accepts \".register\"" >&5 -@@ -22172,7 +22172,7 @@ - s,@WANT_MPFR_TRUE@,$WANT_MPFR_TRUE,;t t - s,@WANT_MPFR_FALSE@,$WANT_MPFR_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.1.4-asm-dots.patch b/dev-libs/gmp/files/gmp-4.1.4-asm-dots.patch deleted file mode 100644 index de1bcc0224ea..000000000000 --- a/dev-libs/gmp/files/gmp-4.1.4-asm-dots.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- configure -+++ configure -@@ -999,8 +999,8 @@ - for tmp_underscore in "" "_"; do - cat >conftes2.s <<EOF - $gmp_cv_asm_text -- $gmp_cv_asm_globl ${tmp_underscore}underscore_test --${tmp_underscore}underscore_test$gmp_cv_asm_label_suffix -+ $gmp_cv_asm_globl .${tmp_underscore}underscore_test -+.${tmp_underscore}underscore_test$gmp_cv_asm_label_suffix - EOF - case $host in - *-*-aix*) diff --git a/dev-libs/gmp/files/gmp-4.1.4-multilib.patch b/dev-libs/gmp/files/gmp-4.1.4-multilib.patch deleted file mode 100644 index 5ca49a9092bd..000000000000 --- a/dev-libs/gmp/files/gmp-4.1.4-multilib.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -Naurp gmp-4.1.4.orig/configure.in gmp-4.1.4/configure.in ---- gmp-4.1.4.orig/configure.in 2004-09-21 06:02:43.000000000 -0700 -+++ gmp-4.1.4/configure.in 2005-01-27 12:50:33.627680514 -0800 -@@ -291,7 +291,7 @@ esac], - # hugely bloat the output. - - --AC_ARG_VAR(ABI, [desired ABI (for processors supporting more than one ABI)]) -+AC_ARG_VAR(GMPABI, [desired ABI (for processors supporting more than one ABI)]) - - # abilist needs to be non-empty, "standard" is just a generic name here - abilist="standard" -@@ -1081,7 +1081,7 @@ CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'} - - cat >&AC_FD_CC <<EOF - configure:__line__: User: --ABI=$ABI -+GMPABI=$GMPABI - CC=$CC - CFLAGS=$CFLAGS_or_unset - CPPFLAGS=$CPPFLAGS_or_unset -@@ -1102,15 +1102,15 @@ done - # 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 -- AC_MSG_ERROR([ABI=$ABI is not among the following valid choices: $abilist]) -+ AC_MSG_ERROR([GMPABI=$GMPABI is not among the following valid choices: $abilist]) - fi -- abilist="$ABI" -+ abilist="$GMPABI" - fi - - found_compiler=no -@@ -1311,14 +1311,14 @@ if test $found_compiler = yes; then - 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/\./_/'` -+ ABI_nodots=`echo $GMPABI | sed 's/\./_/'` - GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')", POST) - - -@@ -1480,7 +1480,7 @@ fi - - cat >&AC_FD_CC <<EOF - configure:__line__: Decided: --ABI=$ABI -+GMPABI=$GMPABI - CC=$CC - CFLAGS=$CFLAGS - CPPFLAGS=$CPPFLAGS -@@ -1489,7 +1489,7 @@ CXX=$CXX - CXXFLAGS=$CXXFLAGS - path=$path - EOF --echo "using ABI=\"$ABI\"" -+echo "using GMPABI=\"$GMPABI\"" - echo " CC=\"$CC\"" - echo " CFLAGS=\"$CFLAGS\"" - echo " CPPFLAGS=\"$CPPFLAGS\"" -@@ -2012,13 +2012,13 @@ if test "$gmp_asm_syntax_testing" != no; - GMP_INCLUDE_MPN(powerpc32/powerpc-defs.m4) - case $host in - powerpc*-*-aix*) -- case $ABI in -+ case $GMPABI in - 64 | aix64) GMP_INCLUDE_MPN(powerpc64/aix.m4) ;; - *) GMP_INCLUDE_MPN(powerpc32/aix.m4) ;; - esac - ;; - powerpc*-*-linux*) -- case $ABI in -+ case $GMPABI in - 64) GMP_INCLUDE_MPN(powerpc64/linux64.m4) ;; - esac - ;; -@@ -2028,7 +2028,7 @@ if test "$gmp_asm_syntax_testing" != no; - GMP_INCLUDE_MPN(powerpc32/aix.m4) - ;; - sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*) -- case $ABI in -+ case $GMPABI in - 64) - GMP_ASM_SPARC_REGISTER - ;; diff --git a/dev-libs/gmp/files/gmp-4.1.4-nostackexec.patch b/dev-libs/gmp/files/gmp-4.1.4-nostackexec.patch deleted file mode 100644 index 141539213a05..000000000000 --- a/dev-libs/gmp/files/gmp-4.1.4-nostackexec.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gmp-4.1.4/acinclude.m4.orig -+++ gmp-4.1.4/acinclude.m4 -@@ -878,6 +878,7 @@ - fi - echo ["')"] >> $gmp_configm4 - echo ["define(\`__CONFIG_M4_INCLUDED__')"] >> $gmp_configm4 -+cat nostackexec>>$gmp_configm4 - ]) - - ---- /dev/null -+++ gmp-4.1.4/nostackexec -@@ -0,0 +1,3 @@ -+#ifdef __ELF__ -+.section .note.GNU-stack,"",%progbits -+#endif diff --git a/dev-libs/gmp/files/gmp-4.1.4-ppc64-asm-dots.patch b/dev-libs/gmp/files/gmp-4.1.4-ppc64-asm-dots.patch deleted file mode 100644 index dd0edf2cc2fa..000000000000 --- a/dev-libs/gmp/files/gmp-4.1.4-ppc64-asm-dots.patch +++ /dev/null @@ -1,16 +0,0 @@ - # This patch will actually be somewhat short lived as it's really - # somewhat of a hack. The toolchain folks (alanm) have a set of patches - # to remove the use of the '.' form in ppc64 assembler ---- configure -+++ configure -@@ -19253,8 +19253,8 @@ - for tmp_underscore in "" "_"; do - cat >conftes2.s <<EOF - $gmp_cv_asm_text -- $gmp_cv_asm_globl ${tmp_underscore}underscore_test --${tmp_underscore}underscore_test$gmp_cv_asm_label_suffix -+ $gmp_cv_asm_globl .${tmp_underscore}underscore_test -+.${tmp_underscore}underscore_test$gmp_cv_asm_label_suffix - EOF - case $host in - *-*-aix*) diff --git a/dev-libs/gmp/files/gmp-4.2-ABI-multilib.patch b/dev-libs/gmp/files/gmp-4.2-ABI-multilib.patch deleted file mode 100644 index ec170be9db25..000000000000 --- a/dev-libs/gmp/files/gmp-4.2-ABI-multilib.patch +++ /dev/null @@ -1,262 +0,0 @@ -Gentoo uses ABI env var already - ---- gmp-4.2/configure -+++ gmp-4.2/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 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 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-*-*) ;; - *) -@@ -3195,7 +3195,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" -@@ -3300,12 +3300,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 -@@ -3391,7 +3391,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-*-*. - # -@@ -3629,7 +3629,7 @@ - - cat >&5 <<EOF - User: --ABI=$ABI -+GMPABI=$GMPABI - CC=$CC - CFLAGS=$CFLAGS_or_unset - CPPFLAGS=$CPPFLAGS_or_unset -@@ -3650,24 +3650,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 -@@ -5118,7 +5118,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 -@@ -6358,16 +6358,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 - - - -@@ -8820,12 +8820,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*-*-* | 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 -@@ -9009,7 +9009,7 @@ - - cat >&5 <<EOF - Decided: --ABI=$ABI -+GMPABI=$GMPABI - CC=$CC - CFLAGS=$CFLAGS - CPPFLAGS=$CPPFLAGS -@@ -9018,7 +9018,7 @@ - CXXFLAGS=$CXXFLAGS - path=$path - EOF --echo "using ABI=\"$ABI\"" -+echo "using GMPABI=\"$GMPABI\"" - echo " CC=\"$CC\"" - echo " CFLAGS=\"$CFLAGS\"" - echo " CPPFLAGS=\"$CPPFLAGS\"" -@@ -30058,7 +30058,7 @@ - - case $host in - *-*-aix*) -- case $ABI in -+ case $GMPABI in - 64 | aix64) - echo "include_mpn(\`powerpc64/aix.m4')" >> $gmp_tmpconfigm4i - ;; -@@ -30068,7 +30068,7 @@ - esac - ;; - *-*-linux*) -- case $ABI in -+ case $GMPABI in - mode64) - echo "include_mpn(\`powerpc64/linux64.m4')" >> $gmp_tmpconfigm4i - ;; -@@ -30078,7 +30078,7 @@ - esac - ;; - *-*-darwin*) -- case $ABI in -+ case $GMPABI in - mode64) - echo "include_mpn(\`powerpc64/darwin.m4')" >> $gmp_tmpconfigm4i - ;; -@@ -30095,7 +30095,7 @@ - - ;; - sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*) -- case $ABI in -+ case $GMPABI in - 64) - - echo "$as_me:$LINENO: checking if the assembler accepts \".register\"" >&5 -@@ -30177,7 +30177,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 -@@ -34079,7 +34078,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-hppa-2.0.patch b/dev-libs/gmp/files/gmp-hppa-2.0.patch deleted file mode 100644 index c3ccf60428af..000000000000 --- a/dev-libs/gmp/files/gmp-hppa-2.0.patch +++ /dev/null @@ -1,738 +0,0 @@ ---- gmp/mpn/pa64/mul_1.asm -+++ gmp/mpn/pa64/mul_1.asm -@@ -139,14 +139,14 @@ - fstd %fr24, -0x80(%r30) C low product to -0x80..-0x79 - addib,<> -1, %r5, L(two_or_more) - fstd %fr25, -0x68(%r30) C high product to -0x68..-0x61 --L(one) -+.label L(one) - ldd -0x78(%r30), p032a1 - ldd -0x70(%r30), p032a2 - ldd -0x80(%r30), p000a - b L(0_one_out) - ldd -0x68(%r30), p064a - --L(two_or_more) -+.label L(two_or_more) - fldd 0(up), %fr4 - ldo 8(up), up - xmpyu %fr8R, %fr4L, %fr22 -@@ -162,7 +162,7 @@ - ldd -0x68(%r30), p064a - addib,<> -1, %r5, L(three_or_more) - fstd %fr25, -0x68(%r30) C high product to -0x68..-0x61 --L(two) -+.label L(two) - add p032a1, p032a2, m032 - add,dc %r0, %r0, m096 - depd,z m032, 31, 32, ma000 -@@ -170,7 +170,7 @@ - b L(0_two_out) - depd m096, 31, 32, ma064 - --L(three_or_more) -+.label L(three_or_more) - fldd 0(up), %fr4 - add p032a1, p032a2, m032 - add,dc %r0, %r0, m096 -@@ -178,7 +178,7 @@ - extrd,u m032, 31, 32, ma064 - dnl addib,= -1, %r5, L(0_out) - depd m096, 31, 32, ma064 --L(oop0) -+.label L(oop0) - dnl xmpyu %fr8R, %fr4L, %fr22 - dnl xmpyu %fr8L, %fr4R, %fr23 - dnl ldd -0x78(%r30), p032a1 -@@ -212,7 +212,7 @@ - dnl extrd,u m032, 31, 32, ma064 - dnl addib,<> -1, %r5, L(oop0) - dnl depd m096, 31, 32, ma064 --L(0_out) -+.label L(0_out) - ldo 8(up), up - xmpyu %fr8R, %fr4L, %fr22 - xmpyu %fr8L, %fr4R, %fr23 -@@ -237,7 +237,7 @@ - depd,z m032, 31, 32, ma000 - extrd,u m032, 31, 32, ma064 - depd m096, 31, 32, ma064 --L(0_two_out) -+.label L(0_two_out) - ldd -0x78(%r30), p032a1 - ldd -0x70(%r30), p032a2 - ldo 8(rp), rp -@@ -248,7 +248,7 @@ - add ma000, s000, s000 - add,dc ma064, climb, climb - std s000, -8(rp) --L(0_one_out) -+.label L(0_one_out) - add p032a1, p032a2, m032 - add,dc %r0, %r0, m096 - depd,z m032, 31, 32, ma000 -@@ -266,7 +266,7 @@ - - dnl 4-way unrolled code. - --L(BIG) -+.label L(BIG) - - define(`p032a1',`%r1') dnl - define(`p032a2',`%r19') dnl -@@ -317,7 +317,7 @@ - ',` extrd,u n, 61, 30, n C right shift 2, zero extend - ') - --L(4_or_more) -+.label L(4_or_more) - fldd 0(up), %fr4 - fldd 8(up), %fr5 - fldd 16(up), %fr6 -@@ -366,7 +366,7 @@ - b L(end1) - nop - --L(8_or_more) -+.label L(8_or_more) - fstd %fr28, -0x18(%r30) C mid product to -0x18..-0x11 - fstd %fr29, -0x10(%r30) C mid product to -0x10..-0x09 - ldo 32(up), up -@@ -413,7 +413,7 @@ - fstd %fr27, -0x50(%r30) C mid product to -0x50..-0x49 - addib,= -1, n, L(end2) - xmpyu %fr8L, %fr7L, %fr27 --L(oop) -+.label L(oop) - add p032a1, p032a2, m032 - ldd -0x80(%r30), p000a - add,dc p096b1, p096b2, m096 -@@ -519,7 +519,7 @@ - addib,<> -1, n, L(oop) - ldo 32(rp), rp - --L(end2) -+.label L(end2) - add p032a1, p032a2, m032 - ldd -0x80(%r30), p000a - add,dc p096b1, p096b2, m096 -@@ -576,7 +576,7 @@ - ldd -0x10(%r30), p224d2 - ldo 32(rp), rp - --L(end1) -+.label L(end1) - add p032a1, p032a2, m032 - ldd -0x80(%r30), p000a - add,dc p096b1, p096b2, m096 -@@ -622,7 +622,7 @@ - ldd -0xd8(%r30), %r8 - ldd -0xe0(%r30), %r7 - ldd -0xe8(%r30), %r6 --L(done) -+.label L(done) - ifdef(`HAVE_ABI_2_0w', - ` copy climb, %r28 - ',` extrd,u climb, 63, 32, %r29 ---- gmp/mpn/pa64/sqr_diagonal.asm -+++ gmp/mpn/pa64/sqr_diagonal.asm -@@ -57,7 +57,8 @@ - addib,= -1,n,L(end2) - ldo 16(rp),rp - --L(loop) fldds,ma 8(up),%fr8 C load next up limb -+.label L(loop) -+ fldds,ma 8(up),%fr8 C load next up limb - xmpyu %fr4l,%fr4r,%fr6 - fstd %fr6,-128(%r30) - xmpyu %fr4r,%fr4r,%fr5 C multiply in fp regs -@@ -95,7 +96,8 @@ - addib,<> -1,n,L(loop) - ldo 16(rp),rp - --L(end2) xmpyu %fr4l,%fr4r,%fr6 -+.label L(end2) -+ xmpyu %fr4l,%fr4r,%fr6 - fstd %fr6,-128(%r30) - xmpyu %fr4r,%fr4r,%fr5 - fstd %fr5,0(rp) -@@ -123,7 +125,8 @@ - bve (%r2) - ldo -128(%r30),%r30 - --L(exit) xmpyu %fr8l,%fr8r,%fr10 -+.label L(exit) -+ xmpyu %fr8l,%fr8r,%fr10 - fstd %fr10,-120(%r30) - xmpyu %fr8r,%fr8r,%fr9 - fstd %fr9,0(rp) -@@ -155,7 +158,8 @@ - bve (%r2) - ldo -128(%r30),%r30 - --L(end1) xmpyu %fr8l,%fr8r,%fr10 -+.label L(end1) -+ xmpyu %fr8l,%fr8r,%fr10 - fstd %fr10,-128(%r30) - xmpyu %fr8r,%fr8r,%fr9 - fstd %fr9,0(rp) ---- gmp/mpn/pa64/lshift.asm -+++ gmp/mpn/pa64/lshift.asm -@@ -65,36 +65,45 @@ - b L(7) - copy %r21, %r20 - --L(loop) --L(0) ldd -16(up), %r20 -+.label L(loop) -+.label L(0) -+ ldd -16(up), %r20 - shrpd %r21, %r20, %sar, %r21 - std %r21, -8(rp) --L(7) ldd -24(up), %r21 -+.label L(7) -+ ldd -24(up), %r21 - shrpd %r20, %r21, %sar, %r20 - std %r20, -16(rp) --L(6) ldd -32(up), %r20 -+.label L(6) -+ ldd -32(up), %r20 - shrpd %r21, %r20, %sar, %r21 - std %r21, -24(rp) --L(5) ldd -40(up), %r21 -+.label L(5) -+ ldd -40(up), %r21 - shrpd %r20, %r21, %sar, %r20 - std %r20, -32(rp) --L(4) ldd -48(up), %r20 -+.label L(4) -+ ldd -48(up), %r20 - shrpd %r21, %r20, %sar, %r21 - std %r21, -40(rp) --L(3) ldd -56(up), %r21 -+.label L(3) -+ ldd -56(up), %r21 - shrpd %r20, %r21, %sar, %r20 - std %r20, -48(rp) --L(2) ldd -64(up), %r20 -+.label L(2) -+ ldd -64(up), %r20 - shrpd %r21, %r20, %sar, %r21 - std %r21, -56(rp) --L(1) ldd -72(up), %r21 -+.label L(1) -+ ldd -72(up), %r21 - ldo -64(up), up - shrpd %r20, %r21, %sar, %r20 - std %r20, -64(rp) - addib,> -8, n, L(loop) - ldo -64(rp), rp - --L(end) shrpd %r21, %r0, %sar, %r21 -+.label L(end) -+ shrpd %r21, %r0, %sar, %r21 - std %r21, -8(rp) - bve (%r2) - ifdef(`HAVE_ABI_2_0w', ---- gmp/mpn/pa64/add_n.asm -+++ gmp/mpn/pa64/add_n.asm -@@ -48,35 +48,43 @@ - blr %r28, %r0 C branch into loop - add %r0, %r0, %r0 C reset carry - --L(loop) ldd 0(up), %r20 -+.label L(loop) -+ ldd 0(up), %r20 - ldd 0(vp), %r31 - add,dc %r20, %r31, %r20 - std %r20, 0(rp) --L(7) ldd 8(up), %r21 -+.label L(7) -+ ldd 8(up), %r21 - ldd 8(vp), %r19 - add,dc %r21, %r19, %r21 - std %r21, 8(rp) --L(6) ldd 16(up), %r20 -+.label L(6) -+ ldd 16(up), %r20 - ldd 16(vp), %r31 - add,dc %r20, %r31, %r20 - std %r20, 16(rp) --L(5) ldd 24(up), %r21 -+.label L(5) -+ ldd 24(up), %r21 - ldd 24(vp), %r19 - add,dc %r21, %r19, %r21 - std %r21, 24(rp) --L(4) ldd 32(up), %r20 -+.label L(4) -+ ldd 32(up), %r20 - ldd 32(vp), %r31 - add,dc %r20, %r31, %r20 - std %r20, 32(rp) --L(3) ldd 40(up), %r21 -+.label L(3) -+ ldd 40(up), %r21 - ldd 40(vp), %r19 - add,dc %r21, %r19, %r21 - std %r21, 40(rp) --L(2) ldd 48(up), %r20 -+.label L(2) -+ ldd 48(up), %r20 - ldd 48(vp), %r31 - add,dc %r20, %r31, %r20 - std %r20, 48(rp) --L(1) ldd 56(up), %r21 -+.label L(1) -+ ldd 56(up), %r21 - ldd 56(vp), %r19 - add,dc %r21, %r19, %r21 - ldo 64(up), up ---- gmp/mpn/pa64/rshift.asm -+++ gmp/mpn/pa64/rshift.asm -@@ -62,36 +62,45 @@ - b L(7) - copy %r21, %r20 - --L(loop) --L(0) ldd 8(up), %r20 -+.label L(loop) -+.label L(0) -+ ldd 8(up), %r20 - shrpd %r20, %r21, %sar, %r21 - std %r21, 0(rp) --L(7) ldd 16(up), %r21 -+.label L(7) -+ ldd 16(up), %r21 - shrpd %r21, %r20, %sar, %r20 - std %r20, 8(rp) --L(6) ldd 24(up), %r20 -+.label L(6) -+ ldd 24(up), %r20 - shrpd %r20, %r21, %sar, %r21 - std %r21, 16(rp) --L(5) ldd 32(up), %r21 -+.label L(5) -+ ldd 32(up), %r21 - shrpd %r21, %r20, %sar, %r20 - std %r20, 24(rp) --L(4) ldd 40(up), %r20 -+.label L(4) -+ ldd 40(up), %r20 - shrpd %r20, %r21, %sar, %r21 - std %r21, 32(rp) --L(3) ldd 48(up), %r21 -+.label L(3) -+ ldd 48(up), %r21 - shrpd %r21, %r20, %sar, %r20 - std %r20, 40(rp) --L(2) ldd 56(up), %r20 -+.label L(2) -+ ldd 56(up), %r20 - shrpd %r20, %r21, %sar, %r21 - std %r21, 48(rp) --L(1) ldd 64(up), %r21 -+.label L(1) -+ ldd 64(up), %r21 - ldo 64(up), up - shrpd %r21, %r20, %sar, %r20 - std %r20, 56(rp) - addib,> -8, n, L(loop) - ldo 64(rp), rp - --L(end) shrpd %r0, %r21, %sar, %r21 -+.label L(end) -+ shrpd %r0, %r21, %sar, %r21 - std %r21, 0(rp) - bve (%r2) - ifdef(`HAVE_ABI_2_0w', ---- gmp/mpn/pa64/addmul_1.asm -+++ gmp/mpn/pa64/addmul_1.asm -@@ -141,14 +141,14 @@ - fstd %fr24, -0x80(%r30) C low product to -0x80..-0x79 - addib,<> -1, %r5, L(two_or_more) - fstd %fr25, -0x68(%r30) C high product to -0x68..-0x61 --L(one) -+.label L(one) - ldd -0x78(%r30), p032a1 - ldd -0x70(%r30), p032a2 - ldd -0x80(%r30), p000a - b L(0_one_out) - ldd -0x68(%r30), p064a - --L(two_or_more) -+.label L(two_or_more) - fldd 0(up), %fr4 - ldo 8(up), up - xmpyu %fr8R, %fr4L, %fr22 -@@ -164,7 +164,7 @@ - ldd -0x68(%r30), p064a - addib,<> -1, %r5, L(three_or_more) - fstd %fr25, -0x68(%r30) C high product to -0x68..-0x61 --L(two) -+.label L(two) - add p032a1, p032a2, m032 - add,dc %r0, %r0, m096 - depd,z m032, 31, 32, ma000 -@@ -173,7 +173,7 @@ - b L(0_two_out) - depd m096, 31, 32, ma064 - --L(three_or_more) -+.label L(three_or_more) - fldd 0(up), %fr4 - add p032a1, p032a2, m032 - add,dc %r0, %r0, m096 -@@ -182,7 +182,7 @@ - ldd 0(rp), r000 - dnl addib,= -1, %r5, L(0_out) - depd m096, 31, 32, ma064 --L(oop0) -+.label L(oop0) - dnl xmpyu %fr8R, %fr4L, %fr22 - dnl xmpyu %fr8L, %fr4R, %fr23 - dnl ldd -0x78(%r30), p032a1 -@@ -219,7 +219,7 @@ - dnl ldd 0(rp), r000 - dnl addib,<> -1, %r5, L(oop0) - dnl depd m096, 31, 32, ma064 --L(0_out) -+.label L(0_out) - ldo 8(up), up - xmpyu %fr8R, %fr4L, %fr22 - xmpyu %fr8L, %fr4R, %fr23 -@@ -247,7 +247,7 @@ - extrd,u m032, 31, 32, ma064 - ldd 0(rp), r000 - depd m096, 31, 32, ma064 --L(0_two_out) -+.label L(0_two_out) - ldd -0x78(%r30), p032a1 - ldd -0x70(%r30), p032a2 - ldo 8(rp), rp -@@ -260,7 +260,7 @@ - add r000, s000, s000 - add,dc %r0, climb, climb - std s000, -8(rp) --L(0_one_out) -+.label L(0_one_out) - add p032a1, p032a2, m032 - add,dc %r0, %r0, m096 - depd,z m032, 31, 32, ma000 -@@ -281,7 +281,7 @@ - - dnl 4-way unrolled code. - --L(BIG) -+.label L(BIG) - - define(`p032a1',`%r1') dnl - define(`p032a2',`%r19') dnl -@@ -337,7 +337,7 @@ - ',` extrd,u n, 61, 30, n C right shift 2, zero extend - ') - --L(4_or_more) -+.label L(4_or_more) - fldd 0(up), %fr4 - fldd 8(up), %fr5 - fldd 16(up), %fr6 -@@ -386,7 +386,7 @@ - b L(end1) - nop - --L(8_or_more) -+.label L(8_or_more) - fstd %fr28, -0x18(%r30) C mid product to -0x18..-0x11 - fstd %fr29, -0x10(%r30) C mid product to -0x10..-0x09 - ldo 32(up), up -@@ -433,7 +433,7 @@ - fstd %fr27, -0x50(%r30) C mid product to -0x50..-0x49 - addib,= -1, n, L(end2) - xmpyu %fr8L, %fr7L, %fr27 --L(oop) -+.label L(oop) - add p032a1, p032a2, m032 - ldd -0x80(%r30), p000a - add,dc p096b1, p096b2, m096 -@@ -550,7 +550,7 @@ - addib,<> -1, n, L(oop) - ldo 32(rp), rp - --L(end2) -+.label L(end2) - add p032a1, p032a2, m032 - ldd -0x80(%r30), p000a - add,dc p096b1, p096b2, m096 -@@ -616,7 +616,7 @@ - ldd -0x10(%r30), p224d2 - ldo 32(rp), rp - --L(end1) -+.label L(end1) - add p032a1, p032a2, m032 - ldd -0x80(%r30), p000a - add,dc p096b1, p096b2, m096 -@@ -671,7 +671,7 @@ - ldd -0xd8(%r30), %r8 - ldd -0xe0(%r30), %r7 - ldd -0xe8(%r30), %r6 --L(done) -+.label L(done) - ifdef(`HAVE_ABI_2_0w', - ` copy climb, %r28 - ',` extrd,u climb, 63, 32, %r29 ---- gmp/mpn/pa64/submul_1.asm -+++ gmp/mpn/pa64/submul_1.asm -@@ -139,14 +139,14 @@ - fstd %fr24, -0x80(%r30) C low product to -0x80..-0x79 - addib,<> -1, %r5, L(two_or_more) - fstd %fr25, -0x68(%r30) C high product to -0x68..-0x61 --L(one) -+.label L(one) - ldd -0x78(%r30), p032a1 - ldd -0x70(%r30), p032a2 - ldd -0x80(%r30), p000a - b L(0_one_out) - ldd -0x68(%r30), p064a - --L(two_or_more) -+.label L(two_or_more) - fldd 0(up), %fr4 - ldo 8(up), up - xmpyu %fr8R, %fr4L, %fr22 -@@ -162,7 +162,7 @@ - ldd -0x68(%r30), p064a - addib,<> -1, %r5, L(three_or_more) - fstd %fr25, -0x68(%r30) C high product to -0x68..-0x61 --L(two) -+.label L(two) - add p032a1, p032a2, m032 - add,dc %r0, %r0, m096 - depd,z m032, 31, 32, ma000 -@@ -171,7 +171,7 @@ - b L(0_two_out) - depd m096, 31, 32, ma064 - --L(three_or_more) -+.label L(three_or_more) - fldd 0(up), %fr4 - add p032a1, p032a2, m032 - add,dc %r0, %r0, m096 -@@ -180,7 +180,7 @@ - ldd 0(rp), r000 - dnl addib,= -1, %r5, L(0_out) - depd m096, 31, 32, ma064 --L(oop0) -+.label L(oop0) - dnl xmpyu %fr8R, %fr4L, %fr22 - dnl xmpyu %fr8L, %fr4R, %fr23 - dnl ldd -0x78(%r30), p032a1 -@@ -218,7 +218,7 @@ - dnl ldd 0(rp), r000 - dnl addib,<> -1, %r5, L(oop0) - dnl depd m096, 31, 32, ma064 --L(0_out) -+.label L(0_out) - ldo 8(up), up - xmpyu %fr8R, %fr4L, %fr22 - xmpyu %fr8L, %fr4R, %fr23 -@@ -247,7 +247,7 @@ - extrd,u m032, 31, 32, ma064 - ldd 0(rp), r000 - depd m096, 31, 32, ma064 --L(0_two_out) -+.label L(0_two_out) - ldd -0x78(%r30), p032a1 - ldd -0x70(%r30), p032a2 - ldo 8(rp), rp -@@ -261,7 +261,7 @@ - sub,db %r0, climb, climb - sub %r0, climb, climb - std s000, -8(rp) --L(0_one_out) -+.label L(0_one_out) - add p032a1, p032a2, m032 - add,dc %r0, %r0, m096 - depd,z m032, 31, 32, ma000 -@@ -283,7 +283,7 @@ - - dnl 4-way unrolled code. - --L(BIG) -+.label L(BIG) - - define(`p032a1',`%r1') dnl - define(`p032a2',`%r19') dnl -@@ -339,7 +339,7 @@ - ',` extrd,u n, 61, 30, n C right shift 2, zero extend - ') - --L(4_or_more) -+.label L(4_or_more) - fldd 0(up), %fr4 - fldd 8(up), %fr5 - fldd 16(up), %fr6 -@@ -388,7 +388,7 @@ - b L(end1) - nop - --L(8_or_more) -+.label L(8_or_more) - fstd %fr28, -0x18(%r30) C mid product to -0x18..-0x11 - fstd %fr29, -0x10(%r30) C mid product to -0x10..-0x09 - ldo 32(up), up -@@ -435,7 +435,7 @@ - fstd %fr27, -0x50(%r30) C mid product to -0x50..-0x49 - addib,= -1, n, L(end2) - xmpyu %fr8L, %fr7L, %fr27 --L(oop) -+.label L(oop) - add p032a1, p032a2, m032 - ldd -0x80(%r30), p000a - add,dc p096b1, p096b2, m096 -@@ -553,7 +553,7 @@ - addib,<> -1, n, L(oop) - ldo 32(rp), rp - --L(end2) -+.label L(end2) - add p032a1, p032a2, m032 - ldd -0x80(%r30), p000a - add,dc p096b1, p096b2, m096 -@@ -620,7 +620,7 @@ - ldd -0x10(%r30), p224d2 - ldo 32(rp), rp - --L(end1) -+.label L(end1) - add p032a1, p032a2, m032 - ldd -0x80(%r30), p000a - add,dc p096b1, p096b2, m096 -@@ -676,7 +676,7 @@ - ldd -0xd8(%r30), %r8 - ldd -0xe0(%r30), %r7 - ldd -0xe8(%r30), %r6 --L(done) -+.label L(done) - ifdef(`HAVE_ABI_2_0w', - ` copy climb, %r28 - ',` extrd,u climb, 63, 32, %r29 ---- gmp/mpn/pa64/udiv_qrnnd.asm -+++ gmp/mpn/pa64/udiv_qrnnd.asm -@@ -62,12 +62,13 @@ - ldw -60(%r30),%r23 - ') - ldi 0,q -- cmpib,*>= 0,d,large_divisor -+ cmpib,*>= 0,d,L(large_divisor) - ldi 8,%r31 C setup loop counter - - sub %r0,d,dn --Loop divstep divstep divstep divstep divstep divstep divstep divstep -- addib,<> -1,%r31,Loop -+.label L(Loop) -+ divstep divstep divstep divstep divstep divstep divstep divstep -+ addib,<> -1,%r31,L(Loop) - nop - - ifdef(`HAVE_ABI_2_0n', -@@ -77,7 +78,7 @@ - bve (%r2) - std n1,0(remptr) C store remainder - --large_divisor -+.label L(large_divisor) - extrd,u n0,63,1,%r19 C save lsb of dividend - shrpd n1,n0,1,n0 C n0 = lo(n1n0 >> 1) - shrpd %r0,n1,1,n1 C n1 = hi(n1n0 >> 1) -@@ -86,11 +87,12 @@ - add,l %r20,d,d C d = ceil(orig_d / 2) - - sub %r0,d,dn --Loop2 divstep divstep divstep divstep divstep divstep divstep divstep -- addib,<> -1,%r31,Loop2 -+.label L(Loop2) -+ divstep divstep divstep divstep divstep divstep divstep divstep -+ addib,<> -1,%r31,L(Loop2) - nop - -- cmpib,*= 0,%r20,even_divisor -+ cmpib,*= 0,%r20,L(even_divisor) - shladd n1,1,%r19,n1 C shift in omitted dividend lsb - - add d,d,d C restore orig... -@@ -105,7 +107,7 @@ - add,l n1,dn,n1 C adjust remainder - add,dc %r0,q,q C adjust quotient - --even_divisor -+.label L(even_divisor) - ifdef(`HAVE_ABI_2_0n', - ` copy %r28,%r29 - extrd,u %r28,31,32,%r28 ---- gmp/mpn/pa64/sub_n.asm -+++ gmp/mpn/pa64/sub_n.asm -@@ -47,35 +47,43 @@ - blr %r28, %r0 C branch into loop - sub rp, %r22, rp C offset rp and set carry - --L(loop) ldd 0(up), %r20 -+.label L(loop) -+ ldd 0(up), %r20 - ldd 0(vp), %r31 - sub,db %r20, %r31, %r20 - std %r20, 0(rp) --L(7) ldd 8(up), %r21 -+.label L(7) -+ ldd 8(up), %r21 - ldd 8(vp), %r19 - sub,db %r21, %r19, %r21 - std %r21, 8(rp) --L(6) ldd 16(up), %r20 -+.label L(6) -+ ldd 16(up), %r20 - ldd 16(vp), %r31 - sub,db %r20, %r31, %r20 - std %r20, 16(rp) --L(5) ldd 24(up), %r21 -+.label L(5) -+ ldd 24(up), %r21 - ldd 24(vp), %r19 - sub,db %r21, %r19, %r21 - std %r21, 24(rp) --L(4) ldd 32(up), %r20 -+.label L(4) -+ ldd 32(up), %r20 - ldd 32(vp), %r31 - sub,db %r20, %r31, %r20 - std %r20, 32(rp) --L(3) ldd 40(up), %r21 -+.label L(3) -+ ldd 40(up), %r21 - ldd 40(vp), %r19 - sub,db %r21, %r19, %r21 - std %r21, 40(rp) --L(2) ldd 48(up), %r20 -+.label L(2) -+ ldd 48(up), %r20 - ldd 48(vp), %r31 - sub,db %r20, %r31, %r20 - std %r20, 48(rp) --L(1) ldd 56(up), %r21 -+.label L(1) -+ ldd 56(up), %r21 - ldd 56(vp),%r19 - sub,db %r21, %r19, %r21 - ldo 64(up), up ---- gmp/longlong.h -+++ gmp/longlong.h -@@ -204,7 +204,7 @@ - /* These macros are for ABI=2.0w. In ABI=2.0n they can't be used, since GCC - (3.2) puts longlong into two adjacent 32-bit registers. Presumably this - is just a case of no direct support for 2.0n but treating it like 1.0. */ --#if defined (__GNUC__) && ! defined (_LONG_LONG_LIMB) -+#if defined (__GNUC__) && ! defined (_LONG_LONG_LIMB) && ! defined (__linux__) - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ - __asm__ ("add %4,%5,%1\n\tadd,dc %2,%3,%0" \ - : "=r" (sh), "=&r" (sl) \ diff --git a/dev-libs/gmp/files/ppc64-gmp-acinclude.patch b/dev-libs/gmp/files/ppc64-gmp-acinclude.patch deleted file mode 100644 index cb03d237f71c..000000000000 --- a/dev-libs/gmp/files/ppc64-gmp-acinclude.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- acinclude.m4.orig 2004-08-19 22:30:34.729944200 -0500 -+++ acinclude.m4 2004-08-19 22:31:02.021056464 -0500 -@@ -999,8 +999,8 @@ - for tmp_underscore in "" "_"; do - cat >conftes2.s <<EOF - $gmp_cv_asm_text -- $gmp_cv_asm_globl ${tmp_underscore}underscore_test --${tmp_underscore}underscore_test$gmp_cv_asm_label_suffix -+ $gmp_cv_asm_globl .${tmp_underscore}underscore_test -+.${tmp_underscore}underscore_test$gmp_cv_asm_label_suffix - EOF - case $host in - *-*-aix*) |