Regenerate

19 files changed, 220 insertions, 152 deletions

diff --git a/Makefile.in b/Makefile.in
index d0a3a1bb1..f6f0c41d2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 1991, 1993, 1994, 1996, 1997, 1999, 2000, 2001 Free Software
 # Foundation, Inc.
@@ -174,7 +175,7 @@ lib_LTLIBRARIES = libgmp.la $(MPBSD_LTLIBRARIES_OPTION)
 
 EXTRA_DIST = doc macos \
   configfsf.guess configfsf.sub .gdbinit gmp-h.in gmp-impl.h mp-h.in \
-  INSTALL.autoconf longlong.h stack-alloc.h urandom.h
+  INSTALL.autoconf longlong.h stack-alloc.h
 
 
 DISTCLEANFILES = $(nodist_include_HEADERS) asm-syntax.h config.m4 \
@@ -208,13 +209,16 @@ MPZ_OBJECTS = mpz/abs$U.lo mpz/add$U.lo mpz/add_ui$U.lo			\
   mpz/addmul_ui$U.lo mpz/and$U.lo mpz/array_init$U.lo mpz/bin_ui$U.lo	\
   mpz/bin_uiui$U.lo mpz/cdiv_q$U.lo mpz/cdiv_q_ui$U.lo			\
   mpz/cdiv_qr$U.lo mpz/cdiv_qr_ui$U.lo mpz/cdiv_r$U.lo			\
-  mpz/cdiv_r_ui$U.lo mpz/cdiv_ui$U.lo mpz/clear$U.lo mpz/clrbit$U.lo	\
+  mpz/cdiv_r_ui$U.lo mpz/cdiv_ui$U.lo					\
+  mpz/cfdiv_q_2exp$U.lo mpz/cfdiv_r_2exp$U.lo				\
+  mpz/clear$U.lo mpz/clrbit$U.lo					\
   mpz/cmp$U.lo mpz/cmp_si$U.lo mpz/cmp_ui$U.lo mpz/cmpabs$U.lo		\
   mpz/cmpabs_ui$U.lo mpz/com$U.lo					\
-  mpz/divexact$U.lo mpz/divegcd$U.lo mpz/dump$U.lo			\
-  mpz/fac_ui$U.lo mpz/fdiv_q$U.lo mpz/fdiv_q_2exp$U.lo			\
+  mpz/divexact$U.lo mpz/divegcd$U.lo					\
+  mpz/divis$U.lo mpz/divis_ui$U.lo mpz/divis_2exp$U.lo mpz/dump$U.lo	\
+  mpz/fac_ui$U.lo mpz/fdiv_q$U.lo					\
   mpz/fdiv_q_ui$U.lo mpz/fdiv_qr$U.lo mpz/fdiv_qr_ui$U.lo		\
-  mpz/fdiv_r$U.lo mpz/fdiv_r_2exp$U.lo mpz/fdiv_r_ui$U.lo		\
+  mpz/fdiv_r$U.lo mpz/fdiv_r_ui$U.lo					\
   mpz/fdiv_ui$U.lo mpz/fib_ui$U.lo mpz/fits_sint$U.lo			\
   mpz/fits_slong$U.lo mpz/fits_sshort$U.lo mpz/fits_uint$U.lo		\
   mpz/fits_ulong$U.lo mpz/fits_ushort$U.lo mpz/gcd$U.lo			\
@@ -275,7 +279,7 @@ MPBSD_OBJECTS = mpbsd/add$U.lo mpbsd/tdiv_qr$U.lo mpbsd/set$U.lo	\
 libgmp_la_SOURCES = \
   assert.c compat.c errno.c extract-dbl.c insert-dbl.c memory.c		\
   mp_bpl.c mp_clz_tab.c mp_minv_tab.c mp_set_fns.c			\
-  rand.c randclr.c randlc.c randlc2x.c randraw.c randsd.c randsdui.c	\
+  rand.c randclr.c randlc.c randlc2x.c randraw.c rands.c randsd.c randsdui.c \
   stack-alloc.c version.c 
 
 libgmp_la_DEPENDENCIES = \
@@ -295,7 +299,8 @@ libgmp_la_LDFLAGS = $(GMP_LDFLAGS) \
 libmp_la_SOURCES = assert.c errno.c memory.c mp_bpl.c mp_clz_tab.c	\
   mp_minv_tab.c mp_set_fns.c stack-alloc.c
 
-libmp_la_DEPENDENCIES = $(MPBSD_OBJECTS) $(MPN_OBJECTS) \
+MPN_OBJS_IN_LIBMP = @mpn_objs_in_libmp@
+libmp_la_DEPENDENCIES = $(MPBSD_OBJECTS) $(MPN_OBJS_IN_LIBMP) \
   mpz/add$U.lo mpz/clear$U.lo mpz/cmp$U.lo mpz/init$U.lo mpz/mod$U.lo	\
   mpz/mul$U.lo mpz/mul_2exp$U.lo mpz/n_pow_ui$U.lo			\
   mpz/realloc$U.lo mpz/set$U.lo						\
@@ -323,8 +328,8 @@ ANSI2KNR = @ANSI2KNR@
 am_libgmp_la_OBJECTS =  assert$U.lo compat$U.lo errno$U.lo \
 extract-dbl$U.lo insert-dbl$U.lo memory$U.lo mp_bpl$U.lo \
 mp_clz_tab$U.lo mp_minv_tab$U.lo mp_set_fns$U.lo rand$U.lo randclr$U.lo \
-randlc$U.lo randlc2x$U.lo randraw$U.lo randsd$U.lo randsdui$U.lo \
-stack-alloc$U.lo version$U.lo
+randlc$U.lo randlc2x$U.lo randraw$U.lo rands$U.lo randsd$U.lo \
+randsdui$U.lo stack-alloc$U.lo version$U.lo
 libgmp_la_OBJECTS =  $(am_libgmp_la_OBJECTS)
 am_libmp_la_OBJECTS =  assert$U.lo errno$U.lo memory$U.lo mp_bpl$U.lo \
 mp_clz_tab$U.lo mp_minv_tab$U.lo mp_set_fns$U.lo stack-alloc$U.lo
@@ -515,6 +520,8 @@ randlc2x_.c: randlc2x.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/randlc2x.c; then echo $(srcdir)/randlc2x.c; else echo randlc2x.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > randlc2x_.c
 randraw_.c: randraw.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/randraw.c; then echo $(srcdir)/randraw.c; else echo randraw.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > randraw_.c
+rands_.c: rands.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rands.c; then echo $(srcdir)/rands.c; else echo rands.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rands_.c
 randsd_.c: randsd.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/randsd.c; then echo $(srcdir)/randsd.c; else echo randsd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > randsd_.c
 randsdui_.c: randsdui.c $(ANSI2KNR)
@@ -530,9 +537,10 @@ mp_bpl_.$(OBJEXT) mp_bpl_.lo mp_clz_tab_.$(OBJEXT) mp_clz_tab_.lo \
 mp_minv_tab_.$(OBJEXT) mp_minv_tab_.lo mp_set_fns_.$(OBJEXT) \
 mp_set_fns_.lo rand_.$(OBJEXT) rand_.lo randclr_.$(OBJEXT) randclr_.lo \
 randlc_.$(OBJEXT) randlc_.lo randlc2x_.$(OBJEXT) randlc2x_.lo \
-randraw_.$(OBJEXT) randraw_.lo randsd_.$(OBJEXT) randsd_.lo \
-randsdui_.$(OBJEXT) randsdui_.lo stack-alloc_.$(OBJEXT) stack-alloc_.lo \
-version_.$(OBJEXT) version_.lo : $(ANSI2KNR)
+randraw_.$(OBJEXT) randraw_.lo rands_.$(OBJEXT) rands_.lo \
+randsd_.$(OBJEXT) randsd_.lo randsdui_.$(OBJEXT) randsdui_.lo \
+stack-alloc_.$(OBJEXT) stack-alloc_.lo version_.$(OBJEXT) version_.lo : \
+$(ANSI2KNR)
 
 $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@stamp-vti
 	@:
diff --git a/demos/Makefile.in b/demos/Makefile.in
index eba242bd1..4ddeaded8 100644
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 2000, 2001 Free Software Foundation, Inc.
 #
