Update to GNU MP 4.2.1

Changes between GMP version 4.2 and 4.2.1

  Bugs:
  * Shared library numbers corrected.
  * Broken support for 32-bit AIX fixed.
  * Misc minor fixes.

  Speedups:
  * Exact division (mpz_divexact) now falls back to plain division for large
    operands.

  Features:
  * Support for some new systems.


Changes between GMP version 4.1.4 and 4.2

  Bugs:
  * Minor bug fixes and code generalizations.
  * Expanded and improved test suite.

  Speedups:
  * Many minor optimizations, too many to mention here.
  * Division now always subquadratic.
  * Computation of n-factorial much faster.
  * Added basic x86-64 assembly code.
  * Floating-point output is now subquadratic for all bases.
  * FFT multiply code now about 25% faster.
  * Toom3 multiply code faster.

  Features:
  * Much improved configure.
  * Workarounds for many more compiler bugs.
  * Temporary allocations are now made on the stack only if small.
  * New systems supported: HPPA-2.0 gcc, IA-64 HP-UX, PowerPC-64 Darwin,
    Sparc64 GNU/Linux.
  * New i386 fat binaries, selecting optimised code at runtime (--enable-fat).
  * New build option: --enable-profiling=instrument.
  * New memory function: mp_get_memory_functions.
  * New Mersenne Twister random numbers: gmp_randinit_mt, also now used for
    gmp_randinit_default.
  * New random functions: gmp_randinit_set, gmp_urandomb_ui, gmp_urandomm_ui.
  * New integer functions: mpz_combit, mpz_rootrem.
  * gmp_printf etc new type "M" for mp_limb_t.
  * gmp_scanf and friends now accept C99 hex floats.
  * Numeric input and output can now be in bases up to 62.
  * Comparisons mpz_cmp_d, mpz_cmpabs_d, mpf_cmp_d recognise infinities.
  * Conversions mpz_get_d, mpq_get_d, mpf_get_d truncate towards zero,
    previously their behaviour was unspecified.
  * Fixes for overflow issues with operands >= 2^31 bits.

  Caveats:
  * mpfr is gone, and will from now on be released only separately.  Please see
    www.mpfr.org.

6 files changed, 13 insertions, 429 deletions

diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index 8c0f595f1c8..9741f37e2a4 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2006/12/02 22:32:59 jschauma Exp $
+# $NetBSD: Makefile,v 1.42 2006/12/09 03:38:16 jnemeth Exp $
 