diff --git a/demos/calc/Makefile.in b/demos/calc/Makefile.in
index 866ee6cef..24a208edb 100644
--- a/demos/calc/Makefile.in
+++ b/demos/calc/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 2000, 2001 Free Software Foundation, Inc.
 #
diff --git a/demos/expr/Makefile.in b/demos/expr/Makefile.in
index 824950d53..9caf25245 100644
--- a/demos/expr/Makefile.in
+++ b/demos/expr/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 2001 Free Software Foundation, Inc.
 #
diff --git a/mpbsd/Makefile.in b/mpbsd/Makefile.in
index 6d496d34d..e171471d4 100644
--- a/mpbsd/Makefile.in
+++ b/mpbsd/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 1996, 1999, 2000, 2001 Free Software Foundation, Inc.
 #
diff --git a/mpf/Makefile.in b/mpf/Makefile.in
index e8873fd0f..e5a8db24a 100644
--- a/mpf/Makefile.in
+++ b/mpf/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 #
diff --git a/mpfr/Makefile.in b/mpfr/Makefile.in
index 917458631..3f05cfd2c 100644
--- a/mpfr/Makefile.in
+++ b/mpfr/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 2000, 2001 Free Software Foundation, Inc.
 #
diff --git a/mpfr/tests/Makefile.in b/mpfr/tests/Makefile.in
index f67670a3f..4f2fd766e 100644
--- a/mpfr/tests/Makefile.in
+++ b/mpfr/tests/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 2000, 2001 Free Software Foundation, Inc.
 #
diff --git a/mpn/Makefile.in b/mpn/Makefile.in
index 7db41635b..3d7b5fe8f 100644
--- a/mpn/Makefile.in
+++ b/mpn/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 #
@@ -157,7 +158,8 @@ OFILES = @mpn_objects@
 EXTRA_LTLIBRARIES = libdummy.la
 nodist_libdummy_la_SOURCES = \
   add_n.c addmul_1.c and_n.c andn_n.c bdivmod.c com_n.c copyd.c copyi.c	    \
-  dc_divrem_n.c cmp.c diveby3.c divrem.c divrem_1.c divrem_2.c dump.c gcd.c \
+  dc_divrem_n.c cmp.c                                                       \
+  diveby3.c divis.c divrem.c divrem_1.c divrem_2.c dump.c gcd.c             \
   gcd_finda.c gcd_1.c gcdext.c get_str.c hamdist.c inlines.c invert_limb.c  \
   ior_n.c iorn_n.c jacbase.c lshift.c mod_1.c mode1o.c mul.c mul_1.c	    \
   mul_fft.c mul_n.c mul_basecase.c nand_n.c nior_n.c perfsqr.c popcount.c   \
@@ -213,16 +215,16 @@ libdummy_la_LDFLAGS =
 libdummy_la_LIBADD = 
 nodist_libdummy_la_OBJECTS =  add_n$U.lo addmul_1$U.lo and_n$U.lo \
 andn_n$U.lo bdivmod$U.lo com_n$U.lo copyd$U.lo copyi$U.lo \
-dc_divrem_n$U.lo cmp$U.lo diveby3$U.lo divrem$U.lo divrem_1$U.lo \
-divrem_2$U.lo dump$U.lo gcd$U.lo gcd_finda$U.lo gcd_1$U.lo gcdext$U.lo \
-get_str$U.lo hamdist$U.lo inlines$U.lo invert_limb$U.lo ior_n$U.lo \
-iorn_n$U.lo jacbase$U.lo lshift$U.lo mod_1$U.lo mode1o$U.lo mul$U.lo \
-mul_1$U.lo mul_fft$U.lo mul_n$U.lo mul_basecase$U.lo nand_n$U.lo \
-nior_n$U.lo perfsqr$U.lo popcount$U.lo pre_mod_1$U.lo random$U.lo \
-random2$U.lo rshift$U.lo sb_divrem_mn$U.lo scan0$U.lo scan1$U.lo \
-set_str$U.lo sqr_basecase$U.lo sqr_diagonal$U.lo sqrtrem$U.lo \
-sub_n$U.lo submul_1$U.lo tdiv_qr$U.lo udiv_qrnnd$U.lo udiv_w_sdiv$U.lo \
-xor_n$U.lo xnor_n$U.lo
+dc_divrem_n$U.lo cmp$U.lo diveby3$U.lo divis$U.lo divrem$U.lo \
+divrem_1$U.lo divrem_2$U.lo dump$U.lo gcd$U.lo gcd_finda$U.lo \
+gcd_1$U.lo gcdext$U.lo get_str$U.lo hamdist$U.lo inlines$U.lo \
+invert_limb$U.lo ior_n$U.lo iorn_n$U.lo jacbase$U.lo lshift$U.lo \
+mod_1$U.lo mode1o$U.lo mul$U.lo mul_1$U.lo mul_fft$U.lo mul_n$U.lo \
+mul_basecase$U.lo nand_n$U.lo nior_n$U.lo perfsqr$U.lo popcount$U.lo \
+pre_mod_1$U.lo random$U.lo random2$U.lo rshift$U.lo sb_divrem_mn$U.lo \
+scan0$U.lo scan1$U.lo set_str$U.lo sqr_basecase$U.lo sqr_diagonal$U.lo \
+sqrtrem$U.lo sub_n$U.lo submul_1$U.lo tdiv_qr$U.lo udiv_qrnnd$U.lo \
+udiv_w_sdiv$U.lo xor_n$U.lo xnor_n$U.lo
 libdummy_la_OBJECTS =  $(nodist_libdummy_la_OBJECTS)
 libmpn_la_LDFLAGS = 
 am_libmpn_la_OBJECTS =  mp_bases$U.lo
@@ -332,6 +334,8 @@ dc_divrem_n_.c: dc_divrem_n.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dc_divrem_n.c; then echo $(srcdir)/dc_divrem_n.c; else echo dc_divrem_n.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dc_divrem_n_.c
 diveby3_.c: diveby3.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/diveby3.c; then echo $(srcdir)/diveby3.c; else echo diveby3.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > diveby3_.c
+divis_.c: divis.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/divis.c; then echo $(srcdir)/divis.c; else echo divis.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > divis_.c
 divrem_.c: divrem.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/divrem.c; then echo $(srcdir)/divrem.c; else echo divrem.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > divrem_.c
 divrem_1_.c: divrem_1.c $(ANSI2KNR)
@@ -429,29 +433,30 @@ and_n_.$(OBJEXT) and_n_.lo andn_n_.$(OBJEXT) andn_n_.lo \
 bdivmod_.$(OBJEXT) bdivmod_.lo cmp_.$(OBJEXT) cmp_.lo com_n_.$(OBJEXT) \
 com_n_.lo copyd_.$(OBJEXT) copyd_.lo copyi_.$(OBJEXT) copyi_.lo \
 dc_divrem_n_.$(OBJEXT) dc_divrem_n_.lo diveby3_.$(OBJEXT) diveby3_.lo \
-divrem_.$(OBJEXT) divrem_.lo divrem_1_.$(OBJEXT) divrem_1_.lo \
-divrem_2_.$(OBJEXT) divrem_2_.lo dump_.$(OBJEXT) dump_.lo \
-gcd_.$(OBJEXT) gcd_.lo gcd_1_.$(OBJEXT) gcd_1_.lo gcd_finda_.$(OBJEXT) \
-gcd_finda_.lo gcdext_.$(OBJEXT) gcdext_.lo get_str_.$(OBJEXT) \
-get_str_.lo hamdist_.$(OBJEXT) hamdist_.lo inlines_.$(OBJEXT) \
-inlines_.lo invert_limb_.$(OBJEXT) invert_limb_.lo ior_n_.$(OBJEXT) \
-ior_n_.lo iorn_n_.$(OBJEXT) iorn_n_.lo jacbase_.$(OBJEXT) jacbase_.lo \
-lshift_.$(OBJEXT) lshift_.lo mod_1_.$(OBJEXT) mod_1_.lo \
-mode1o_.$(OBJEXT) mode1o_.lo mp_bases_.$(OBJEXT) mp_bases_.lo \
-mul_.$(OBJEXT) mul_.lo mul_1_.$(OBJEXT) mul_1_.lo \
-mul_basecase_.$(OBJEXT) mul_basecase_.lo mul_fft_.$(OBJEXT) mul_fft_.lo \
-mul_n_.$(OBJEXT) mul_n_.lo nand_n_.$(OBJEXT) nand_n_.lo \
-nior_n_.$(OBJEXT) nior_n_.lo perfsqr_.$(OBJEXT) perfsqr_.lo \
-popcount_.$(OBJEXT) popcount_.lo pre_mod_1_.$(OBJEXT) pre_mod_1_.lo \
-random_.$(OBJEXT) random_.lo random2_.$(OBJEXT) random2_.lo \
-rshift_.$(OBJEXT) rshift_.lo sb_divrem_mn_.$(OBJEXT) sb_divrem_mn_.lo \
-scan0_.$(OBJEXT) scan0_.lo scan1_.$(OBJEXT) scan1_.lo \
-set_str_.$(OBJEXT) set_str_.lo sqr_basecase_.$(OBJEXT) sqr_basecase_.lo \
-sqr_diagonal_.$(OBJEXT) sqr_diagonal_.lo sqrtrem_.$(OBJEXT) sqrtrem_.lo \
-sub_n_.$(OBJEXT) sub_n_.lo submul_1_.$(OBJEXT) submul_1_.lo \
-tdiv_qr_.$(OBJEXT) tdiv_qr_.lo udiv_qrnnd_.$(OBJEXT) udiv_qrnnd_.lo \
-udiv_w_sdiv_.$(OBJEXT) udiv_w_sdiv_.lo xnor_n_.$(OBJEXT) xnor_n_.lo \
-xor_n_.$(OBJEXT) xor_n_.lo : $(ANSI2KNR)
+divis_.$(OBJEXT) divis_.lo divrem_.$(OBJEXT) divrem_.lo \
+divrem_1_.$(OBJEXT) divrem_1_.lo divrem_2_.$(OBJEXT) divrem_2_.lo \
+dump_.$(OBJEXT) dump_.lo gcd_.$(OBJEXT) gcd_.lo gcd_1_.$(OBJEXT) \
+gcd_1_.lo gcd_finda_.$(OBJEXT) gcd_finda_.lo gcdext_.$(OBJEXT) \
+gcdext_.lo get_str_.$(OBJEXT) get_str_.lo hamdist_.$(OBJEXT) \
+hamdist_.lo inlines_.$(OBJEXT) inlines_.lo invert_limb_.$(OBJEXT) \
+invert_limb_.lo ior_n_.$(OBJEXT) ior_n_.lo iorn_n_.$(OBJEXT) iorn_n_.lo \
+jacbase_.$(OBJEXT) jacbase_.lo lshift_.$(OBJEXT) lshift_.lo \
+mod_1_.$(OBJEXT) mod_1_.lo mode1o_.$(OBJEXT) mode1o_.lo \
+mp_bases_.$(OBJEXT) mp_bases_.lo mul_.$(OBJEXT) mul_.lo \
+mul_1_.$(OBJEXT) mul_1_.lo mul_basecase_.$(OBJEXT) mul_basecase_.lo \
+mul_fft_.$(OBJEXT) mul_fft_.lo mul_n_.$(OBJEXT) mul_n_.lo \
+nand_n_.$(OBJEXT) nand_n_.lo nior_n_.$(OBJEXT) nior_n_.lo \
+perfsqr_.$(OBJEXT) perfsqr_.lo popcount_.$(OBJEXT) popcount_.lo \
+pre_mod_1_.$(OBJEXT) pre_mod_1_.lo random_.$(OBJEXT) random_.lo \
+random2_.$(OBJEXT) random2_.lo rshift_.$(OBJEXT) rshift_.lo \
+sb_divrem_mn_.$(OBJEXT) sb_divrem_mn_.lo scan0_.$(OBJEXT) scan0_.lo \
+scan1_.$(OBJEXT) scan1_.lo set_str_.$(OBJEXT) set_str_.lo \
+sqr_basecase_.$(OBJEXT) sqr_basecase_.lo sqr_diagonal_.$(OBJEXT) \
+sqr_diagonal_.lo sqrtrem_.$(OBJEXT) sqrtrem_.lo sub_n_.$(OBJEXT) \
+sub_n_.lo submul_1_.$(OBJEXT) submul_1_.lo tdiv_qr_.$(OBJEXT) \
+tdiv_qr_.lo udiv_qrnnd_.$(OBJEXT) udiv_qrnnd_.lo udiv_w_sdiv_.$(OBJEXT) \
+udiv_w_sdiv_.lo xnor_n_.$(OBJEXT) xnor_n_.lo xor_n_.$(OBJEXT) xor_n_.lo \
+: $(ANSI2KNR)
 
 tags: TAGS
 
diff --git a/mpq/Makefile.in b/mpq/Makefile.in
index 29595753d..cf1c37911 100644
--- a/mpq/Makefile.in
+++ b/mpq/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
 #
diff --git a/mpz/Makefile.in b/mpz/Makefile.in
index a6bff6b40..1fa5af8ee 100644
--- a/mpz/Makefile.in
+++ b/mpz/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 #
@@ -128,9 +129,11 @@ libmpz_la_SOURCES = \
   abs.c addmul_ui.c and.c array_init.c \
   bin_ui.c bin_uiui.c cdiv_q.c \
   cdiv_q_ui.c cdiv_qr.c cdiv_qr_ui.c cdiv_r.c cdiv_r_ui.c cdiv_ui.c \
+  cfdiv_q_2exp.c cfdiv_r_2exp.c \
   clear.c clrbit.c cmp.c cmp_si.c cmp_ui.c cmpabs.c cmpabs_ui.c com.c \
-  divexact.c divegcd.c dump.c fac_ui.c fdiv_q.c fdiv_q_2exp.c fdiv_q_ui.c \
-  fdiv_qr.c fdiv_qr_ui.c fdiv_r.c fdiv_r_2exp.c fdiv_r_ui.c fdiv_ui.c \
+  divexact.c divegcd.c divis.c divis_ui.c divis_2exp.c \
+  dump.c fac_ui.c fdiv_q.c fdiv_q_ui.c \
+  fdiv_qr.c fdiv_qr_ui.c fdiv_r.c fdiv_r_ui.c fdiv_ui.c \
   fib_ui.c gcd.c gcd_ui.c gcdext.c get_d.c get_si.c \
   get_str.c get_ui.c getlimbn.c hamdist.c init.c inp_raw.c inp_str.c \
   invert.c ior.c iset.c iset_d.c iset_si.c iset_str.c iset_ui.c \
@@ -172,11 +175,12 @@ libmpz_la_LDFLAGS =
 libmpz_la_LIBADD = 
 am_libmpz_la_OBJECTS =  abs$U.lo addmul_ui$U.lo and$U.lo array_init$U.lo \
 bin_ui$U.lo bin_uiui$U.lo cdiv_q$U.lo cdiv_q_ui$U.lo cdiv_qr$U.lo \
-cdiv_qr_ui$U.lo cdiv_r$U.lo cdiv_r_ui$U.lo cdiv_ui$U.lo clear$U.lo \
-clrbit$U.lo cmp$U.lo cmp_si$U.lo cmp_ui$U.lo cmpabs$U.lo cmpabs_ui$U.lo \
-com$U.lo divexact$U.lo divegcd$U.lo dump$U.lo fac_ui$U.lo fdiv_q$U.lo \
-fdiv_q_2exp$U.lo fdiv_q_ui$U.lo fdiv_qr$U.lo fdiv_qr_ui$U.lo \
-fdiv_r$U.lo fdiv_r_2exp$U.lo fdiv_r_ui$U.lo fdiv_ui$U.lo fib_ui$U.lo \
+cdiv_qr_ui$U.lo cdiv_r$U.lo cdiv_r_ui$U.lo cdiv_ui$U.lo \
+cfdiv_q_2exp$U.lo cfdiv_r_2exp$U.lo clear$U.lo clrbit$U.lo cmp$U.lo \
+cmp_si$U.lo cmp_ui$U.lo cmpabs$U.lo cmpabs_ui$U.lo com$U.lo \
+divexact$U.lo divegcd$U.lo divis$U.lo divis_ui$U.lo divis_2exp$U.lo \
+dump$U.lo fac_ui$U.lo fdiv_q$U.lo fdiv_q_ui$U.lo fdiv_qr$U.lo \
+fdiv_qr_ui$U.lo fdiv_r$U.lo fdiv_r_ui$U.lo fdiv_ui$U.lo fib_ui$U.lo \
 gcd$U.lo gcd_ui$U.lo gcdext$U.lo get_d$U.lo get_si$U.lo get_str$U.lo \
 get_ui$U.lo getlimbn$U.lo hamdist$U.lo init$U.lo inp_raw$U.lo \
 inp_str$U.lo invert$U.lo ior$U.lo iset$U.lo iset_d$U.lo iset_si$U.lo \