-DISTNAME=	gmp-4.1.4
-PKGREVISION=	1
+DISTNAME=	gmp-4.2.1
 CATEGORIES=	devel math
 MASTER_SITES=	${MASTER_SITE_GNU:=gmp/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gmp/buildlink3.mk b/devel/gmp/buildlink3.mk
index d4e5c5e9eda..b7878b17f1c 100644
--- a/devel/gmp/buildlink3.mk
+++ b/devel/gmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/09 03:38:16 jnemeth Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GMP_BUILDLINK3_MK:=	${GMP_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	gmp
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gmp
 
 .if !empty(GMP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gmp+=		gmp>=4.1.2
-BUILDLINK_ABI_DEPENDS.gmp+=	gmp>=4.1.3nb1
+BUILDLINK_API_DEPENDS.gmp+=		gmp>=4.2.1
+BUILDLINK_ABI_DEPENDS.gmp+=	gmp>=4.2.1
 BUILDLINK_PKGSRCDIR.gmp?=	../../devel/gmp
 .endif	# GMP_BUILDLINK3_MK
 
diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo
index 657a795874b..70f963f3461 100644
--- a/devel/gmp/distinfo
+++ b/devel/gmp/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.17 2005/11/02 04:38:42 hiramatsu Exp $
+$NetBSD: distinfo,v 1.18 2006/12/09 03:38:16 jnemeth Exp $
 
-SHA1 (gmp-4.1.4.tar.bz2) = 21bf0e934fb31784487827f358e00077602145e7
-RMD160 (gmp-4.1.4.tar.bz2) = bde4d1f217606f79490372eed8356039b06d4aac
-Size (gmp-4.1.4.tar.bz2) = 1681267 bytes
-SHA1 (patch-aa) = 6e143257bd0ce6a99fa81fc2e2b4476c7be77077
-SHA1 (patch-ab) = 6c8eccf2c483018f7e1326899924d88554a39edf
-SHA1 (patch-ac) = f973bcbc916f16057e4a91adbb65a63f71944617
+SHA1 (gmp-4.2.1.tar.bz2) = 00a97f0ec1eb1d9429ab5c64be6889e8a497425e
+RMD160 (gmp-4.2.1.tar.bz2) = 831e02a36ac7b466857f8fafeffad7d51f7656e7
+Size (gmp-4.2.1.tar.bz2) = 1726453 bytes
+SHA1 (patch-aa) = a53db34c8ecf38d6556a59a0fa7382456c30fab6
diff --git a/devel/gmp/patches/patch-aa b/devel/gmp/patches/patch-aa
index 8ae20599425..c8240026b66 100644
--- a/devel/gmp/patches/patch-aa
+++ b/devel/gmp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2004/08/18 12:41:32 adam Exp $
+$NetBSD: patch-aa,v 1.11 2006/12/09 03:38:16 jnemeth Exp $
 
---- longlong.h.orig	2004-08-18 14:29:33.000000000 +0000
+--- longlong.h.orig	2006-12-08 17:56:28.000000000 -0800
 +++ longlong.h
-@@ -738,8 +738,10 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO (
+@@ -826,8 +826,10 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO (
     count is only an int. */
  #define count_trailing_zeros(count, x)					\
    do {									\
diff --git a/devel/gmp/patches/patch-ab b/devel/gmp/patches/patch-ab
deleted file mode 100644
index f45d8d1e20e..00000000000
--- a/devel/gmp/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/03/15 15:51:30 wiz Exp $
-
---- gmp-impl.h.orig	2004-04-23 01:59:53.000000000 +0200
-+++ gmp-impl.h
-@@ -2466,7 +2466,8 @@ typedef unsigned int UHWtype;
- 
- /* Define ieee_double_extract and _GMP_IEEE_FLOATS.  */
- 
--#if (defined (__arm__) && (defined (__ARMWEL__) || defined (__linux__)))
-+#if (defined (__arm__) && !defined(__VFP_FP__) \
-+    && (defined (__ARMWEL__) || defined (__linux__)))
- /* Special case for little endian ARM since floats remain in big-endian.  */
- #define _GMP_IEEE_FLOATS 1
- union ieee_double_extract
-@@ -2483,6 +2484,7 @@ union ieee_double_extract
- #else
- #if defined (_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__)		\
-  || defined (__alpha)							\
-+ || (defined (__arm__) && defined (__VFP_FP__) && defined (__ARMEL__))	\
-  || defined (__clipper__)						\
-  || defined (__cris)							\
-  || defined (__i386__)							\
diff --git a/devel/gmp/patches/patch-ac b/devel/gmp/patches/patch-ac
deleted file mode 100644
index ea4eb372870..00000000000
--- a/devel/gmp/patches/patch-ac
+++ /dev/null
@@ -1,391 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2005/11/02 04:38:43 hiramatsu Exp $
-
---- configure.orig	Tue Sep 21 22:06:47 2004
-+++ configure	Wed Nov  2 09:15:07 2005
-@@ -2269,7 +2269,7 @@
- echo "include_mpn(\`mips32/mips-defs.m4')" >> $gmp_tmpconfigm4i
- 
-     case $host in
--      mips64*-*-* | mips*-*-irix6789*)
-+      mips64*-*-* | mips*-*-irix6*)
-         abilist="n32 64 o32"
- 
-         cclist_n32="gcc cc"
-@@ -2844,14 +2844,14 @@
-   ac_status=$?
-   echo "$as_me:2845: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  rm -f conftest*
-+  rm -rf conftest*
-   echo "$as_me:2848: checking whether $cc is gcc" >&5
- echo $ECHO_N "checking whether $cc is gcc... $ECHO_C" >&6
-   echo "$as_me:2850: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   ccbase=gcc
- else
--  rm -f conftest*
-+  rm -rf conftest*
-   :
- fi
- 
-@@ -2941,7 +2941,7 @@
-     gmp_prog_cc_works=yes
-   fi
- fi
--rm -f conftest* a.out a.exe
-+rm -rf conftest* a.out a.exe
- echo "$as_me:2945: result: $gmp_prog_cc_works" >&5
- echo "${ECHO_T}$gmp_prog_cc_works" >&6
- if test $gmp_prog_cc_works = yes; then
-@@ -3037,7 +3037,7 @@
-     result=no
-   fi
- fi
--rm -f conftest.*
-+rm -rf conftest.*
- echo "$as_me:3041: result: $result" >&5
- echo "${ECHO_T}$result" >&6
- if test $result = yes; then
-@@ -3135,7 +3135,7 @@
-     fi
-   fi
-   cat conftest.out >&5
--  rm -f conftest* a.out
-+  rm -rf conftest* a.out
-   echo "$as_me:3139: result: $result" >&5
- echo "${ECHO_T}$result" >&6
-   if test "$result" = yes; then
-@@ -3168,7 +3168,7 @@
-   fi
- fi
- cat conftest.out >&5
--rm -f conftest*
-+rm -rf conftest*
- echo "$as_me:3172: result: $result" >&5
- echo "${ECHO_T}$result" >&6
- if test "$result" = yes; then
-@@ -3228,7 +3228,7 @@
-     gmp_prog_cc_works=yes
-   fi
- fi
--rm -f conftest* a.out a.exe
-+rm -rf conftest* a.out a.exe
- echo "$as_me:3232: result: $gmp_prog_cc_works" >&5
- echo "${ECHO_T}$gmp_prog_cc_works" >&6
- if test $gmp_prog_cc_works = yes; then
-@@ -3749,11 +3749,11 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--rm -f conftest$ac_cv_exeext
-+rm -rf conftest$ac_cv_exeext
- echo "$as_me:3753: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6
- 
--rm -f conftest.$ac_ext
-+rm -rf conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
- echo "$as_me:3759: checking for object suffix" >&5
-@@ -3995,7 +3995,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
--rm -f conftest*
-+rm -rf conftest*
- if test -n "$ac_declaration"; then
-   echo '#ifdef __cplusplus' >>confdefs.h
-   echo $ac_declaration      >>confdefs.h
-@@ -4744,7 +4744,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
--rm -f conftest*
-+rm -rf conftest*
- if test -n "$ac_declaration"; then
-   echo '#ifdef __cplusplus' >>confdefs.h
-   echo $ac_declaration      >>confdefs.h
-@@ -4869,13 +4869,13 @@
-   ac_status=$?
-   echo "$as_me:4870: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  rm -f conftest*
-+  rm -rf conftest*
-   echo "$as_me:4873: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   want_cxx=yes
-       break
- else
--  rm -f conftest*
-+  rm -rf conftest*
-   echo "$as_me:4879: result: no" >&5
- echo "${ECHO_T}no" >&6
-   :
-@@ -5119,7 +5119,7 @@
- else
-   add_path="cray/cfp"; extra_functions="mulwwc90"
- fi
--rm -f conftest*
-+rm -rf conftest*
-  ;;
-   j90 | sv1)
-     extra_functions="mulwwj90"
-@@ -5329,7 +5329,7 @@
- else
-   ac_cv_header_stdc=no
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- 
-@@ -5347,7 +5347,7 @@
- else
-   ac_cv_header_stdc=no
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- 
-@@ -5774,7 +5774,7 @@
-         fi
-       fi
-     done
--    rm -f conftest*
-+    rm -rf conftest*
-     if test -z "$gmp_cv_prog_host_cc"; then
-       { { echo "$as_me:5779: error: cannot find a build system compiler" >&5
- echo "$as_me: error: cannot find a build system compiler" >&2;}
-@@ -6835,7 +6835,7 @@
-   # Check to see that the pipe works correctly.
-   pipe_works=no
- 
--  rm -f conftest*
-+  rm -rf conftest*
-   cat > conftest.$ac_ext <<EOF
- #ifdef __cplusplus
- extern "C" {
-@@ -6932,7 +6932,7 @@
-     echo "$progname: failed program was:" >&5
-     cat conftest.$ac_ext >&5
-   fi
--  rm -f conftest* conftst*
-+  rm -rf conftest* conftst*
- 
-   # Do not use the global_symbol_pipe unless it works.
-   if test "$pipe_works" = yes; then
-@@ -16362,7 +16362,7 @@
-   cat conftest.s >&5
-   gmp_cv_asm_x86_mmx=no
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- echo "$as_me:16368: result: $gmp_cv_asm_x86_mmx" >&5
-@@ -16445,7 +16445,7 @@
-   cat conftest.s >&5
-   gmp_cv_asm_x86_sse2=no
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- echo "$as_me:16451: result: $gmp_cv_asm_x86_sse2" >&5
-@@ -16541,7 +16541,7 @@
- else
-   ac_cv_header_stdc=no
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- 
-@@ -16559,7 +16559,7 @@
- else
-   ac_cv_header_stdc=no
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- 
-@@ -17376,7 +17376,7 @@
- else
-   ac_cv_c_stringize=yes
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- echo "$as_me:17382: result: $ac_cv_c_stringize" >&5
-@@ -17566,7 +17566,7 @@
-   gmp_cv_c_attribute_malloc=no
- fi
- cat conftest.out >&5
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- echo "$as_me:17572: result: $gmp_cv_c_attribute_malloc" >&5
-@@ -19405,10 +19405,10 @@
-   cat conftest.s >&5
-   :
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- done
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- echo "$as_me:19414: result: $gmp_cv_asm_type" >&5
-@@ -19441,7 +19441,7 @@
-   cat conftest.s >&5
-   :
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- echo "$as_me:19447: result: $gmp_cv_asm_size" >&5
-@@ -19491,10 +19491,10 @@
-   cat conftest.s >&5
-   :
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- done
--rm -f conftest*
-+rm -rf conftest*
- if test -z "$gmp_cv_asm_lsym_prefix"; then
-   gmp_cv_asm_lsym_prefix=L
-   { echo "$as_me:19500: WARNING: cannot determine local label, using default $gmp_cv_asm_lsym_prefix" >&5
-@@ -19553,10 +19553,10 @@
-   cat conftest.s >&5
-   :
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
-     done
--    rm -f conftest*
-+    rm -rf conftest*
-     ;;
- esac
- if test -z "$gmp_cv_asm_w32"; then
-@@ -19606,7 +19606,7 @@
- echo "$as_me: error: cannot assemble alignment test" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- echo "$as_me:19612: result: $gmp_cv_asm_align_log" >&5
-@@ -19636,7 +19636,7 @@
-   (exit $ac_status); }; then
-   cat conftest.out >&5
-   gmp_cv_asm_m68k_instruction=$i
--    rm -f conftest*
-+    rm -rf conftest*
-     break
- else
-   cat conftest.out >&5
-@@ -19644,7 +19644,7 @@
-   cat conftest.s >&5
-   :
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- done
- 
-@@ -19720,10 +19720,10 @@
- echo "$as_me: error: cannot determine assembler addressing style" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- echo "$as_me:19729: result: $gmp_cv_asm_m68k_addressing" >&5
-@@ -19751,7 +19751,7 @@
-   (exit $ac_status); }; then
-   cat conftest.out >&5
-   gmp_cv_asm_m68k_branches=$i
--  rm -f conftest*
-+  rm -rf conftest*
-   break
- else
-   cat conftest.out >&5
-@@ -19759,7 +19759,7 @@
-   cat conftest.s >&5
-   :
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- done
- 
-@@ -19818,10 +19818,10 @@
- echo "$as_me: error: neither \"mtctr 6\" nor \"mtctr r6\" works" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- echo "$as_me:19827: result: $gmp_cv_asm_powerpc_r_registers" >&5
-@@ -19884,7 +19884,7 @@
-   cat conftest.s >&5
-   gmp_cv_asm_sparc_register=no
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- echo "$as_me:19890: result: $gmp_cv_asm_sparc_register" >&5
-@@ -19927,7 +19927,7 @@
-   cat conftest.s >&5
-   gmp_cv_asm_align_fill_0x90=no
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- echo "$as_me:19933: result: $gmp_cv_asm_align_fill_0x90" >&5
-@@ -19958,7 +19958,7 @@
-   cat conftest.s >&5
-   gmp_cv_asm_x86_shldl_cl=no
- fi
--rm -f conftest*
-+rm -rf conftest*
- 
- fi
- echo "$as_me:19964: result: $gmp_cv_asm_x86_shldl_cl" >&5
-@@ -20052,13 +20052,6 @@
- echo "${ECHO_T}determined" >&6
- 
-       fi
--      case $host in
--        *-*-openbsd*)
--
--echo 'define(<_GLOBAL_OFFSET_TABLE_>, <__GLOBAL_OFFSET_TABLE_>)' >>$gmp_tmpconfigm4
--
--          ;;
--      esac
-       ;;
-   esac
- fi