@@ -306,6 +310,10 @@ cdiv_r_ui_.c: cdiv_r_ui.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/cdiv_r_ui.c; then echo $(srcdir)/cdiv_r_ui.c; else echo cdiv_r_ui.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > cdiv_r_ui_.c
 cdiv_ui_.c: cdiv_ui.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/cdiv_ui.c; then echo $(srcdir)/cdiv_ui.c; else echo cdiv_ui.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > cdiv_ui_.c
+cfdiv_q_2exp_.c: cfdiv_q_2exp.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/cfdiv_q_2exp.c; then echo $(srcdir)/cfdiv_q_2exp.c; else echo cfdiv_q_2exp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > cfdiv_q_2exp_.c
+cfdiv_r_2exp_.c: cfdiv_r_2exp.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/cfdiv_r_2exp.c; then echo $(srcdir)/cfdiv_r_2exp.c; else echo cfdiv_r_2exp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > cfdiv_r_2exp_.c
 clear_.c: clear.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clear.c; then echo $(srcdir)/clear.c; else echo clear.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clear_.c
 clrbit_.c: clrbit.c $(ANSI2KNR)
@@ -326,14 +334,18 @@ divegcd_.c: divegcd.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/divegcd.c; then echo $(srcdir)/divegcd.c; else echo divegcd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > divegcd_.c
 divexact_.c: divexact.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/divexact.c; then echo $(srcdir)/divexact.c; else echo divexact.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > divexact_.c
+divis_.c: divis.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/divis.c; then echo $(srcdir)/divis.c; else echo divis.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > divis_.c
+divis_2exp_.c: divis_2exp.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/divis_2exp.c; then echo $(srcdir)/divis_2exp.c; else echo divis_2exp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > divis_2exp_.c
+divis_ui_.c: divis_ui.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/divis_ui.c; then echo $(srcdir)/divis_ui.c; else echo divis_ui.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > divis_ui_.c
 dump_.c: dump.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dump.c; then echo $(srcdir)/dump.c; else echo dump.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dump_.c
 fac_ui_.c: fac_ui.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fac_ui.c; then echo $(srcdir)/fac_ui.c; else echo fac_ui.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fac_ui_.c
 fdiv_q_.c: fdiv_q.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fdiv_q.c; then echo $(srcdir)/fdiv_q.c; else echo fdiv_q.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fdiv_q_.c
-fdiv_q_2exp_.c: fdiv_q_2exp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fdiv_q_2exp.c; then echo $(srcdir)/fdiv_q_2exp.c; else echo fdiv_q_2exp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fdiv_q_2exp_.c
 fdiv_q_ui_.c: fdiv_q_ui.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fdiv_q_ui.c; then echo $(srcdir)/fdiv_q_ui.c; else echo fdiv_q_ui.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fdiv_q_ui_.c
 fdiv_qr_.c: fdiv_qr.c $(ANSI2KNR)
@@ -342,8 +354,6 @@ fdiv_qr_ui_.c: fdiv_qr_ui.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fdiv_qr_ui.c; then echo $(srcdir)/fdiv_qr_ui.c; else echo fdiv_qr_ui.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fdiv_qr_ui_.c
 fdiv_r_.c: fdiv_r.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fdiv_r.c; then echo $(srcdir)/fdiv_r.c; else echo fdiv_r.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fdiv_r_.c
-fdiv_r_2exp_.c: fdiv_r_2exp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fdiv_r_2exp.c; then echo $(srcdir)/fdiv_r_2exp.c; else echo fdiv_r_2exp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fdiv_r_2exp_.c
 fdiv_r_ui_.c: fdiv_r_ui.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fdiv_r_ui.c; then echo $(srcdir)/fdiv_r_ui.c; else echo fdiv_r_ui.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fdiv_r_ui_.c
 fdiv_ui_.c: fdiv_ui.c $(ANSI2KNR)
@@ -529,59 +539,61 @@ bin_uiui_.$(OBJEXT) bin_uiui_.lo cdiv_q_.$(OBJEXT) cdiv_q_.lo \
 cdiv_q_ui_.$(OBJEXT) cdiv_q_ui_.lo cdiv_qr_.$(OBJEXT) cdiv_qr_.lo \
 cdiv_qr_ui_.$(OBJEXT) cdiv_qr_ui_.lo cdiv_r_.$(OBJEXT) cdiv_r_.lo \
 cdiv_r_ui_.$(OBJEXT) cdiv_r_ui_.lo cdiv_ui_.$(OBJEXT) cdiv_ui_.lo \
-clear_.$(OBJEXT) clear_.lo clrbit_.$(OBJEXT) clrbit_.lo cmp_.$(OBJEXT) \
-cmp_.lo cmp_si_.$(OBJEXT) cmp_si_.lo cmp_ui_.$(OBJEXT) cmp_ui_.lo \
-cmpabs_.$(OBJEXT) cmpabs_.lo cmpabs_ui_.$(OBJEXT) cmpabs_ui_.lo \
-com_.$(OBJEXT) com_.lo divegcd_.$(OBJEXT) divegcd_.lo \
-divexact_.$(OBJEXT) divexact_.lo dump_.$(OBJEXT) dump_.lo \
+cfdiv_q_2exp_.$(OBJEXT) cfdiv_q_2exp_.lo cfdiv_r_2exp_.$(OBJEXT) \
+cfdiv_r_2exp_.lo clear_.$(OBJEXT) clear_.lo clrbit_.$(OBJEXT) \
+clrbit_.lo cmp_.$(OBJEXT) cmp_.lo cmp_si_.$(OBJEXT) cmp_si_.lo \
+cmp_ui_.$(OBJEXT) cmp_ui_.lo cmpabs_.$(OBJEXT) cmpabs_.lo \
+cmpabs_ui_.$(OBJEXT) cmpabs_ui_.lo com_.$(OBJEXT) com_.lo \
+divegcd_.$(OBJEXT) divegcd_.lo divexact_.$(OBJEXT) divexact_.lo \
+divis_.$(OBJEXT) divis_.lo divis_2exp_.$(OBJEXT) divis_2exp_.lo \
+divis_ui_.$(OBJEXT) divis_ui_.lo dump_.$(OBJEXT) dump_.lo \
 fac_ui_.$(OBJEXT) fac_ui_.lo fdiv_q_.$(OBJEXT) fdiv_q_.lo \
-fdiv_q_2exp_.$(OBJEXT) fdiv_q_2exp_.lo fdiv_q_ui_.$(OBJEXT) \
-fdiv_q_ui_.lo fdiv_qr_.$(OBJEXT) fdiv_qr_.lo fdiv_qr_ui_.$(OBJEXT) \
-fdiv_qr_ui_.lo fdiv_r_.$(OBJEXT) fdiv_r_.lo fdiv_r_2exp_.$(OBJEXT) \
-fdiv_r_2exp_.lo fdiv_r_ui_.$(OBJEXT) fdiv_r_ui_.lo fdiv_ui_.$(OBJEXT) \
-fdiv_ui_.lo fib_ui_.$(OBJEXT) fib_ui_.lo fits_sint_.$(OBJEXT) \
-fits_sint_.lo fits_slong_.$(OBJEXT) fits_slong_.lo \
-fits_sshort_.$(OBJEXT) fits_sshort_.lo fits_uint_.$(OBJEXT) \
-fits_uint_.lo fits_ulong_.$(OBJEXT) fits_ulong_.lo \
-fits_ushort_.$(OBJEXT) fits_ushort_.lo gcd_.$(OBJEXT) gcd_.lo \
-gcd_ui_.$(OBJEXT) gcd_ui_.lo gcdext_.$(OBJEXT) gcdext_.lo \
-get_d_.$(OBJEXT) get_d_.lo get_si_.$(OBJEXT) get_si_.lo \
-get_str_.$(OBJEXT) get_str_.lo get_ui_.$(OBJEXT) get_ui_.lo \
-getlimbn_.$(OBJEXT) getlimbn_.lo hamdist_.$(OBJEXT) hamdist_.lo \
-init_.$(OBJEXT) init_.lo inp_raw_.$(OBJEXT) inp_raw_.lo \
-inp_str_.$(OBJEXT) inp_str_.lo invert_.$(OBJEXT) invert_.lo \
-ior_.$(OBJEXT) ior_.lo iset_.$(OBJEXT) iset_.lo iset_d_.$(OBJEXT) \
-iset_d_.lo iset_si_.$(OBJEXT) iset_si_.lo iset_str_.$(OBJEXT) \
-iset_str_.lo iset_ui_.$(OBJEXT) iset_ui_.lo jacobi_.$(OBJEXT) \
-jacobi_.lo kronsz_.$(OBJEXT) kronsz_.lo kronuz_.$(OBJEXT) kronuz_.lo \
-kronzs_.$(OBJEXT) kronzs_.lo kronzu_.$(OBJEXT) kronzu_.lo \
-lcm_.$(OBJEXT) lcm_.lo mod_.$(OBJEXT) mod_.lo mul_.$(OBJEXT) mul_.lo \
-mul_2exp_.$(OBJEXT) mul_2exp_.lo mul_si_.$(OBJEXT) mul_si_.lo \
-mul_ui_.$(OBJEXT) mul_ui_.lo n_pow_ui_.$(OBJEXT) n_pow_ui_.lo \
-neg_.$(OBJEXT) neg_.lo nextprime_.$(OBJEXT) nextprime_.lo \
-out_raw_.$(OBJEXT) out_raw_.lo out_str_.$(OBJEXT) out_str_.lo \
-perfpow_.$(OBJEXT) perfpow_.lo perfsqr_.$(OBJEXT) perfsqr_.lo \
-popcount_.$(OBJEXT) popcount_.lo pow_ui_.$(OBJEXT) pow_ui_.lo \
-powm_.$(OBJEXT) powm_.lo powm_ui_.$(OBJEXT) powm_ui_.lo \
-pprime_p_.$(OBJEXT) pprime_p_.lo random_.$(OBJEXT) random_.lo \
-random2_.$(OBJEXT) random2_.lo realloc_.$(OBJEXT) realloc_.lo \
-remove_.$(OBJEXT) remove_.lo root_.$(OBJEXT) root_.lo \
-rrandomb_.$(OBJEXT) rrandomb_.lo scan0_.$(OBJEXT) scan0_.lo \
-scan1_.$(OBJEXT) scan1_.lo set_.$(OBJEXT) set_.lo set_d_.$(OBJEXT) \
-set_d_.lo set_f_.$(OBJEXT) set_f_.lo set_q_.$(OBJEXT) set_q_.lo \
-set_si_.$(OBJEXT) set_si_.lo set_str_.$(OBJEXT) set_str_.lo \
-set_ui_.$(OBJEXT) set_ui_.lo setbit_.$(OBJEXT) setbit_.lo \
-si_pow_ui_.$(OBJEXT) si_pow_ui_.lo size_.$(OBJEXT) size_.lo \
-sizeinbase_.$(OBJEXT) sizeinbase_.lo sqrt_.$(OBJEXT) sqrt_.lo \
-sqrtrem_.$(OBJEXT) sqrtrem_.lo sub_.$(OBJEXT) sub_.lo sub_ui_.$(OBJEXT) \
-sub_ui_.lo swap_.$(OBJEXT) swap_.lo tdiv_q_.$(OBJEXT) tdiv_q_.lo \
-tdiv_q_2exp_.$(OBJEXT) tdiv_q_2exp_.lo tdiv_q_ui_.$(OBJEXT) \
-tdiv_q_ui_.lo tdiv_qr_.$(OBJEXT) tdiv_qr_.lo tdiv_qr_ui_.$(OBJEXT) \
-tdiv_qr_ui_.lo tdiv_r_.$(OBJEXT) tdiv_r_.lo tdiv_r_2exp_.$(OBJEXT) \
-tdiv_r_2exp_.lo tdiv_r_ui_.$(OBJEXT) tdiv_r_ui_.lo tdiv_ui_.$(OBJEXT) \
-tdiv_ui_.lo tstbit_.$(OBJEXT) tstbit_.lo ui_pow_ui_.$(OBJEXT) \
-ui_pow_ui_.lo urandomb_.$(OBJEXT) urandomb_.lo urandomm_.$(OBJEXT) \
-urandomm_.lo xor_.$(OBJEXT) xor_.lo : $(ANSI2KNR)
+fdiv_q_ui_.$(OBJEXT) fdiv_q_ui_.lo fdiv_qr_.$(OBJEXT) fdiv_qr_.lo \
+fdiv_qr_ui_.$(OBJEXT) fdiv_qr_ui_.lo fdiv_r_.$(OBJEXT) fdiv_r_.lo \
+fdiv_r_ui_.$(OBJEXT) fdiv_r_ui_.lo fdiv_ui_.$(OBJEXT) fdiv_ui_.lo \
+fib_ui_.$(OBJEXT) fib_ui_.lo fits_sint_.$(OBJEXT) fits_sint_.lo \
+fits_slong_.$(OBJEXT) fits_slong_.lo fits_sshort_.$(OBJEXT) \
+fits_sshort_.lo fits_uint_.$(OBJEXT) fits_uint_.lo \
+fits_ulong_.$(OBJEXT) fits_ulong_.lo fits_ushort_.$(OBJEXT) \
+fits_ushort_.lo gcd_.$(OBJEXT) gcd_.lo gcd_ui_.$(OBJEXT) gcd_ui_.lo \
+gcdext_.$(OBJEXT) gcdext_.lo get_d_.$(OBJEXT) get_d_.lo \
+get_si_.$(OBJEXT) get_si_.lo get_str_.$(OBJEXT) get_str_.lo \
+get_ui_.$(OBJEXT) get_ui_.lo getlimbn_.$(OBJEXT) getlimbn_.lo \
+hamdist_.$(OBJEXT) hamdist_.lo init_.$(OBJEXT) init_.lo \
+inp_raw_.$(OBJEXT) inp_raw_.lo inp_str_.$(OBJEXT) inp_str_.lo \
+invert_.$(OBJEXT) invert_.lo ior_.$(OBJEXT) ior_.lo iset_.$(OBJEXT) \
+iset_.lo iset_d_.$(OBJEXT) iset_d_.lo iset_si_.$(OBJEXT) iset_si_.lo \
+iset_str_.$(OBJEXT) iset_str_.lo iset_ui_.$(OBJEXT) iset_ui_.lo \
+jacobi_.$(OBJEXT) jacobi_.lo kronsz_.$(OBJEXT) kronsz_.lo \
+kronuz_.$(OBJEXT) kronuz_.lo kronzs_.$(OBJEXT) kronzs_.lo \
+kronzu_.$(OBJEXT) kronzu_.lo lcm_.$(OBJEXT) lcm_.lo mod_.$(OBJEXT) \
+mod_.lo mul_.$(OBJEXT) mul_.lo mul_2exp_.$(OBJEXT) mul_2exp_.lo \
+mul_si_.$(OBJEXT) mul_si_.lo mul_ui_.$(OBJEXT) mul_ui_.lo \
+n_pow_ui_.$(OBJEXT) n_pow_ui_.lo neg_.$(OBJEXT) neg_.lo \
+nextprime_.$(OBJEXT) nextprime_.lo out_raw_.$(OBJEXT) out_raw_.lo \
+out_str_.$(OBJEXT) out_str_.lo perfpow_.$(OBJEXT) perfpow_.lo \
+perfsqr_.$(OBJEXT) perfsqr_.lo popcount_.$(OBJEXT) popcount_.lo \
+pow_ui_.$(OBJEXT) pow_ui_.lo powm_.$(OBJEXT) powm_.lo \
+powm_ui_.$(OBJEXT) powm_ui_.lo pprime_p_.$(OBJEXT) pprime_p_.lo \
+random_.$(OBJEXT) random_.lo random2_.$(OBJEXT) random2_.lo \
+realloc_.$(OBJEXT) realloc_.lo remove_.$(OBJEXT) remove_.lo \
+root_.$(OBJEXT) root_.lo rrandomb_.$(OBJEXT) rrandomb_.lo \
+scan0_.$(OBJEXT) scan0_.lo scan1_.$(OBJEXT) scan1_.lo set_.$(OBJEXT) \
+set_.lo set_d_.$(OBJEXT) set_d_.lo set_f_.$(OBJEXT) set_f_.lo \
+set_q_.$(OBJEXT) set_q_.lo set_si_.$(OBJEXT) set_si_.lo \
+set_str_.$(OBJEXT) set_str_.lo set_ui_.$(OBJEXT) set_ui_.lo \
+setbit_.$(OBJEXT) setbit_.lo si_pow_ui_.$(OBJEXT) si_pow_ui_.lo \
+size_.$(OBJEXT) size_.lo sizeinbase_.$(OBJEXT) sizeinbase_.lo \
+sqrt_.$(OBJEXT) sqrt_.lo sqrtrem_.$(OBJEXT) sqrtrem_.lo sub_.$(OBJEXT) \
+sub_.lo sub_ui_.$(OBJEXT) sub_ui_.lo swap_.$(OBJEXT) swap_.lo \
+tdiv_q_.$(OBJEXT) tdiv_q_.lo tdiv_q_2exp_.$(OBJEXT) tdiv_q_2exp_.lo \
+tdiv_q_ui_.$(OBJEXT) tdiv_q_ui_.lo tdiv_qr_.$(OBJEXT) tdiv_qr_.lo \
+tdiv_qr_ui_.$(OBJEXT) tdiv_qr_ui_.lo tdiv_r_.$(OBJEXT) tdiv_r_.lo \
+tdiv_r_2exp_.$(OBJEXT) tdiv_r_2exp_.lo tdiv_r_ui_.$(OBJEXT) \
+tdiv_r_ui_.lo tdiv_ui_.$(OBJEXT) tdiv_ui_.lo tstbit_.$(OBJEXT) \
+tstbit_.lo ui_pow_ui_.$(OBJEXT) ui_pow_ui_.lo urandomb_.$(OBJEXT) \
+urandomb_.lo urandomm_.$(OBJEXT) urandomm_.lo xor_.$(OBJEXT) xor_.lo : \
+$(ANSI2KNR)
 
 tags: TAGS
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 89d266fb3..9efd3d68c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 2000, 2001 Free Software Foundation, Inc.
 #
diff --git a/tests/devel/Makefile.in b/tests/devel/Makefile.in
index ca5752bd0..ed347d225 100644
--- a/tests/devel/Makefile.in
+++ b/tests/devel/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 2000, 2001 Free Software Foundation, Inc.
 #
diff --git a/tests/mpbsd/Makefile.in b/tests/mpbsd/Makefile.in
index 7479a2dc3..137b5c082 100644
--- a/tests/mpbsd/Makefile.in
+++ b/tests/mpbsd/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 2000 Free Software Foundation, Inc.
 #
diff --git a/tests/mpf/Makefile.in b/tests/mpf/Makefile.in
index 0e9205a19..d37f35e7a 100644
--- a/tests/mpf/Makefile.in
+++ b/tests/mpf/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 1996, 1999, 2000, 2001 Free Software Foundation, Inc.
 #
diff --git a/tests/mpq/Makefile.in b/tests/mpq/Makefile.in
index 576c03c3b..4ca553f3e 100644
--- a/tests/mpq/Makefile.in
+++ b/tests/mpq/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 1996, 1999, 2000, 2001 Free Software Foundation, Inc.
 #
diff --git a/tests/mpz/Makefile.in b/tests/mpz/Makefile.in
index 7ca25ee59..04713f806 100644
--- a/tests/mpz/Makefile.in
+++ b/tests/mpz/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
 #
@@ -125,8 +126,9 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
 LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
 
 check_PROGRAMS = t-mul t-tdiv t-tdiv_ui t-fdiv t-fdiv_ui t-gcd \
-  dive t-sqrtrem convert io logic bit t-powm t-powm_ui t-pow_ui t-2exp reuse \
-  t-root t-jac t-bin t-misc t-get_si t-fac_ui t-fib_ui t-scan t-fits
+  dive t-sqrtrem convert io logic bit t-powm t-powm_ui t-pow t-div_2exp reuse \
+  t-root t-jac t-bin t-misc t-get_si t-fac_ui t-fib_ui t-scan t-fits \
+  t-divis t-divis_2exp
 
 
 TESTS = $(check_PROGRAMS)
@@ -140,10 +142,11 @@ CONFIG_CLEAN_FILES =
 check_PROGRAMS =  t-mul$(EXEEXT) t-tdiv$(EXEEXT) t-tdiv_ui$(EXEEXT) \
 t-fdiv$(EXEEXT) t-fdiv_ui$(EXEEXT) t-gcd$(EXEEXT) dive$(EXEEXT) \
 t-sqrtrem$(EXEEXT) convert$(EXEEXT) io$(EXEEXT) logic$(EXEEXT) \
-bit$(EXEEXT) t-powm$(EXEEXT) t-powm_ui$(EXEEXT) t-pow_ui$(EXEEXT) \
-t-2exp$(EXEEXT) reuse$(EXEEXT) t-root$(EXEEXT) t-jac$(EXEEXT) \
+bit$(EXEEXT) t-powm$(EXEEXT) t-powm_ui$(EXEEXT) t-pow$(EXEEXT) \
+t-div_2exp$(EXEEXT) reuse$(EXEEXT) t-root$(EXEEXT) t-jac$(EXEEXT) \
 t-bin$(EXEEXT) t-misc$(EXEEXT) t-get_si$(EXEEXT) t-fac_ui$(EXEEXT) \
-t-fib_ui$(EXEEXT) t-scan$(EXEEXT) t-fits$(EXEEXT)
+t-fib_ui$(EXEEXT) t-scan$(EXEEXT) t-fits$(EXEEXT) t-divis$(EXEEXT) \
+t-divis_2exp$(EXEEXT)
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 CPPFLAGS = @CPPFLAGS@
@@ -186,18 +189,30 @@ reuse_LDADD = $(LDADD)
 reuse_DEPENDENCIES =  $(top_builddir)/tests/libtests.la \
 $(top_builddir)/libgmp.la
 reuse_LDFLAGS = 
-t_2exp_SOURCES = t-2exp.c
-t_2exp_OBJECTS =  t-2exp$U.$(OBJEXT)
-t_2exp_LDADD = $(LDADD)
-t_2exp_DEPENDENCIES =  $(top_builddir)/tests/libtests.la \
-$(top_builddir)/libgmp.la
-t_2exp_LDFLAGS = 
 t_bin_SOURCES = t-bin.c
 t_bin_OBJECTS =  t-bin$U.$(OBJEXT)
 t_bin_LDADD = $(LDADD)
 t_bin_DEPENDENCIES =  $(top_builddir)/tests/libtests.la \
 $(top_builddir)/libgmp.la
 t_bin_LDFLAGS = 
+t_div_2exp_SOURCES = t-div_2exp.c
+t_div_2exp_OBJECTS =  t-div_2exp$U.$(OBJEXT)
+t_div_2exp_LDADD = $(LDADD)
+t_div_2exp_DEPENDENCIES =  $(top_builddir)/tests/libtests.la \
+$(top_builddir)/libgmp.la
+t_div_2exp_LDFLAGS = 
+t_divis_SOURCES = t-divis.c
+t_divis_OBJECTS =  t-divis$U.$(OBJEXT)
+t_divis_LDADD = $(LDADD)
+t_divis_DEPENDENCIES =  $(top_builddir)/tests/libtests.la \
+$(top_builddir)/libgmp.la
+t_divis_LDFLAGS = 
+t_divis_2exp_SOURCES = t-divis_2exp.c
+t_divis_2exp_OBJECTS =  t-divis_2exp$U.$(OBJEXT)
+t_divis_2exp_LDADD = $(LDADD)
+t_divis_2exp_DEPENDENCIES =  $(top_builddir)/tests/libtests.la \
+$(top_builddir)/libgmp.la
+t_divis_2exp_LDFLAGS = 
 t_fac_ui_SOURCES = t-fac_ui.c
 t_fac_ui_OBJECTS =  t-fac_ui$U.$(OBJEXT)
 t_fac_ui_LDADD = $(LDADD)
@@ -258,12 +273,12 @@ t_mul_LDADD = $(LDADD)
 t_mul_DEPENDENCIES =  $(top_builddir)/tests/libtests.la \
 $(top_builddir)/libgmp.la
 t_mul_LDFLAGS = 
-t_pow_ui_SOURCES = t-pow_ui.c
-t_pow_ui_OBJECTS =  t-pow_ui$U.$(OBJEXT)
-t_pow_ui_LDADD = $(LDADD)
-t_pow_ui_DEPENDENCIES =  $(top_builddir)/tests/libtests.la \
+t_pow_SOURCES = t-pow.c
+t_pow_OBJECTS =  t-pow$U.$(OBJEXT)
+t_pow_LDADD = $(LDADD)
+t_pow_DEPENDENCIES =  $(top_builddir)/tests/libtests.la \
 $(top_builddir)/libgmp.la
-t_pow_ui_LDFLAGS = 
+t_pow_LDFLAGS = 
 t_powm_SOURCES = t-powm.c
 t_powm_OBJECTS =  t-powm$U.$(OBJEXT)
 t_powm_LDADD = $(LDADD)
@@ -311,10 +326,10 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $
 CFLAGS = @CFLAGS@
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES =  bit.c convert.c dive.c io.c logic.c reuse.c t-2exp.c \
-t-bin.c t-fac_ui.c t-fdiv.c t-fdiv_ui.c t-fib_ui.c t-fits.c t-gcd.c \
-t-get_si.c t-jac.c t-misc.c t-mul.c t-pow_ui.c t-powm.c t-powm_ui.c \
-t-root.c t-scan.c t-sqrtrem.c t-tdiv.c t-tdiv_ui.c
+DIST_SOURCES =  bit.c convert.c dive.c io.c logic.c reuse.c t-bin.c \
+t-div_2exp.c t-divis.c t-divis_2exp.c t-fac_ui.c t-fdiv.c t-fdiv_ui.c \
+t-fib_ui.c t-fits.c t-gcd.c t-get_si.c t-jac.c t-misc.c t-mul.c t-pow.c \
+t-powm.c t-powm_ui.c t-root.c t-scan.c t-sqrtrem.c t-tdiv.c t-tdiv_ui.c
 depcomp = 
 DIST_COMMON =  Makefile.am Makefile.in
 
@@ -322,8 +337,8 @@ DIST_COMMON =  Makefile.am Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP_ENV = --best
-SOURCES = bit.c convert.c dive.c io.c logic.c reuse.c t-2exp.c t-bin.c t-fac_ui.c t-fdiv.c t-fdiv_ui.c t-fib_ui.c t-fits.c t-gcd.c t-get_si.c t-jac.c t-misc.c t-mul.c t-pow_ui.c t-powm.c t-powm_ui.c t-root.c t-scan.c t-sqrtrem.c t-tdiv.c t-tdiv_ui.c
-OBJECTS = bit$U.$(OBJEXT) convert$U.$(OBJEXT) dive$U.$(OBJEXT) io$U.$(OBJEXT) logic$U.$(OBJEXT) reuse$U.$(OBJEXT) t-2exp$U.$(OBJEXT) t-bin$U.$(OBJEXT) t-fac_ui$U.$(OBJEXT) t-fdiv$U.$(OBJEXT) t-fdiv_ui$U.$(OBJEXT) t-fib_ui$U.$(OBJEXT) t-fits$U.$(OBJEXT) t-gcd$U.$(OBJEXT) t-get_si$U.$(OBJEXT) t-jac$U.$(OBJEXT) t-misc$U.$(OBJEXT) t-mul$U.$(OBJEXT) t-pow_ui$U.$(OBJEXT) t-powm$U.$(OBJEXT) t-powm_ui$U.$(OBJEXT) t-root$U.$(OBJEXT) t-scan$U.$(OBJEXT) t-sqrtrem$U.$(OBJEXT) t-tdiv$U.$(OBJEXT) t-tdiv_ui$U.$(OBJEXT)
+SOURCES = bit.c convert.c dive.c io.c logic.c reuse.c t-bin.c t-div_2exp.c t-divis.c t-divis_2exp.c t-fac_ui.c t-fdiv.c t-fdiv_ui.c t-fib_ui.c t-fits.c t-gcd.c t-get_si.c t-jac.c t-misc.c t-mul.c t-pow.c t-powm.c t-powm_ui.c t-root.c t-scan.c t-sqrtrem.c t-tdiv.c t-tdiv_ui.c
+OBJECTS = bit$U.$(OBJEXT) convert$U.$(OBJEXT) dive$U.$(OBJEXT) io$U.$(OBJEXT) logic$U.$(OBJEXT) reuse$U.$(OBJEXT) t-bin$U.$(OBJEXT) t-div_2exp$U.$(OBJEXT) t-divis$U.$(OBJEXT) t-divis_2exp$U.$(OBJEXT) t-fac_ui$U.$(OBJEXT) t-fdiv$U.$(OBJEXT) t-fdiv_ui$U.$(OBJEXT) t-fib_ui$U.$(OBJEXT) t-fits$U.$(OBJEXT) t-gcd$U.$(OBJEXT) t-get_si$U.$(OBJEXT) t-jac$U.$(OBJEXT) t-misc$U.$(OBJEXT) t-mul$U.$(OBJEXT) t-pow$U.$(OBJEXT) t-powm$U.$(OBJEXT) t-powm_ui$U.$(OBJEXT) t-root$U.$(OBJEXT) t-scan$U.$(OBJEXT) t-sqrtrem$U.$(OBJEXT) t-tdiv$U.$(OBJEXT) t-tdiv_ui$U.$(OBJEXT)
 
 all: all-redirect
 .SUFFIXES:
@@ -405,14 +420,22 @@ reuse$(EXEEXT): $(reuse_OBJECTS) $(reuse_DEPENDENCIES)
 	@rm -f reuse$(EXEEXT)
 	$(LINK) $(reuse_LDFLAGS) $(reuse_OBJECTS) $(reuse_LDADD) $(LIBS)
 
-t-2exp$(EXEEXT): $(t_2exp_OBJECTS) $(t_2exp_DEPENDENCIES)
-	@rm -f t-2exp$(EXEEXT)
-	$(LINK) $(t_2exp_LDFLAGS) $(t_2exp_OBJECTS) $(t_2exp_LDADD) $(LIBS)
-
 t-bin$(EXEEXT): $(t_bin_OBJECTS) $(t_bin_DEPENDENCIES)
 	@rm -f t-bin$(EXEEXT)
 	$(LINK) $(t_bin_LDFLAGS) $(t_bin_OBJECTS) $(t_bin_LDADD) $(LIBS)
 
+t-div_2exp$(EXEEXT): $(t_div_2exp_OBJECTS) $(t_div_2exp_DEPENDENCIES)
+	@rm -f t-div_2exp$(EXEEXT)
+	$(LINK) $(t_div_2exp_LDFLAGS) $(t_div_2exp_OBJECTS) $(t_div_2exp_LDADD) $(LIBS)
+
+t-divis$(EXEEXT): $(t_divis_OBJECTS) $(t_divis_DEPENDENCIES)
+	@rm -f t-divis$(EXEEXT)
+	$(LINK) $(t_divis_LDFLAGS) $(t_divis_OBJECTS) $(t_divis_LDADD) $(LIBS)
+
+t-divis_2exp$(EXEEXT): $(t_divis_2exp_OBJECTS) $(t_divis_2exp_DEPENDENCIES)
+	@rm -f t-divis_2exp$(EXEEXT)
+	$(LINK) $(t_divis_2exp_LDFLAGS) $(t_divis_2exp_OBJECTS) $(t_divis_2exp_LDADD) $(LIBS)
+
 t-fac_ui$(EXEEXT): $(t_fac_ui_OBJECTS) $(t_fac_ui_DEPENDENCIES)
 	@rm -f t-fac_ui$(EXEEXT)
 	$(LINK) $(t_fac_ui_LDFLAGS) $(t_fac_ui_OBJECTS) $(t_fac_ui_LDADD) $(LIBS)
@@ -453,9 +476,9 @@ t-mul$(EXEEXT): $(t_mul_OBJECTS) $(t_mul_DEPENDENCIES)
 	@rm -f t-mul$(EXEEXT)
 	$(LINK) $(t_mul_LDFLAGS) $(t_mul_OBJECTS) $(t_mul_LDADD) $(LIBS)
 
-t-pow_ui$(EXEEXT): $(t_pow_ui_OBJECTS) $(t_pow_ui_DEPENDENCIES)
-	@rm -f t-pow_ui$(EXEEXT)
-	$(LINK) $(t_pow_ui_LDFLAGS) $(t_pow_ui_OBJECTS) $(t_pow_ui_LDADD) $(LIBS)
+t-pow$(EXEEXT): $(t_pow_OBJECTS) $(t_pow_DEPENDENCIES)
+	@rm -f t-pow$(EXEEXT)
+	$(LINK) $(t_pow_LDFLAGS) $(t_pow_OBJECTS) $(t_pow_LDADD) $(LIBS)
 
 t-powm$(EXEEXT): $(t_powm_OBJECTS) $(t_powm_DEPENDENCIES)
 	@rm -f t-powm$(EXEEXT)
@@ -502,10 +525,14 @@ logic_.c: logic.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/logic.c; then echo $(srcdir)/logic.c; else echo logic.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > logic_.c
 reuse_.c: reuse.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/reuse.c; then echo $(srcdir)/reuse.c; else echo reuse.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > reuse_.c
-t-2exp_.c: t-2exp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-2exp.c; then echo $(srcdir)/t-2exp.c; else echo t-2exp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > t-2exp_.c
 t-bin_.c: t-bin.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-bin.c; then echo $(srcdir)/t-bin.c; else echo t-bin.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > t-bin_.c
+t-div_2exp_.c: t-div_2exp.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-div_2exp.c; then echo $(srcdir)/t-div_2exp.c; else echo t-div_2exp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > t-div_2exp_.c
+t-divis_.c: t-divis.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-divis.c; then echo $(srcdir)/t-divis.c; else echo t-divis.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > t-divis_.c
+t-divis_2exp_.c: t-divis_2exp.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-divis_2exp.c; then echo $(srcdir)/t-divis_2exp.c; else echo t-divis_2exp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > t-divis_2exp_.c
 t-fac_ui_.c: t-fac_ui.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-fac_ui.c; then echo $(srcdir)/t-fac_ui.c; else echo t-fac_ui.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > t-fac_ui_.c
 t-fdiv_.c: t-fdiv.c $(ANSI2KNR)
@@ -526,8 +553,8 @@ t-misc_.c: t-misc.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-misc.c; then echo $(srcdir)/t-misc.c; else echo t-misc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > t-misc_.c
 t-mul_.c: t-mul.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-mul.c; then echo $(srcdir)/t-mul.c; else echo t-mul.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > t-mul_.c
-t-pow_ui_.c: t-pow_ui.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-pow_ui.c; then echo $(srcdir)/t-pow_ui.c; else echo t-pow_ui.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > t-pow_ui_.c
+t-pow_.c: t-pow.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-pow.c; then echo $(srcdir)/t-pow.c; else echo t-pow.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > t-pow_.c
 t-powm_.c: t-powm.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-powm.c; then echo $(srcdir)/t-powm.c; else echo t-powm.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > t-powm_.c
 t-powm_ui_.c: t-powm_ui.c $(ANSI2KNR)
@@ -544,17 +571,18 @@ t-tdiv_ui_.c: t-tdiv_ui.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-tdiv_ui.c; then echo $(srcdir)/t-tdiv_ui.c; else echo t-tdiv_ui.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > t-tdiv_ui_.c
 bit_.$(OBJEXT) bit_.lo convert_.$(OBJEXT) convert_.lo dive_.$(OBJEXT) \
 dive_.lo io_.$(OBJEXT) io_.lo logic_.$(OBJEXT) logic_.lo \
-reuse_.$(OBJEXT) reuse_.lo t-2exp_.$(OBJEXT) t-2exp_.lo \
-t-bin_.$(OBJEXT) t-bin_.lo t-fac_ui_.$(OBJEXT) t-fac_ui_.lo \
-t-fdiv_.$(OBJEXT) t-fdiv_.lo t-fdiv_ui_.$(OBJEXT) t-fdiv_ui_.lo \
-t-fib_ui_.$(OBJEXT) t-fib_ui_.lo t-fits_.$(OBJEXT) t-fits_.lo \
-t-gcd_.$(OBJEXT) t-gcd_.lo t-get_si_.$(OBJEXT) t-get_si_.lo \
+reuse_.$(OBJEXT) reuse_.lo t-bin_.$(OBJEXT) t-bin_.lo \
+t-div_2exp_.$(OBJEXT) t-div_2exp_.lo t-divis_.$(OBJEXT) t-divis_.lo \
+t-divis_2exp_.$(OBJEXT) t-divis_2exp_.lo t-fac_ui_.$(OBJEXT) \
+t-fac_ui_.lo t-fdiv_.$(OBJEXT) t-fdiv_.lo t-fdiv_ui_.$(OBJEXT) \
+t-fdiv_ui_.lo t-fib_ui_.$(OBJEXT) t-fib_ui_.lo t-fits_.$(OBJEXT) \
+t-fits_.lo t-gcd_.$(OBJEXT) t-gcd_.lo t-get_si_.$(OBJEXT) t-get_si_.lo \
 t-jac_.$(OBJEXT) t-jac_.lo t-misc_.$(OBJEXT) t-misc_.lo \
-t-mul_.$(OBJEXT) t-mul_.lo t-pow_ui_.$(OBJEXT) t-pow_ui_.lo \
-t-powm_.$(OBJEXT) t-powm_.lo t-powm_ui_.$(OBJEXT) t-powm_ui_.lo \
-t-root_.$(OBJEXT) t-root_.lo t-scan_.$(OBJEXT) t-scan_.lo \
-t-sqrtrem_.$(OBJEXT) t-sqrtrem_.lo t-tdiv_.$(OBJEXT) t-tdiv_.lo \
-t-tdiv_ui_.$(OBJEXT) t-tdiv_ui_.lo : $(ANSI2KNR)
+t-mul_.$(OBJEXT) t-mul_.lo t-pow_.$(OBJEXT) t-pow_.lo t-powm_.$(OBJEXT) \
+t-powm_.lo t-powm_ui_.$(OBJEXT) t-powm_ui_.lo t-root_.$(OBJEXT) \
+t-root_.lo t-scan_.$(OBJEXT) t-scan_.lo t-sqrtrem_.$(OBJEXT) \
+t-sqrtrem_.lo t-tdiv_.$(OBJEXT) t-tdiv_.lo t-tdiv_ui_.$(OBJEXT) \
+t-tdiv_ui_.lo : $(ANSI2KNR)
 
 tags: TAGS
 
diff --git a/tests/rand/Makefile.in b/tests/rand/Makefile.in
index 5f2309123..2c6d4459c 100644
--- a/tests/rand/Makefile.in
+++ b/tests/rand/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 2000 Free Software Foundation, Inc.
 #
diff --git a/tune/Makefile.in b/tune/Makefile.in
index 07d65ece0..363b85b9b 100644
--- a/tune/Makefile.in
+++ b/tune/Makefile.in
@@ -98,6 +98,7 @@ gmp_srclinks = @gmp_srclinks@
 install_sh = @install_sh@
 mpn_objects = @mpn_objects@
 mpn_objs_in_libgmp = @mpn_objs_in_libgmp@
+mpn_objs_in_libmp = @mpn_objs_in_libmp@
 
 # Copyright 2000, 2001 Free Software Foundation, Inc.
 #