x86_64 and ARM support for libgmp

Fixes #265.
2012-07-03 12:24:46 +02:00 · 2012-07-03 12:24:46 +02:00 · 7a25bf2d19
parent 1a2cce22ac
commit 7a25bf2d19
28 changed files with 2999 additions and 201 deletions
--- a/.gitignore
+++ b/.gitignore
@ -69,10 +69,20 @@
 /libports/include/readline/tilde.h
 /libports/include/zlib
 /libports/include/gmp/gmp-impl.h
+/libports/include/gmp/arm/gmp-mparam.h
 /libports/include/gmp/x86_32/gmp-mparam.h
+/libports/include/gmp/x86_64/gmp-mparam.h
 /libports/include/mpc/
 /libports/include/mpfr/
 /libports/src/lib/gmp/mpn/asm-defs.m4
+/libports/src/lib/gmp/mpn/arm/hamdist.c
+/libports/src/lib/gmp/mpn/arm/popcount.c
+/libports/src/lib/gmp/mpn/x86_32/add_n.asm
+/libports/src/lib/gmp/mpn/x86_32/sub_n.asm
+/libports/src/lib/gmp/mpn/x86_64/add_n.asm
+/libports/src/lib/gmp/mpn/x86_64/hamdist.asm
+/libports/src/lib/gmp/mpn/x86_64/popcount.asm
+/libports/src/lib/gmp/mpn/x86_64/sub_n.asm
 /libports/src/lib/ncurses/codes.c
 /libports/src/lib/ncurses/comp_captab.c
 /libports/src/lib/ncurses/fallback.c
--- a/libports/include/gmp/x86_32/fac_ui.h
+++ b/libports/include/gmp/x86_32/fac_ui.h
--- a/libports/include/gmp/x86_32/fib_table.h
+++ b/libports/include/gmp/x86_32/fib_table.h
--- a/libports/include/gmp/x86_32/gmp.h
+++ b/libports/include/gmp/x86_32/gmp.h
@ -2219,7 +2219,7 @@ enum

 /* Define CC and CFLAGS which were used to build this version of GMP */
 #define __GMP_CC "gcc -std=gnu99"
-#define __GMP_CFLAGS "-m32 -O2 -pedantic -fomit-frame-pointer -mtune=core2 -march=core2"
+#define __GMP_CFLAGS "-O2 -pedantic -fomit-frame-pointer"

 /* Major version number is the value of __GNU_MP__ too, above and in mp.h. */
 #define __GNU_MP_VERSION 4
--- a/libports/include/gmp/x86_32/mp_bases.h
+++ b/libports/include/gmp/x86_32/mp_bases.h
--- a/libports/include/gmp/x86_32/perfsqr.h
+++ b/libports/include/gmp/x86_32/perfsqr.h
--- a/libports/include/gmp/64bit/fac_ui.h
+++ b/libports/include/gmp/64bit/fac_ui.h
@ -0,0 +1,19 @@
+/* This file is automatically generated by gen-fac_ui.c */
+
+#if GMP_NUMB_BITS != 64
+Error , error this data is for 64 GMP_NUMB_BITS only
+#endif
+#if GMP_LIMB_BITS != 64
+Error , error this data is for 64 GMP_LIMB_BITS only
+#endif
+/* This table is 0!,1!,2!,3!,...,n! where n! has <= GMP_NUMB_BITS bits */
+#define ONE_LIMB_FACTORIAL_TABLE CNST_LIMB(0x1),CNST_LIMB(0x1),CNST_LIMB(0x2),CNST_LIMB(0x6),CNST_LIMB(0x18),CNST_LIMB(0x78),CNST_LIMB(0x2d0),CNST_LIMB(0x13b0),CNST_LIMB(0x9d80),CNST_LIMB(0x58980),CNST_LIMB(0x375f00),CNST_LIMB(0x2611500),CNST_LIMB(0x1c8cfc00),CNST_LIMB(0x17328cc00),CNST_LIMB(0x144c3b2800),CNST_LIMB(0x13077775800),CNST_LIMB(0x130777758000),CNST_LIMB(0x1437eeecd8000),CNST_LIMB(0x16beecca730000),CNST_LIMB(0x1b02b9306890000),CNST_LIMB(0x21c3677c82b40000)
+
+/* is 2^(GMP_LIMB_BITS+1)/exp(1) */
+#define FAC2OVERE CNST_LIMB(0xbc5c254b96be9524)
+
+/* FACMULn is largest odd x such that x*(x+2)*...*(x+2(n-1))<=2^GMP_NUMB_BITS-1 */
+
+#define FACMUL2 CNST_LIMB(0xffffffff)
+#define FACMUL3 CNST_LIMB(0x285143)
+#define FACMUL4 CNST_LIMB(0xfffd)
--- a/libports/include/gmp/64bit/fib_table.h
+++ b/libports/include/gmp/64bit/fib_table.h
@ -0,0 +1,8 @@
+/* This file generated by gen-fib.c - DO NOT EDIT. */
+
+#if GMP_NUMB_BITS != 64
+Error, error, this data is for 64 bits
+#endif
+
+#define FIB_TABLE_LIMIT         93
+#define FIB_TABLE_LUCNUM_LIMIT  92
--- a/libports/include/gmp/64bit/gmp.h
+++ b/libports/include/gmp/64bit/gmp.h
--- a/libports/include/gmp/64bit/mp_bases.h
+++ b/libports/include/gmp/64bit/mp_bases.h
@ -0,0 +1,11 @@
+/* This file generated by gen-bases.c - DO NOT EDIT. */
+
+#if GMP_NUMB_BITS != 64
+Error, error, this data is for 64 bits
+#endif
+
+/* mp_bases[10] data, as literal values */
+#define MP_BASES_CHARS_PER_LIMB_10      19
+#define MP_BASES_BIG_BASE_10            CNST_LIMB(0x8ac7230489e80000)
+#define MP_BASES_BIG_BASE_INVERTED_10   CNST_LIMB(0xd83c94fb6d2ac34a)
+#define MP_BASES_NORMALIZATION_STEPS_10 0
--- a/libports/include/gmp/64bit/perfsqr.h
+++ b/libports/include/gmp/64bit/perfsqr.h
@ -0,0 +1,46 @@
+/* This file generated by gen-psqr.c - DO NOT EDIT. */
+
+#if GMP_LIMB_BITS != 64 || GMP_NAIL_BITS != 0
+Error, error, this data is for 64 bit limb and 0 bit nail
+#endif
+
+/* Non-zero bit indicates a quadratic residue mod 0x100.
+   This test identifies 82.81% as non-squares (212/256). */
+static const mp_limb_t
+sq_res_0x100[4] = {
+  CNST_LIMB(0x202021202030213),
+  CNST_LIMB(0x202021202020213),
+  CNST_LIMB(0x202021202030212),
+  CNST_LIMB(0x202021202020212),
+};
+
+/* 2^48-1 = 3^2 * 5 * 7 * 13 * 17 * 97 ... */
+#define PERFSQR_MOD_BITS  49
+
+/* This test identifies 97.81% as non-squares. */
+#define PERFSQR_MOD_TEST(up, usize) \
+  do {                              \
+    mp_limb_t  r;                   \
+    PERFSQR_MOD_34 (r, up, usize);  \
+                                    \
+    /* 69.23% */                    \
+    PERFSQR_MOD_2 (r, CNST_LIMB(91), CNST_LIMB(0xfd2fd2fd2fd3), \
+                   CNST_LIMB(0x2191240), CNST_LIMB(0x8850a206953820e1)); \
+                                    \
+    /* 68.24% */                    \
+    PERFSQR_MOD_2 (r, CNST_LIMB(85), CNST_LIMB(0xfcfcfcfcfcfd), \
+                   CNST_LIMB(0x82158), CNST_LIMB(0x10b48c4b4206a105)); \
+                                    \
+    /* 55.56% */                    \
+    PERFSQR_MOD_1 (r, CNST_LIMB( 9), CNST_LIMB(0xe38e38e38e39), \
+                   CNST_LIMB(0x93)); \
+                                    \
+    /* 49.48% */                    \
+    PERFSQR_MOD_2 (r, CNST_LIMB(97), CNST_LIMB(0xfd5c5f02a3a1), \
+                   CNST_LIMB(0x1eb628b47), CNST_LIMB(0x6067981b8b451b5f)); \
+  } while (0)
+
+/* Grand total sq_res_0x100 and PERFSQR_MOD_TEST, 99.62% non-squares. */
+
+/* helper for tests/mpz/t-perfsqr.c */
+#define PERFSQR_DIVISORS  { 256, 91, 85, 9, 97, }
--- a/libports/include/gmp/config.h
+++ b/libports/include/gmp/config.h
@ -133,7 +133,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.
 /* #undef HAVE_HOST_CPU_FAMILY_m68k */
 /* #undef HAVE_HOST_CPU_FAMILY_power */
 /* #undef HAVE_HOST_CPU_FAMILY_powerpc */
-#define HAVE_HOST_CPU_FAMILY_x86 1
+/* #define HAVE_HOST_CPU_FAMILY_x86 1 */

 /* Define one of the following to 1 for the host CPU, as per the output of
   ./config.guess.  If your CPU is not listed here, leave all undefined.  */
@ -207,7 +207,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.
 /* Define to 1 each of the following for which a native (ie. CPU specific)
    implementation of the corresponding routine exists.  */
 #define HAVE_NATIVE_mpn_add_n 1
-#define HAVE_NATIVE_mpn_add_nc 1
+/* #define HAVE_NATIVE_mpn_add_nc 1 */
 /* #undef HAVE_NATIVE_mpn_addlsh1_n */
 /* #undef HAVE_NATIVE_mpn_addmul_1c */
 /* #undef HAVE_NATIVE_mpn_addmul_2 */
@ -237,7 +237,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.
 /* #undef HAVE_NATIVE_mpn_lshiftc */
 #define HAVE_NATIVE_mpn_mod_1 1
 #define HAVE_NATIVE_mpn_mod_1c 1
-#define HAVE_NATIVE_mpn_modexact_1_odd 1
+/* #define HAVE_NATIVE_mpn_modexact_1_odd 1 */
 #define HAVE_NATIVE_mpn_modexact_1c_odd 1
 /* #undef HAVE_NATIVE_mpn_mul_1c */
 /* #undef HAVE_NATIVE_mpn_mul_2 */
@ -254,7 +254,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.
 #define HAVE_NATIVE_mpn_sqr_basecase 1
 /* #undef HAVE_NATIVE_mpn_sqr_diagonal */
 #define HAVE_NATIVE_mpn_sub_n 1
-#define HAVE_NATIVE_mpn_sub_nc 1
+/* #define HAVE_NATIVE_mpn_sub_nc 1 */
 /* #undef HAVE_NATIVE_mpn_sublsh1_n */
 /* #undef HAVE_NATIVE_mpn_submul_1c */
 #define HAVE_NATIVE_mpn_umul_ppmm 1
--- a/libports/lib/import/import-gmp.mk
+++ b/libports/lib/import/import-gmp.mk
@ -1,14 +1,16 @@
 REP_INC_DIR += include/gmp

-ifeq ($(filter-out $(SPECS),x86),)
-  ifeq ($(filter-out $(SPECS),32bit),)
-    REP_INC_DIR += include/gmp/x86_32
-  endif # 32bit
+ifeq ($(filter-out $(SPECS),arm),)
+	REP_INC_DIR += include/gmp/32bit
+	REP_INC_DIR += include/gmp/arm
+endif

-  ifeq ($(filter-out $(SPECS),64bit),)
-    REP_INC_DIR += include/gmp/x86_64
-  endif # 64bit
+ifeq ($(filter-out $(SPECS),x86_32),)
+	REP_INC_DIR += include/gmp/32bit
+	REP_INC_DIR += include/gmp/x86_32
+endif

-else
-REQUIRES += x86
-endif # x86
+ifeq ($(filter-out $(SPECS),x86_64),)
+	REP_INC_DIR += include/gmp/64bit
+	REP_INC_DIR += include/gmp/x86_64
+endif
--- a/libports/lib/mk/arm/gmp-mpn.mk
+++ b/libports/lib/mk/arm/gmp-mpn.mk
@ -0,0 +1,65 @@
+
+GMP_MPN_DIR = $(GMP_DIR)/mpn
+
+# this file uses the 'sdiv_qrnnd' symbol which is not defined
+FILTER_OUT += udiv_w_sdiv.c
+
+# add ARM-specific assembly files and filter out the generic C files if needed
+
+SRC_ASM += copyd.asm copyi.asm
+
+FILTER_OUT += popham.c
+CC_OPT_hamdist  = -DOPERATION_hamdist
+CC_OPT_popcount = -DOPERATION_popcount
+
+SRC_ASM += add_n.asm
+FILTER_OUT += add_n.c
+
+SRC_ASM += sub_n.asm
+FILTER_OUT += sub_n.c
+
+SRC_C += $(notdir $(wildcard $(REP_DIR)/src/lib/gmp/mpn/arm/*.c))
+SRC_C += $(notdir $(wildcard $(REP_DIR)/src/lib/gmp/mpn/32bit/*.c))
+SRC_C += $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(GMP_MPN_DIR)/generic/*.c)))
+
+include $(REP_DIR)/lib/mk/gmp.inc
+
+PWD := $(shell pwd)
+
+SRC_O += $(SRC_ASM:.asm=.o)
+
+#
+# Create execution environment for the m4-ccas tool, which is used by the gmp
+# library to assemble asm files to object files. Make sure to execute this rule
+# only from the actual build pass (not when called from 'dep_lib.mk'). This
+# way, the 'm4env' gets created within the local build directory of the
+# library, not the global build directory.
+#
+ifeq ($(called_from_lib_mk),yes)
+all: m4env
+endif
+
+m4env:
+	$(VERBOSE)mkdir -p $@/mpn/arm
+	$(VERBOSE)ln -s $(REP_DIR)/src/lib/gmp/arm/config.m4 m4env
+	$(VERBOSE)ln -s $(GMP_MPN_DIR)/asm-defs.m4 m4env/mpn
+	$(VERBOSE)ln -s $(GMP_MPN_DIR)/arm/arm-defs.m4 m4env/mpn/arm
+
+#
+# Create object files out of asm files
+#
+ifneq ($(VERBOSE),)
+M4_OUTPUT_FILTER = > /dev/null
+endif
+
+%.o: %.asm
+	$(MSG_ASSEM)$@
+	$(VERBOSE)cd m4env/mpn; \
+		$(GMP_MPN_DIR)/m4-ccas --m4=m4 $(CC) $(CC_MARCH) -std=gnu99 -fPIC -DPIC $(CC_OPT_$*) $(INCLUDES) -c $< -o $(PWD)/$@ \
+			$(M4_OUTPUT_FILTER)
+
+vpath %.c   $(REP_DIR)/src/lib/gmp/mpn/arm
+vpath %.c   $(REP_DIR)/src/lib/gmp/mpn/32bit
+vpath %.c   $(GMP_MPN_DIR)/generic
+#vpath %.asm $(REP_DIR)/src/lib/gmp/mpn/
+vpath %.asm $(GMP_MPN_DIR)/arm
--- a/libports/lib/mk/gmp.inc
+++ b/libports/lib/mk/gmp.inc
@ -4,9 +4,6 @@ ifeq ($(wildcard $(GMP_DIR)),)
 REQUIRES += prepare_gmp
 endif

-# gmp depends on gmp-mpn which requires 32bit by now
-REQUIRES = x86_32
-
 include $(REP_DIR)/lib/import/import-gmp.mk

 LIBS += libc
--- a/libports/lib/mk/mpfr.mk
+++ b/libports/lib/mk/mpfr.mk
@ -4,9 +4,6 @@ ifeq ($(wildcard $(MPFR_DIR)),)
 REQUIRES += prepare_mpfr
 endif

-# mpfr depends on gmp, which is only supported on x86_32 yet
-REQUIRES += x86_32
-
 LIBS      = libc gmp
 CC_OPT   += -DHAVE_STDARG -DHAVE_VA_COPY -DHAVE_INTTYPES_H
 INC_DIR  += $(REP_DIR)/include/mpfr
--- a/libports/lib/mk/x86_32/gmp-mpn.mk
+++ b/libports/lib/mk/x86_32/gmp-mpn.mk
@ -1,15 +1,30 @@

 GMP_MPN_DIR = $(GMP_DIR)/mpn

-FILTER_OUT = popham.c pre_divrem_1.c pre_mod_1.c sizeinbase.c udiv_w_sdiv.c
+# filter out to avoid compile errors
+FILTER_OUT += pre_mod_1.c

-SRC_C += $(notdir $(wildcard $(REP_DIR)/src/lib/gmp/mpn/x86/*.c))
+# this file uses the 'sdiv_qrnnd' symbol which is not defined
+FILTER_OUT += udiv_w_sdiv.c
+
+# add Pentium-specific assembly files and filter out the generic C files if needed
+
+SRC_ASM += copyd.asm copyi.asm hamdist.asm
+
+SRC_ASM += popcount.asm
+FILTER_OUT += popham.c
+
+SRC_ASM += add_n.asm
+FILTER_OUT += add_n.c
+CC_OPT_add_n = -DOPERATION_add_n
+
+SRC_ASM += sub_n.asm
+FILTER_OUT += sub_n.c
+CC_OPT_sub_n = -DOPERATION_sub_n
+
+SRC_C += $(notdir $(wildcard $(REP_DIR)/src/lib/gmp/mpn/32bit/*.c))
 SRC_C += $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(GMP_MPN_DIR)/generic/*.c)))

-SRC_ASM = copyd.asm copyi.asm hamdist.asm popcount.asm udiv.asm umul.asm
-
-CC_OPT_divrem_1 = -DOPERATION_divrem_1
-
 include $(REP_DIR)/lib/mk/gmp.inc

 PWD := $(shell pwd)
@ -28,9 +43,8 @@ all: m4env
 endif

 m4env:
-	echo "RULE m4env"
 	$(VERBOSE)mkdir -p $@/mpn/x86
-	$(VERBOSE)ln -s $(REP_DIR)/src/lib/gmp/config.m4 m4env
+	$(VERBOSE)ln -s $(REP_DIR)/src/lib/gmp/x86_32/config.m4 m4env
 	$(VERBOSE)ln -s $(GMP_MPN_DIR)/asm-defs.m4 m4env/mpn
 	$(VERBOSE)ln -s $(GMP_MPN_DIR)/x86/x86-defs.m4 m4env/mpn/x86

@ -47,8 +61,8 @@ endif
 		$(GMP_MPN_DIR)/m4-ccas --m4=m4 $(CC) $(CC_MARCH) -std=gnu99 -fPIC -DPIC $(CC_OPT_$*) $(INCLUDES) -c $< -o $(PWD)/$@ \
 			$(M4_OUTPUT_FILTER)

-vpath %.c   $(REP_DIR)/src/lib/gmp/mpn/x86
+vpath %.c   $(REP_DIR)/src/lib/gmp/mpn/32bit
 vpath %.c   $(GMP_MPN_DIR)/generic
-vpath %.asm $(GMP_MPN_DIR)/x86
+vpath %.asm $(REP_DIR)/src/lib/gmp/mpn/x86_32
 vpath %.asm $(GMP_MPN_DIR)/x86/pentium
-
+vpath %.asm $(GMP_MPN_DIR)/x86
--- a/libports/lib/mk/x86_64/gmp-mpn.mk
+++ b/libports/lib/mk/x86_64/gmp-mpn.mk
@ -0,0 +1,66 @@
+
+GMP_MPN_DIR = $(GMP_DIR)/mpn
+
+# this file uses the 'sdiv_qrnnd' symbol which is not defined
+FILTER_OUT += udiv_w_sdiv.c
+
+FILTER_OUT += pre_divrem_1.c
+
+# add x86_64-specific assembly files and filter out the generic C files if needed
+
+SRC_ASM += copyd.asm copyi.asm
+
+CC_OPT_add_n = -DOPERATION_add_n
+CC_OPT_sub_n = -DOPERATION_sub_n
+
+SRC_ASM += hamdist.asm
+CC_OPT_hamdist = -DOPERATION_hamdist
+
+SRC_ASM += popcount.asm
+CC_OPT_popcount = -DOPERATION_popcount
+
+FILTER_OUT += popham.c
+
+SRC_C += $(notdir $(wildcard $(REP_DIR)/src/lib/gmp/mpn/64bit/*.c))
+SRC_C += $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(GMP_MPN_DIR)/generic/*.c)))
+
+include $(REP_DIR)/lib/mk/gmp.inc
+
+PWD := $(shell pwd)
+
+SRC_O += $(SRC_ASM:.asm=.o)
+
+#
+# Create execution environment for the m4-ccas tool, which is used by the gmp
+# library to assemble asm files to object files. Make sure to execute this rule
+# only from the actual build pass (not when called from 'dep_lib.mk'). This
+# way, the 'm4env' gets created within the local build directory of the
+# library, not the global build directory.
+#
+ifeq ($(called_from_lib_mk),yes)
+all: m4env
+endif
+
+m4env:
+	$(VERBOSE)mkdir -p $@/mpn/x86_64
+	$(VERBOSE)ln -s $(REP_DIR)/src/lib/gmp/x86_64/config.m4 m4env
+	$(VERBOSE)ln -s $(GMP_MPN_DIR)/asm-defs.m4 m4env/mpn
+	$(VERBOSE)ln -s $(GMP_MPN_DIR)/x86_64/x86_64-defs.m4 m4env/mpn/x86_64
+
+#
+# Create object files out of asm files
+#
+ifneq ($(VERBOSE),)
+M4_OUTPUT_FILTER = > /dev/null
+endif
+
+%.o: %.asm
+	$(MSG_ASSEM)$@
+	$(VERBOSE)cd m4env/mpn; \
+		$(GMP_MPN_DIR)/m4-ccas --m4=m4 $(CC) $(CC_MARCH) -std=gnu99 -fPIC -DPIC $(CC_OPT_$*) $(INCLUDES) -c $< -o $(PWD)/$@ \
+			$(M4_OUTPUT_FILTER)
+
+vpath %.c   $(REP_DIR)/src/lib/gmp/mpn/64bit
+vpath %.c   $(GMP_MPN_DIR)/generic
+vpath %.asm $(REP_DIR)/src/lib/gmp/mpn/x86_64
+vpath %.asm $(GMP_MPN_DIR)/x86_64
--- a/libports/ports/gmp.mk
+++ b/libports/ports/gmp.mk
@ -8,10 +8,20 @@ GMP_URL  = ftp://ftp.gmplib.org/pub/$(GMP)/$(GMP_TBZ2)
 PORTS += $(GMP)

 GMP_INCLUDES  = include/gmp/gmp-impl.h
+GMP_INCLUDES += include/gmp/arm/gmp-mparam.h
 GMP_INCLUDES += include/gmp/x86_32/gmp-mparam.h
-GMP_M4_SRC   += src/lib/gmp/mpn/asm-defs.m4
+GMP_INCLUDES += include/gmp/x86_64/gmp-mparam.h
+GMP_SRC      += src/lib/gmp/mpn/asm-defs.m4 \
+                src/lib/gmp/mpn/arm/hamdist.c \
+                src/lib/gmp/mpn/arm/popcount.c \
+                src/lib/gmp/mpn/x86_32/add_n.asm \
+                src/lib/gmp/mpn/x86_32/sub_n.asm \
+                src/lib/gmp/mpn/x86_64/add_n.asm \
+                src/lib/gmp/mpn/x86_64/sub_n.asm \
+                src/lib/gmp/mpn/x86_64/hamdist.asm \
+                src/lib/gmp/mpn/x86_64/popcount.asm

-prepare-gmp: $(CONTRIB_DIR)/$(GMP) $(GMP_INCLUDES) $(GMP_M4_SRC)
+prepare-gmp: $(CONTRIB_DIR)/$(GMP) $(GMP_INCLUDES) $(GMP_SRC)

 $(CONTRIB_DIR)/$(GMP): clean-gmp

@ -27,13 +37,55 @@ $(CONTRIB_DIR)/$(GMP): $(DOWNLOAD_DIR)/$(GMP_TBZ2)
 include/gmp/gmp-impl.h:
 	$(VERBOSE)ln -sf ../../$(CONTRIB_DIR)/$(GMP)/gmp-impl.h $@

-include/gmp/x86_32/gmp-mparam.h: $(CONTRIB_DIR)/$(GMP)/mpn/x86/gmp-mparam.h
+include/gmp/arm/gmp-mparam.h: $(CONTRIB_DIR)/$(GMP)/mpn/arm/gmp-mparam.h
+	$(VERBOSE)mkdir -p include/gmp/arm
+	$(VERBOSE)ln -sf ../../../$< $@
+
+include/gmp/x86_32/gmp-mparam.h: $(CONTRIB_DIR)/$(GMP)/mpn/x86/pentium/gmp-mparam.h
+	$(VERBOSE)mkdir -p include/gmp/x86_32
+	$(VERBOSE)ln -sf ../../../$< $@
+
+include/gmp/x86_64/gmp-mparam.h: $(CONTRIB_DIR)/$(GMP)/mpn/x86_64/gmp-mparam.h
+	$(VERBOSE)mkdir -p include/gmp/x86_64
 	$(VERBOSE)ln -sf ../../../$< $@

 src/lib/gmp/mpn/asm-defs.m4: $(CONTRIB_DIR)/$(GMP)/mpn/asm-defs.m4
 	$(VERBOSE)mkdir -p $(dir $@)
 	$(VERBOSE)ln -sf ../../../../$< $@

+src/lib/gmp/mpn/arm/hamdist.c: $(CONTRIB_DIR)/$(GMP)/mpn/generic/popham.c
+	$(VERBOSE)mkdir -p $(dir $@)
+	$(VERBOSE)ln -sf ../../../../../$< $@
+
+src/lib/gmp/mpn/arm/popcount.c: $(CONTRIB_DIR)/$(GMP)/mpn/generic/popham.c
+	$(VERBOSE)mkdir -p $(dir $@)
+	$(VERBOSE)ln -sf ../../../../../$< $@
+
+src/lib/gmp/mpn/x86_32/add_n.asm: $(CONTRIB_DIR)/$(GMP)/mpn/x86/pentium/aors_n.asm
+	$(VERBOSE)mkdir -p $(dir $@)
+	$(VERBOSE)ln -sf ../../../../../$< $@
+
+src/lib/gmp/mpn/x86_32/sub_n.asm: $(CONTRIB_DIR)/$(GMP)/mpn/x86/pentium/aors_n.asm
+	$(VERBOSE)mkdir -p $(dir $@)
+	$(VERBOSE)ln -sf ../../../../../$< $@
+
+src/lib/gmp/mpn/x86_64/add_n.asm: $(CONTRIB_DIR)/$(GMP)/mpn/x86_64/aors_n.asm
+	$(VERBOSE)mkdir -p $(dir $@)
+	$(VERBOSE)ln -sf ../../../../../$< $@
+
+src/lib/gmp/mpn/x86_64/sub_n.asm: $(CONTRIB_DIR)/$(GMP)/mpn/x86_64/aors_n.asm
+	$(VERBOSE)mkdir -p $(dir $@)
+	$(VERBOSE)ln -sf ../../../../../$< $@
+
+src/lib/gmp/mpn/x86_64/hamdist.asm: $(CONTRIB_DIR)/$(GMP)/mpn/x86_64/popham.asm
+	$(VERBOSE)mkdir -p $(dir $@)
+	$(VERBOSE)ln -sf ../../../../../$< $@
+
+src/lib/gmp/mpn/x86_64/popcount.asm: $(CONTRIB_DIR)/$(GMP)/mpn/x86_64/popham.asm
+	$(VERBOSE)mkdir -p $(dir $@)
+	$(VERBOSE)ln -sf ../../../../../$< $@
+
 clean-gmp:
 	$(VERBOSE)rm -f  $(GMP_INCLUDES)
+	$(VERBOSE)rm -f  $(GMP_SRC)
 	$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(GMP)
--- a/libports/src/lib/gmp/arm/config.m4
+++ b/libports/src/lib/gmp/arm/config.m4
@ -0,0 +1,35 @@
+dnl config.m4.  Generated automatically by configure.
+changequote(<,>)
+ifdef(<__CONFIG_M4_INCLUDED__>,,<
+define(<CONFIG_TOP_SRCDIR>,<`../.'>)
+define(<WANT_ASSERT>,0)
+define(<WANT_PROFILING>,<`no'>)
+define(<M4WRAP_SPURIOUS>,<no>)
+define(<TEXT>, <.text>)
+define(<DATA>, <.data>)
+define(<LABEL_SUFFIX>, <:>)
+define(<GLOBL>, <.globl>)
+define(<GLOBL_ATTR>, <>)
+define(<GSYM_PREFIX>, <>)
+define(<RODATA>, <	.section	.rodata>)
+define(<TYPE>, <.type	$1,#$2>)
+define(<SIZE>, <.size	$1,$2>)
+define(<LSYM_PREFIX>, <.L>)
+define(<W32>, <.long>)
+define(<ALIGN_LOGARITHMIC>,<yes>)
+define(<SQR_KARATSUBA_THRESHOLD>,<82>)
+define(<SIZEOF_UNSIGNED>,<4>)
+define(<GMP_LIMB_BITS>,32)
+define(<GMP_NAIL_BITS>,0)
+define(<GMP_NUMB_BITS>,eval(GMP_LIMB_BITS-GMP_NAIL_BITS))
+>)
+changequote(`,')
+ifdef(`__CONFIG_M4_INCLUDED__',,`
+include(CONFIG_TOP_SRCDIR`/mpn/asm-defs.m4')
+include_mpn(`arm/arm-defs.m4')
+define_not_for_expansion(`HAVE_HOST_CPU_armv7l')
+define_not_for_expansion(`HAVE_ABI_standard')
+define_not_for_expansion(`HAVE_LIMB_LITTLE_ENDIAN')
+define_not_for_expansion(`HAVE_DOUBLE_IEEE_LITTLE_ENDIAN')
+')
+define(`__CONFIG_M4_INCLUDED__')
--- a/libports/src/lib/gmp/mpn/32bit/fib_table.c
+++ b/libports/src/lib/gmp/mpn/32bit/fib_table.c
--- a/libports/src/lib/gmp/mpn/32bit/mp_bases.c
+++ b/libports/src/lib/gmp/mpn/32bit/mp_bases.c
--- a/libports/src/lib/gmp/mpn/64bit/fib_table.c
+++ b/libports/src/lib/gmp/mpn/64bit/fib_table.c
@ -0,0 +1,107 @@
+/* This file generated by gen-fib.c - DO NOT EDIT. */
+
+#include "gmp.h"
+#include "gmp-impl.h"
+
+#if GMP_NUMB_BITS != 64
+Error, error, this data is for 64 bits
+#endif
+
+const mp_limb_t
+__gmp_fib_table[FIB_TABLE_LIMIT+2] = {
+  CNST_LIMB (0x1),  /* -1 */
+  CNST_LIMB (0x0),  /* 0 */
+  CNST_LIMB (0x1),  /* 1 */
+  CNST_LIMB (0x1),  /* 2 */
+  CNST_LIMB (0x2),  /* 3 */
+  CNST_LIMB (0x3),  /* 4 */
+  CNST_LIMB (0x5),  /* 5 */
+  CNST_LIMB (0x8),  /* 6 */
+  CNST_LIMB (0xd),  /* 7 */
+  CNST_LIMB (0x15),  /* 8 */
+  CNST_LIMB (0x22),  /* 9 */
+  CNST_LIMB (0x37),  /* 10 */
+  CNST_LIMB (0x59),  /* 11 */
+  CNST_LIMB (0x90),  /* 12 */
+  CNST_LIMB (0xe9),  /* 13 */
+  CNST_LIMB (0x179),  /* 14 */
+  CNST_LIMB (0x262),  /* 15 */
+  CNST_LIMB (0x3db),  /* 16 */
+  CNST_LIMB (0x63d),  /* 17 */
+  CNST_LIMB (0xa18),  /* 18 */
+  CNST_LIMB (0x1055),  /* 19 */
+  CNST_LIMB (0x1a6d),  /* 20 */
+  CNST_LIMB (0x2ac2),  /* 21 */
+  CNST_LIMB (0x452f),  /* 22 */
+  CNST_LIMB (0x6ff1),  /* 23 */
+  CNST_LIMB (0xb520),  /* 24 */
+  CNST_LIMB (0x12511),  /* 25 */
+  CNST_LIMB (0x1da31),  /* 26 */
+  CNST_LIMB (0x2ff42),  /* 27 */
+  CNST_LIMB (0x4d973),  /* 28 */
+  CNST_LIMB (0x7d8b5),  /* 29 */
+  CNST_LIMB (0xcb228),  /* 30 */
+  CNST_LIMB (0x148add),  /* 31 */
+  CNST_LIMB (0x213d05),  /* 32 */
+  CNST_LIMB (0x35c7e2),  /* 33 */
+  CNST_LIMB (0x5704e7),  /* 34 */
+  CNST_LIMB (0x8cccc9),  /* 35 */
+  CNST_LIMB (0xe3d1b0),  /* 36 */
+  CNST_LIMB (0x1709e79),  /* 37 */
+  CNST_LIMB (0x2547029),  /* 38 */
+  CNST_LIMB (0x3c50ea2),  /* 39 */
+  CNST_LIMB (0x6197ecb),  /* 40 */
+  CNST_LIMB (0x9de8d6d),  /* 41 */
+  CNST_LIMB (0xff80c38),  /* 42 */
+  CNST_LIMB (0x19d699a5),  /* 43 */
+  CNST_LIMB (0x29cea5dd),  /* 44 */
+  CNST_LIMB (0x43a53f82),  /* 45 */
+  CNST_LIMB (0x6d73e55f),  /* 46 */
+  CNST_LIMB (0xb11924e1),  /* 47 */
+  CNST_LIMB (0x11e8d0a40),  /* 48 */
+  CNST_LIMB (0x1cfa62f21),  /* 49 */
+  CNST_LIMB (0x2ee333961),  /* 50 */
+  CNST_LIMB (0x4bdd96882),  /* 51 */
+  CNST_LIMB (0x7ac0ca1e3),  /* 52 */
+  CNST_LIMB (0xc69e60a65),  /* 53 */
+  CNST_LIMB (0x1415f2ac48),  /* 54 */
+  CNST_LIMB (0x207fd8b6ad),  /* 55 */
+  CNST_LIMB (0x3495cb62f5),  /* 56 */
+  CNST_LIMB (0x5515a419a2),  /* 57 */
+  CNST_LIMB (0x89ab6f7c97),  /* 58 */
+  CNST_LIMB (0xdec1139639),  /* 59 */
+  CNST_LIMB (0x1686c8312d0),  /* 60 */
+  CNST_LIMB (0x2472d96a909),  /* 61 */
+  CNST_LIMB (0x3af9a19bbd9),  /* 62 */
+  CNST_LIMB (0x5f6c7b064e2),  /* 63 */
+  CNST_LIMB (0x9a661ca20bb),  /* 64 */
+  CNST_LIMB (0xf9d297a859d),  /* 65 */
+  CNST_LIMB (0x19438b44a658),  /* 66 */
+  CNST_LIMB (0x28e0b4bf2bf5),  /* 67 */
+  CNST_LIMB (0x42244003d24d),  /* 68 */
+  CNST_LIMB (0x6b04f4c2fe42),  /* 69 */
+  CNST_LIMB (0xad2934c6d08f),  /* 70 */
+  CNST_LIMB (0x1182e2989ced1),  /* 71 */
+  CNST_LIMB (0x1c5575e509f60),  /* 72 */
+  CNST_LIMB (0x2dd8587da6e31),  /* 73 */
+  CNST_LIMB (0x4a2dce62b0d91),  /* 74 */
+  CNST_LIMB (0x780626e057bc2),  /* 75 */
+  CNST_LIMB (0xc233f54308953),  /* 76 */
+  CNST_LIMB (0x13a3a1c2360515),  /* 77 */
+  CNST_LIMB (0x1fc6e116668e68),  /* 78 */
+  CNST_LIMB (0x336a82d89c937d),  /* 79 */
+  CNST_LIMB (0x533163ef0321e5),  /* 80 */
+  CNST_LIMB (0x869be6c79fb562),  /* 81 */
+  CNST_LIMB (0xd9cd4ab6a2d747),  /* 82 */
+  CNST_LIMB (0x16069317e428ca9),  /* 83 */
+  CNST_LIMB (0x23a367c34e563f0),  /* 84 */
+  CNST_LIMB (0x39a9fadb327f099),  /* 85 */
+  CNST_LIMB (0x5d4d629e80d5489),  /* 86 */
+  CNST_LIMB (0x96f75d79b354522),  /* 87 */
+  CNST_LIMB (0xf444c01834299ab),  /* 88 */
+  CNST_LIMB (0x18b3c1d91e77decd),  /* 89 */
+  CNST_LIMB (0x27f80ddaa1ba7878),  /* 90 */
+  CNST_LIMB (0x40abcfb3c0325745),  /* 91 */
+  CNST_LIMB (0x68a3dd8e61eccfbd),  /* 92 */
+  CNST_LIMB (0xa94fad42221f2702),  /* 93 */
+};
--- a/libports/src/lib/gmp/mpn/64bit/mp_bases.c
+++ b/libports/src/lib/gmp/mpn/64bit/mp_bases.c
@ -0,0 +1,269 @@
+/* This file generated by gen-bases.c - DO NOT EDIT. */
+
+#include "gmp.h"
+#include "gmp-impl.h"
+
+#if GMP_NUMB_BITS != 64
+Error, error, this data is for 64 bits
+#endif
+
+const struct bases mp_bases[257] =
+{
+  /*   0 */ { 0, 0.0, 0 },
+  /*   1 */ { 0, 1e37, 0 },
+  /*   2 */ { 64, 1.0000000000000000, 0x1 },
+  /*   3 */ { 40, 0.6309297535714574, CNST_LIMB(0xa8b8b452291fe821), CNST_LIMB(0x846d550e37b5063d) },
+  /*   4 */ { 32, 0.5000000000000000, 0x2 },
+  /*   5 */ { 27, 0.4306765580733931, CNST_LIMB(0x6765c793fa10079d), CNST_LIMB(0x3ce9a36f23c0fc90) },
+  /*   6 */ { 24, 0.3868528072345416, CNST_LIMB(0x41c21cb8e1000000), CNST_LIMB(0xf24f62335024a295) },
+  /*   7 */ { 22, 0.3562071871080222, CNST_LIMB(0x3642798750226111), CNST_LIMB(0x2df495ccaa57147b) },
+  /*   8 */ { 21, 0.3333333333333334, 0x3 },
+  /*   9 */ { 20, 0.3154648767857287, CNST_LIMB(0xa8b8b452291fe821), CNST_LIMB(0x846d550e37b5063d) },
+  /*  10 */ { 19, 0.3010299956639811, CNST_LIMB(0x8ac7230489e80000), CNST_LIMB(0xd83c94fb6d2ac34a) },
+  /*  11 */ { 18, 0.2890648263178878, CNST_LIMB(0x4d28cb56c33fa539), CNST_LIMB(0xa8adf7ae45e7577b) },
+  /*  12 */ { 17, 0.2789429456511298, CNST_LIMB(0x1eca170c00000000), CNST_LIMB(0xa10c2bec5da8f8f) },
+  /*  13 */ { 17, 0.2702381544273197, CNST_LIMB(0x780c7372621bd74d), CNST_LIMB(0x10f4becafe412ec3) },
+  /*  14 */ { 16, 0.2626495350371936, CNST_LIMB(0x1e39a5057d810000), CNST_LIMB(0xf08480f672b4e86) },
+  /*  15 */ { 16, 0.2559580248098155, CNST_LIMB(0x5b27ac993df97701), CNST_LIMB(0x6779c7f90dc42f48) },
+  /*  16 */ { 16, 0.2500000000000000, 0x4 },
+  /*  17 */ { 15, 0.2446505421182260, CNST_LIMB(0x27b95e997e21d9f1), CNST_LIMB(0x9c71e11bab279323) },
+  /*  18 */ { 15, 0.2398124665681315, CNST_LIMB(0x5da0e1e53c5c8000), CNST_LIMB(0x5dfaa697ec6f6a1c) },
+  /*  19 */ { 15, 0.2354089133666382, CNST_LIMB(0xd2ae3299c1c4aedb), CNST_LIMB(0x3711783f6be7e9ec) },
+  /*  20 */ { 14, 0.2313782131597592, CNST_LIMB(0x16bcc41e90000000), CNST_LIMB(0x6849b86a12b9b01e) },
+  /*  21 */ { 14, 0.2276702486969530, CNST_LIMB(0x2d04b7fdd9c0ef49), CNST_LIMB(0x6bf097ba5ca5e239) },
+  /*  22 */ { 14, 0.2242438242175754, CNST_LIMB(0x5658597bcaa24000), CNST_LIMB(0x7b8015c8d7af8f08) },
+  /*  23 */ { 14, 0.2210647294575037, CNST_LIMB(0xa0e2073737609371), CNST_LIMB(0x975a24b3a3151b38) },
+  /*  24 */ { 13, 0.2181042919855316, CNST_LIMB(0xc29e98000000000), CNST_LIMB(0x50bd367972689db1) },
+  /*  25 */ { 13, 0.2153382790366965, CNST_LIMB(0x14adf4b7320334b9), CNST_LIMB(0x8c240c4aecb13bb5) },
+  /*  26 */ { 13, 0.2127460535533632, CNST_LIMB(0x226ed36478bfa000), CNST_LIMB(0xdbd2e56854e118c9) },
+  /*  27 */ { 13, 0.2103099178571525, CNST_LIMB(0x383d9170b85ff80b), CNST_LIMB(0x2351ffcaa9c7c4ae) },
+  /*  28 */ { 13, 0.2080145976765095, CNST_LIMB(0x5a3c23e39c000000), CNST_LIMB(0x6b24188ca33b0636) },
+  /*  29 */ { 13, 0.2058468324604344, CNST_LIMB(0x8e65137388122bcd), CNST_LIMB(0xcc3dceaf2b8ba99d) },
+  /*  30 */ { 13, 0.2037950470905062, CNST_LIMB(0xdd41bb36d259e000), CNST_LIMB(0x2832e835c6c7d6b6) },
+  /*  31 */ { 12, 0.2018490865820999, CNST_LIMB(0xaee5720ee830681), CNST_LIMB(0x76b6aa272e1873c5) },
+  /*  32 */ { 12, 0.2000000000000000, 0x5 },
+  /*  33 */ { 12, 0.1982398631705605, CNST_LIMB(0x172588ad4f5f0981), CNST_LIMB(0x61eaf5d402c7bf4f) },
+  /*  34 */ { 12, 0.1965616322328226, CNST_LIMB(0x211e44f7d02c1000), CNST_LIMB(0xeeb658123ffb27ec) },
+  /*  35 */ { 12, 0.1949590218937863, CNST_LIMB(0x2ee56725f06e5c71), CNST_LIMB(0x5d5e3762e6fdf509) },
+  /*  36 */ { 12, 0.1934264036172708, CNST_LIMB(0x41c21cb8e1000000), CNST_LIMB(0xf24f62335024a295) },
+  /*  37 */ { 12, 0.1919587200065601, CNST_LIMB(0x5b5b57f8a98a5dd1), CNST_LIMB(0x66ae7831762efb6f) },
+  /*  38 */ { 12, 0.1905514124267734, CNST_LIMB(0x7dcff8986ea31000), CNST_LIMB(0x47388865a00f544) },
+  /*  39 */ { 12, 0.1892003595168700, CNST_LIMB(0xabd4211662a6b2a1), CNST_LIMB(0x7d673c33a123b54c) },
+  /*  40 */ { 12, 0.1879018247091076, CNST_LIMB(0xe8d4a51000000000), CNST_LIMB(0x19799812dea11197) },
+  /*  41 */ { 11, 0.1866524112389434, CNST_LIMB(0x7a32956ad081b79), CNST_LIMB(0xc27e62e0686feae) },
+  /*  42 */ { 11, 0.1854490234153689, CNST_LIMB(0x9f49aaff0e86800), CNST_LIMB(0x9b6e7507064ce7c7) },
+  /*  43 */ { 11, 0.1842888331487062, CNST_LIMB(0xce583bb812d37b3), CNST_LIMB(0x3d9ac2bf66cfed94) },
+  /*  44 */ { 11, 0.1831692509136336, CNST_LIMB(0x109b79a654c00000), CNST_LIMB(0xed46bc50ce59712a) },
+  /*  45 */ { 11, 0.1820879004699383, CNST_LIMB(0x1543beff214c8b95), CNST_LIMB(0x813d97e2c89b8d46) },
+  /*  46 */ { 11, 0.1810425967800402, CNST_LIMB(0x1b149a79459a3800), CNST_LIMB(0x2e81751956af8083) },
+  /*  47 */ { 11, 0.1800313266566926, CNST_LIMB(0x224edfb5434a830f), CNST_LIMB(0xdd8e0a95e30c0988) },
+  /*  48 */ { 11, 0.1790522317510413, CNST_LIMB(0x2b3fb00000000000), CNST_LIMB(0x7ad4dd48a0b5b167) },
+  /*  49 */ { 11, 0.1781035935540111, CNST_LIMB(0x3642798750226111), CNST_LIMB(0x2df495ccaa57147b) },
+  /*  50 */ { 11, 0.1771838201355579, CNST_LIMB(0x43c33c1937564800), CNST_LIMB(0xe392010175ee5962) },
+  /*  51 */ { 11, 0.1762914343888821, CNST_LIMB(0x54411b2441c3cd8b), CNST_LIMB(0x84eaf11b2fe7738e) },
+  /*  52 */ { 11, 0.1754250635819545, CNST_LIMB(0x6851455acd400000), CNST_LIMB(0x3a1e3971e008995d) },
+  /*  53 */ { 11, 0.1745834300480449, CNST_LIMB(0x80a23b117c8feb6d), CNST_LIMB(0xfd7a462344ffce25) },
+  /*  54 */ { 11, 0.1737653428714400, CNST_LIMB(0x9dff7d32d5dc1800), CNST_LIMB(0x9eca40b40ebcef8a) },
+  /*  55 */ { 11, 0.1729696904450771, CNST_LIMB(0xc155af6faeffe6a7), CNST_LIMB(0x52fa161a4a48e43d) },
+  /*  56 */ { 11, 0.1721954337940981, CNST_LIMB(0xebb7392e00000000), CNST_LIMB(0x1607a2cbacf930c1) },
+  /*  57 */ { 10, 0.1714416005739134, CNST_LIMB(0x50633659656d971), CNST_LIMB(0x97a014f8e3be55f1) },
+  /*  58 */ { 10, 0.1707072796637201, CNST_LIMB(0x5fa8624c7fba400), CNST_LIMB(0x568df8b76cbf212c) },
+  /*  59 */ { 10, 0.1699916162869140, CNST_LIMB(0x717d9faa73c5679), CNST_LIMB(0x20ba7c4b4e6ef492) },
+  /*  60 */ { 10, 0.1692938075987814, CNST_LIMB(0x86430aac6100000), CNST_LIMB(0xe81ee46b9ef492f5) },
+  /*  61 */ { 10, 0.1686130986895011, CNST_LIMB(0x9e64d9944b57f29), CNST_LIMB(0x9dc0d10d51940416) },
+  /*  62 */ { 10, 0.1679487789570419, CNST_LIMB(0xba5ca5392cb0400), CNST_LIMB(0x5fa8ed2f450272a5) },
+  /*  63 */ { 10, 0.1673001788101741, CNST_LIMB(0xdab2ce1d022cd81), CNST_LIMB(0x2ba9eb8c5e04e641) },
+  /*  64 */ { 10, 0.1666666666666667, 0x6 },
+  /*  65 */ { 10, 0.1660476462159378, CNST_LIMB(0x12aeed5fd3e2d281), CNST_LIMB(0xb67759cc00287bf1) },
+  /*  66 */ { 10, 0.1654425539190583, CNST_LIMB(0x15c3da1572d50400), CNST_LIMB(0x78621feeb7f4ed33) },
+  /*  67 */ { 10, 0.1648508567221604, CNST_LIMB(0x194c05534f75ee29), CNST_LIMB(0x43d55b5f72943bc0) },
+  /*  68 */ { 10, 0.1642720499620502, CNST_LIMB(0x1d56299ada100000), CNST_LIMB(0x173decb64d1d4409) },
+  /*  69 */ { 10, 0.1637056554452156, CNST_LIMB(0x21f2a089a4ff4f79), CNST_LIMB(0xe29fb54fd6b6074f) },
+  /*  70 */ { 10, 0.1631512196835108, CNST_LIMB(0x2733896c68d9a400), CNST_LIMB(0xa1f1f5c210d54e62) },
+  /*  71 */ { 10, 0.1626083122716341, CNST_LIMB(0x2d2cf2c33b533c71), CNST_LIMB(0x6aac7f9bfafd57b2) },
+  /*  72 */ { 10, 0.1620765243931223, CNST_LIMB(0x33f506e440000000), CNST_LIMB(0x3b563c2478b72ee2) },
+  /*  73 */ { 10, 0.1615554674429964, CNST_LIMB(0x3ba43bec1d062211), CNST_LIMB(0x12b536b574e92d1b) },
+  /*  74 */ { 10, 0.1610447717564444, CNST_LIMB(0x4455872d8fd4e400), CNST_LIMB(0xdf86c03020404fa5) },
+  /*  75 */ { 10, 0.1605440854340214, CNST_LIMB(0x4e2694539f2f6c59), CNST_LIMB(0xa34adf02234eea8e) },
+  /*  76 */ { 10, 0.1600530732548213, CNST_LIMB(0x5938006c18900000), CNST_LIMB(0x6f46eb8574eb59dd) },
+  /*  77 */ { 10, 0.1595714156699382, CNST_LIMB(0x65ad9912474aa649), CNST_LIMB(0x42459b481df47cec) },
+  /*  78 */ { 10, 0.1590988078692941, CNST_LIMB(0x73ae9ff4241ec400), CNST_LIMB(0x1b424b95d80ca505) },
+  /*  79 */ { 10, 0.1586349589155960, CNST_LIMB(0x836612ee9c4ce1e1), CNST_LIMB(0xf2c1b982203a0dac) },
+  /*  80 */ { 10, 0.1581795909397823, CNST_LIMB(0x9502f90000000000), CNST_LIMB(0xb7cdfd9d7bdbab7d) },
+  /*  81 */ { 10, 0.1577324383928644, CNST_LIMB(0xa8b8b452291fe821), CNST_LIMB(0x846d550e37b5063d) },
+  /*  82 */ { 10, 0.1572932473495469, CNST_LIMB(0xbebf59a07dab4400), CNST_LIMB(0x57931eeaf85cf64f) },
+  /*  83 */ { 10, 0.1568617748594410, CNST_LIMB(0xd7540d4093bc3109), CNST_LIMB(0x305a944507c82f47) },
+  /*  84 */ { 10, 0.1564377883420716, CNST_LIMB(0xf2b96616f1900000), CNST_LIMB(0xe007ccc9c22781a) },
+  /*  85 */ { 9, 0.1560210650222250, CNST_LIMB(0x336de62af2bca35), CNST_LIMB(0x3e92c42e000eeed4) },
+  /*  86 */ { 9, 0.1556113914024940, CNST_LIMB(0x39235ec33d49600), CNST_LIMB(0x1ebe59130db2795e) },
+  /*  87 */ { 9, 0.1552085627701551, CNST_LIMB(0x3f674e539585a17), CNST_LIMB(0x268859e90f51b89) },
+  /*  88 */ { 9, 0.1548123827357682, CNST_LIMB(0x4645b6958000000), CNST_LIMB(0xd24cde0463108cfa) },
+  /*  89 */ { 9, 0.1544226628011101, CNST_LIMB(0x4dcb74afbc49c19), CNST_LIMB(0xa536009f37adc383) },
+  /*  90 */ { 9, 0.1540392219542636, CNST_LIMB(0x56064e1d18d9a00), CNST_LIMB(0x7cea06ce1c9ace10) },
+  /*  91 */ { 9, 0.1536618862898642, CNST_LIMB(0x5f04fe2cd8a39fb), CNST_LIMB(0x58db032e72e8ba43) },
+  /*  92 */ { 9, 0.1532904886526781, CNST_LIMB(0x68d74421f5c0000), CNST_LIMB(0x388cc17cae105447) },
+  /*  93 */ { 9, 0.1529248683028321, CNST_LIMB(0x738df1f6ab4827d), CNST_LIMB(0x1b92672857620ce0) },
+  /*  94 */ { 9, 0.1525648706011593, CNST_LIMB(0x7f3afbc9cfb5e00), CNST_LIMB(0x18c6a9575c2ade4) },
+  /*  95 */ { 9, 0.1522103467132434, CNST_LIMB(0x8bf187fba88f35f), CNST_LIMB(0xd44da7da8e44b24f) },
+  /*  96 */ { 9, 0.1518611533308632, CNST_LIMB(0x99c600000000000), CNST_LIMB(0xaa2f78f1b4cc6794) },
+  /*  97 */ { 9, 0.1515171524096389, CNST_LIMB(0xa8ce21eb6531361), CNST_LIMB(0x843c067d091ee4cc) },
+  /*  98 */ { 9, 0.1511782109217764, CNST_LIMB(0xb92112c1a0b6200), CNST_LIMB(0x62005e1e913356e3) },
+  /*  99 */ { 9, 0.1508442006228941, CNST_LIMB(0xcad7718b8747c43), CNST_LIMB(0x4316eed01dedd518) },
+  /* 100 */ { 9, 0.1505149978319906, CNST_LIMB(0xde0b6b3a7640000), CNST_LIMB(0x2725dd1d243aba0e) },
+  /* 101 */ { 9, 0.1501904832236879, CNST_LIMB(0xf2d8cf5fe6d74c5), CNST_LIMB(0xddd9057c24cb54f) },
+  /* 102 */ { 9, 0.1498705416319474, CNST_LIMB(0x1095d25bfa712600), CNST_LIMB(0xedeee175a736d2a1) },
+  /* 103 */ { 9, 0.1495550618645152, CNST_LIMB(0x121b7c4c3698faa7), CNST_LIMB(0xc4699f3df8b6b328) },
+  /* 104 */ { 9, 0.1492439365274121, CNST_LIMB(0x13c09e8d68000000), CNST_LIMB(0x9ebbe7d859cb5a7c) },
+  /* 105 */ { 9, 0.1489370618588283, CNST_LIMB(0x15876ccb0b709ca9), CNST_LIMB(0x7c828b9887eb2179) },
+  /* 106 */ { 9, 0.1486343375718350, CNST_LIMB(0x17723c2976da2a00), CNST_LIMB(0x5d652ab99001adcf) },
+  /* 107 */ { 9, 0.1483356667053617, CNST_LIMB(0x198384e9c259048b), CNST_LIMB(0x4114f1754e5d7b32) },
+  /* 108 */ { 9, 0.1480409554829326, CNST_LIMB(0x1bbde41dfeec0000), CNST_LIMB(0x274b7c902f7e0188) },
+  /* 109 */ { 9, 0.1477501131786861, CNST_LIMB(0x1e241d6e3337910d), CNST_LIMB(0xfc9e0fbb32e210c) },
+  /* 110 */ { 9, 0.1474630519902391, CNST_LIMB(0x20b91cee9901ee00), CNST_LIMB(0xf4afa3e594f8ea1f) },
+  /* 111 */ { 9, 0.1471796869179852, CNST_LIMB(0x237ff9079863dfef), CNST_LIMB(0xcd85c32e9e4437b0) },
+  /* 112 */ { 9, 0.1468999356504447, CNST_LIMB(0x267bf47000000000), CNST_LIMB(0xa9bbb147e0dd92a8) },
+  /* 113 */ { 9, 0.1466237184553111, CNST_LIMB(0x29b08039fbeda7f1), CNST_LIMB(0x8900447b70e8eb82) },
+  /* 114 */ { 9, 0.1463509580758620, CNST_LIMB(0x2d213df34f65f200), CNST_LIMB(0x6b0a92adaad5848a) },
+  /* 115 */ { 9, 0.1460815796324244, CNST_LIMB(0x30d201d957a7c2d3), CNST_LIMB(0x4f990ad8740f0ee5) },
+  /* 116 */ { 9, 0.1458155105286054, CNST_LIMB(0x34c6d52160f40000), CNST_LIMB(0x3670a9663a8d3610) },
+  /* 117 */ { 9, 0.1455526803620167, CNST_LIMB(0x3903f855d8f4c755), CNST_LIMB(0x1f5c44188057be3c) },
+  /* 118 */ { 9, 0.1452930208392428, CNST_LIMB(0x3d8de5c8ec59b600), CNST_LIMB(0xa2bea956c4e4977) },
+  /* 119 */ { 9, 0.1450364656948130, CNST_LIMB(0x4269541d1ff01337), CNST_LIMB(0xed68b23033c3637e) },
+  /* 120 */ { 9, 0.1447829506139581, CNST_LIMB(0x479b38e478000000), CNST_LIMB(0xc99cf624e50549c5) },
+  /* 121 */ { 9, 0.1445324131589439, CNST_LIMB(0x4d28cb56c33fa539), CNST_LIMB(0xa8adf7ae45e7577b) },
+  /* 122 */ { 9, 0.1442847926987864, CNST_LIMB(0x5317871fa13aba00), CNST_LIMB(0x8a5bc740b1c113e5) },
+  /* 123 */ { 9, 0.1440400303421672, CNST_LIMB(0x596d2f44de9fa71b), CNST_LIMB(0x6e6c7efb81cfbb9b) },
+  /* 124 */ { 9, 0.1437980688733775, CNST_LIMB(0x602fd125c47c0000), CNST_LIMB(0x54aba5c5cada5f10) },
+  /* 125 */ { 9, 0.1435588526911310, CNST_LIMB(0x6765c793fa10079d), CNST_LIMB(0x3ce9a36f23c0fc90) },
+  /* 126 */ { 9, 0.1433223277500932, CNST_LIMB(0x6f15be069b847e00), CNST_LIMB(0x26fb43de2c8cd2a8) },
+  /* 127 */ { 9, 0.1430884415049874, CNST_LIMB(0x7746b3e82a77047f), CNST_LIMB(0x12b94793db8486a1) },
+  /* 128 */ { 9, 0.1428571428571428, 0x7 },
+  /* 129 */ { 9, 0.1426283821033600, CNST_LIMB(0x894953f7ea890481), CNST_LIMB(0xdd5deca404c0156d) },
+  /* 130 */ { 9, 0.1424021108869747, CNST_LIMB(0x932abffea4848200), CNST_LIMB(0xbd51373330291de0) },
+  /* 131 */ { 9, 0.1421782821510107, CNST_LIMB(0x9dacb687d3d6a163), CNST_LIMB(0x9fa4025d66f23085) },
+  /* 132 */ { 9, 0.1419568500933153, CNST_LIMB(0xa8d8102a44840000), CNST_LIMB(0x842530ee2db4949d) },
+  /* 133 */ { 9, 0.1417377701235801, CNST_LIMB(0xb4b60f9d140541e5), CNST_LIMB(0x6aa7f2766b03dc25) },
+  /* 134 */ { 9, 0.1415209988221527, CNST_LIMB(0xc15065d4856e4600), CNST_LIMB(0x53035ba7ebf32e8d) },
+  /* 135 */ { 9, 0.1413064939005528, CNST_LIMB(0xceb1363f396d23c7), CNST_LIMB(0x3d12091fc9fb4914) },
+  /* 136 */ { 9, 0.1410942141636095, CNST_LIMB(0xdce31b2488000000), CNST_LIMB(0x28b1cb81b1ef1849) },
+  /* 137 */ { 9, 0.1408841194731412, CNST_LIMB(0xebf12a24bca135c9), CNST_LIMB(0x15c35be67ae3e2c9) },
+  /* 138 */ { 9, 0.1406761707131039, CNST_LIMB(0xfbe6f8dbf88f4a00), CNST_LIMB(0x42a17bd09be1ff0) },
+  /* 139 */ { 8, 0.1404703297561400, CNST_LIMB(0x1ef156c084ce761), CNST_LIMB(0x8bf461f03cf0bbf) },
+  /* 140 */ { 8, 0.1402665594314587, CNST_LIMB(0x20c4e3b94a10000), CNST_LIMB(0xf3fbb43f68a32d05) },
+  /* 141 */ { 8, 0.1400648234939879, CNST_LIMB(0x22b0695a08ba421), CNST_LIMB(0xd84f44c48564dc19) },
+  /* 142 */ { 8, 0.1398650865947379, CNST_LIMB(0x24b4f35d7a4c100), CNST_LIMB(0xbe58ebcce7956abe) },
+  /* 143 */ { 8, 0.1396673142523192, CNST_LIMB(0x26d397284975781), CNST_LIMB(0xa5fac463c7c134b7) },
+  /* 144 */ { 8, 0.1394714728255649, CNST_LIMB(0x290d74100000000), CNST_LIMB(0x8f19241e28c7d757) },
+  /* 145 */ { 8, 0.1392775294872041, CNST_LIMB(0x2b63b3a37866081), CNST_LIMB(0x799a6d046c0ae1ae) },
+  /* 146 */ { 8, 0.1390854521985406, CNST_LIMB(0x2dd789f4d894100), CNST_LIMB(0x6566e37d746a9e40) },
+  /* 147 */ { 8, 0.1388952096850913, CNST_LIMB(0x306a35e51b58721), CNST_LIMB(0x526887dbfb5f788f) },
+  /* 148 */ { 8, 0.1387067714131417, CNST_LIMB(0x331d01712e10000), CNST_LIMB(0x408af3382b8efd3d) },
+  /* 149 */ { 8, 0.1385201075671774, CNST_LIMB(0x35f14200a827c61), CNST_LIMB(0x2fbb374806ec05f1) },
+  /* 150 */ { 8, 0.1383351890281539, CNST_LIMB(0x38e858b62216100), CNST_LIMB(0x1fe7c0f0afce87fe) },
+  /* 151 */ { 8, 0.1381519873525671, CNST_LIMB(0x3c03b2c13176a41), CNST_LIMB(0x11003d517540d32e) },
+  /* 152 */ { 8, 0.1379704747522905, CNST_LIMB(0x3f44c9b21000000), CNST_LIMB(0x2f5810f98eff0dc) },
+  /* 153 */ { 8, 0.1377906240751463, CNST_LIMB(0x42ad23cef3113c1), CNST_LIMB(0xeb72e35e7840d910) },
+  /* 154 */ { 8, 0.1376124087861776, CNST_LIMB(0x463e546b19a2100), CNST_LIMB(0xd27de19593dc3614) },
+  /* 155 */ { 8, 0.1374358029495937, CNST_LIMB(0x49f9fc3f96684e1), CNST_LIMB(0xbaf391fd3e5e6fc2) },
+  /* 156 */ { 8, 0.1372607812113589, CNST_LIMB(0x4de1c9c5dc10000), CNST_LIMB(0xa4bd38c55228c81d) },
+  /* 157 */ { 8, 0.1370873187823978, CNST_LIMB(0x51f77994116d2a1), CNST_LIMB(0x8fc5a8de8e1de782) },
+  /* 158 */ { 8, 0.1369153914223921, CNST_LIMB(0x563cd6bb3398100), CNST_LIMB(0x7bf9265bea9d3a3b) },
+  /* 159 */ { 8, 0.1367449754241439, CNST_LIMB(0x5ab3bb270beeb01), CNST_LIMB(0x69454b325983dccd) },
+  /* 160 */ { 8, 0.1365760475984821, CNST_LIMB(0x5f5e10000000000), CNST_LIMB(0x5798ee2308c39df9) },
+  /* 161 */ { 8, 0.1364085852596902, CNST_LIMB(0x643dce0ec16f501), CNST_LIMB(0x46e40ba0fa66a753) },
+  /* 162 */ { 8, 0.1362425662114337, CNST_LIMB(0x6954fe21e3e8100), CNST_LIMB(0x3717b0870b0db3a7) },
+  /* 163 */ { 8, 0.1360779687331669, CNST_LIMB(0x6ea5b9755f440a1), CNST_LIMB(0x2825e6775d11cdeb) },
+  /* 164 */ { 8, 0.1359147715670014, CNST_LIMB(0x74322a1c0410000), CNST_LIMB(0x1a01a1c09d1b4dac) },
+  /* 165 */ { 8, 0.1357529539050150, CNST_LIMB(0x79fc8b6ae8a46e1), CNST_LIMB(0xc9eb0a8bebc8f3e) },
+  /* 166 */ { 8, 0.1355924953769863, CNST_LIMB(0x80072a66d512100), CNST_LIMB(0xffe357ff59e6a004) },
+  /* 167 */ { 8, 0.1354333760385373, CNST_LIMB(0x86546633b42b9c1), CNST_LIMB(0xe7dfd1be05fa61a8) },
+  /* 168 */ { 8, 0.1352755763596663, CNST_LIMB(0x8ce6b0861000000), CNST_LIMB(0xd11ed6fc78f760e5) },
+  /* 169 */ { 8, 0.1351190772136599, CNST_LIMB(0x93c08e16a022441), CNST_LIMB(0xbb8db609dd29ebfe) },
+  /* 170 */ { 8, 0.1349638598663645, CNST_LIMB(0x9ae49717f026100), CNST_LIMB(0xa71aec8d1813d532) },
+  /* 171 */ { 8, 0.1348099059658079, CNST_LIMB(0xa25577ae24c1a61), CNST_LIMB(0x93b612a9f20fbc02) },
+  /* 172 */ { 8, 0.1346571975321549, CNST_LIMB(0xaa15f068e610000), CNST_LIMB(0x814fc7b19a67d317) },
+  /* 173 */ { 8, 0.1345057169479844, CNST_LIMB(0xb228d6bf7577921), CNST_LIMB(0x6fd9a03f2e0a4b7c) },
+  /* 174 */ { 8, 0.1343554469488779, CNST_LIMB(0xba91158ef5c4100), CNST_LIMB(0x5f4615a38d0d316e) },
+  /* 175 */ { 8, 0.1342063706143054, CNST_LIMB(0xc351ad9aec0b681), CNST_LIMB(0x4f8876863479a286) },
+  /* 176 */ { 8, 0.1340584713587980, CNST_LIMB(0xcc6db6100000000), CNST_LIMB(0x4094d8a3041b60eb) },
+  /* 177 */ { 8, 0.1339117329233981, CNST_LIMB(0xd5e85d09025c181), CNST_LIMB(0x32600b8ed883a09b) },
+  /* 178 */ { 8, 0.1337661393673756, CNST_LIMB(0xdfc4e816401c100), CNST_LIMB(0x24df8c6eb4b6d1f1) },
+  /* 179 */ { 8, 0.1336216750601996, CNST_LIMB(0xea06b4c72947221), CNST_LIMB(0x18097a8ee151acef) },
+  /* 180 */ { 8, 0.1334783246737591, CNST_LIMB(0xf4b139365210000), CNST_LIMB(0xbd48cc8ec1cd8e3) },
+  /* 181 */ { 8, 0.1333360731748201, CNST_LIMB(0xffc80497d520961), CNST_LIMB(0x3807a8d67485fb) },
+  /* 182 */ { 8, 0.1331949058177136, CNST_LIMB(0x10b4ebfca1dee100), CNST_LIMB(0xea5768860b62e8d8) },
+  /* 183 */ { 8, 0.1330548081372441, CNST_LIMB(0x117492de921fc141), CNST_LIMB(0xd54faf5b635c5005) },
+  /* 184 */ { 8, 0.1329157659418126, CNST_LIMB(0x123bb2ce41000000), CNST_LIMB(0xc14a56233a377926) },
+  /* 185 */ { 8, 0.1327777653067443, CNST_LIMB(0x130a8b6157bdecc1), CNST_LIMB(0xae39a88db7cd329f) },
+  /* 186 */ { 8, 0.1326407925678156, CNST_LIMB(0x13e15dede0e8a100), CNST_LIMB(0x9c10bde69efa7ab6) },
+  /* 187 */ { 8, 0.1325048343149731, CNST_LIMB(0x14c06d941c0ca7e1), CNST_LIMB(0x8ac36c42a2836497) },
+  /* 188 */ { 8, 0.1323698773862368, CNST_LIMB(0x15a7ff487a810000), CNST_LIMB(0x7a463c8b84f5ef67) },
+  /* 189 */ { 8, 0.1322359088617821, CNST_LIMB(0x169859ddc5c697a1), CNST_LIMB(0x6a8e5f5ad090fd4b) },
+  /* 190 */ { 8, 0.1321029160581950, CNST_LIMB(0x1791c60f6fed0100), CNST_LIMB(0x5b91a2943596fc56) },
+  /* 191 */ { 8, 0.1319708865228925, CNST_LIMB(0x18948e8c0e6fba01), CNST_LIMB(0x4d4667b1c468e8f0) },
+  /* 192 */ { 8, 0.1318398080287045, CNST_LIMB(0x19a1000000000000), CNST_LIMB(0x3fa39ab547994daf) },
+  /* 193 */ { 8, 0.1317096685686114, CNST_LIMB(0x1ab769203dafc601), CNST_LIMB(0x32a0a9b2faee1e2a) },
+  /* 194 */ { 8, 0.1315804563506306, CNST_LIMB(0x1bd81ab557f30100), CNST_LIMB(0x26357ceac0e96962) },
+  /* 195 */ { 8, 0.1314521597928493, CNST_LIMB(0x1d0367a69fed1ba1), CNST_LIMB(0x1a5a6f65caa5859e) },
+  /* 196 */ { 8, 0.1313247675185968, CNST_LIMB(0x1e39a5057d810000), CNST_LIMB(0xf08480f672b4e86) },
+  /* 197 */ { 8, 0.1311982683517524, CNST_LIMB(0x1f7b2a18f29ac3e1), CNST_LIMB(0x4383340615612ca) },
+  /* 198 */ { 8, 0.1310726513121843, CNST_LIMB(0x20c850694c2aa100), CNST_LIMB(0xf3c77969ee4be5a2) },
+  /* 199 */ { 8, 0.1309479056113158, CNST_LIMB(0x222173cc014980c1), CNST_LIMB(0xe00993cc187c5ec9) },
+  /* 200 */ { 8, 0.1308240206478128, CNST_LIMB(0x2386f26fc1000000), CNST_LIMB(0xcd2b297d889bc2b6) },
+  /* 201 */ { 8, 0.1307009860033912, CNST_LIMB(0x24f92ce8af296d41), CNST_LIMB(0xbb214d5064862b22) },
+  /* 202 */ { 8, 0.1305787914387386, CNST_LIMB(0x2678863cd0ece100), CNST_LIMB(0xa9e1a7ca7ea10e20) },
+  /* 203 */ { 8, 0.1304574268895465, CNST_LIMB(0x280563f0a9472d61), CNST_LIMB(0x99626e72b39ea0cf) },
+  /* 204 */ { 8, 0.1303368824626505, CNST_LIMB(0x29a02e1406210000), CNST_LIMB(0x899a5ba9c13fafd9) },
+  /* 205 */ { 8, 0.1302171484322746, CNST_LIMB(0x2b494f4efe6d2e21), CNST_LIMB(0x7a80a705391e96ff) },
+  /* 206 */ { 8, 0.1300982152363760, CNST_LIMB(0x2d0134ef21cbc100), CNST_LIMB(0x6c0cfe23de23042a) },
+  /* 207 */ { 8, 0.1299800734730872, CNST_LIMB(0x2ec84ef4da2ef581), CNST_LIMB(0x5e377df359c944dd) },
+  /* 208 */ { 8, 0.1298627138972530, CNST_LIMB(0x309f102100000000), CNST_LIMB(0x50f8ac5fc8f53985) },
+  /* 209 */ { 8, 0.1297461274170591, CNST_LIMB(0x3285ee02a1420281), CNST_LIMB(0x44497266278e35b7) },
+  /* 210 */ { 8, 0.1296303050907487, CNST_LIMB(0x347d6104fc324100), CNST_LIMB(0x382316831f7ee175) },
+  /* 211 */ { 8, 0.1295152381234257, CNST_LIMB(0x3685e47dade53d21), CNST_LIMB(0x2c7f377833b8946e) },
+  /* 212 */ { 8, 0.1294009178639407, CNST_LIMB(0x389ff6bb15610000), CNST_LIMB(0x2157c761ab4163ef) },
+  /* 213 */ { 8, 0.1292873358018581, CNST_LIMB(0x3acc1912ebb57661), CNST_LIMB(0x16a7071803cc49a9) },
+  /* 214 */ { 8, 0.1291744835645007, CNST_LIMB(0x3d0acff111946100), CNST_LIMB(0xc6781d80f8224fc) },
+  /* 215 */ { 8, 0.1290623529140715, CNST_LIMB(0x3f5ca2e692eaf841), CNST_LIMB(0x294092d370a900b) },
+  /* 216 */ { 8, 0.1289509357448472, CNST_LIMB(0x41c21cb8e1000000), CNST_LIMB(0xf24f62335024a295) },
+  /* 217 */ { 8, 0.1288402240804449, CNST_LIMB(0x443bcb714399a5c1), CNST_LIMB(0xe03b98f103fad6d2) },
+  /* 218 */ { 8, 0.1287302100711567, CNST_LIMB(0x46ca406c81af2100), CNST_LIMB(0xcee3d32cad2a9049) },
+  /* 219 */ { 8, 0.1286208859913518, CNST_LIMB(0x496e106ac22aaae1), CNST_LIMB(0xbe3f9df9277fdada) },
+  /* 220 */ { 8, 0.1285122442369443, CNST_LIMB(0x4c27d39fa5410000), CNST_LIMB(0xae46f0d94c05e933) },
+  /* 221 */ { 8, 0.1284042773229231, CNST_LIMB(0x4ef825c296e43ca1), CNST_LIMB(0x9ef2280fb437a33d) },
+  /* 222 */ { 8, 0.1282969778809442, CNST_LIMB(0x51dfa61f5ad88100), CNST_LIMB(0x9039ff426d3f284b) },
+  /* 223 */ { 8, 0.1281903386569819, CNST_LIMB(0x54def7a6d2f16901), CNST_LIMB(0x82178c6d6b51f8f4) },
+  /* 224 */ { 8, 0.1280843525090381, CNST_LIMB(0x57f6c10000000000), CNST_LIMB(0x74843b1ee4c1e053) },
+  /* 225 */ { 8, 0.1279790124049077, CNST_LIMB(0x5b27ac993df97701), CNST_LIMB(0x6779c7f90dc42f48) },
+  /* 226 */ { 8, 0.1278743114199984, CNST_LIMB(0x5e7268b9bbdf8100), CNST_LIMB(0x5af23c74f9ad9fe9) },
+  /* 227 */ { 8, 0.1277702427352035, CNST_LIMB(0x61d7a7932ff3d6a1), CNST_LIMB(0x4ee7eae2acdc617e) },
+  /* 228 */ { 8, 0.1276667996348261, CNST_LIMB(0x65581f53c8c10000), CNST_LIMB(0x43556aa2ac262a0b) },
+  /* 229 */ { 8, 0.1275639755045533, CNST_LIMB(0x68f48a385b8320e1), CNST_LIMB(0x3835949593b8ddd1) },
+  /* 230 */ { 8, 0.1274617638294791, CNST_LIMB(0x6cada69ed07c2100), CNST_LIMB(0x2d837fbe78458762) },
+  /* 231 */ { 8, 0.1273601581921741, CNST_LIMB(0x70843718cdbf27c1), CNST_LIMB(0x233a7e150a54a555) },
+  /* 232 */ { 8, 0.1272591522708010, CNST_LIMB(0x7479027ea1000000), CNST_LIMB(0x19561984a50ff8fe) },
+  /* 233 */ { 8, 0.1271587398372755, CNST_LIMB(0x788cd40268f39641), CNST_LIMB(0xfd211159fe3490f) },
+  /* 234 */ { 8, 0.1270589147554692, CNST_LIMB(0x7cc07b437ecf6100), CNST_LIMB(0x6aa563e655033e3) },
+  /* 235 */ { 8, 0.1269596709794558, CNST_LIMB(0x8114cc6220762061), CNST_LIMB(0xfbb614b3f2d3b14c) },
+  /* 236 */ { 8, 0.1268610025517973, CNST_LIMB(0x858aa0135be10000), CNST_LIMB(0xeac0f8837fb05773) },
+  /* 237 */ { 8, 0.1267629036018709, CNST_LIMB(0x8a22d3b53c54c321), CNST_LIMB(0xda6e4c10e8615ca5) },
+  /* 238 */ { 8, 0.1266653683442337, CNST_LIMB(0x8ede496339f34100), CNST_LIMB(0xcab755a8d01fa67f) },
+  /* 239 */ { 8, 0.1265683910770258, CNST_LIMB(0x93bde80aec3a1481), CNST_LIMB(0xbb95a9ae71aa3e0c) },
+  /* 240 */ { 8, 0.1264719661804097, CNST_LIMB(0x98c29b8100000000), CNST_LIMB(0xad0326c296b4f529) },
+  /* 241 */ { 8, 0.1263760881150453, CNST_LIMB(0x9ded549671832381), CNST_LIMB(0x9ef9f21eed31b7c1) },
+  /* 242 */ { 8, 0.1262807514205999, CNST_LIMB(0xa33f092e0b1ac100), CNST_LIMB(0x91747422be14b0b2) },
+  /* 243 */ { 8, 0.1261859507142915, CNST_LIMB(0xa8b8b452291fe821), CNST_LIMB(0x846d550e37b5063d) },
+  /* 244 */ { 8, 0.1260916806894653, CNST_LIMB(0xae5b564ac3a10000), CNST_LIMB(0x77df79e9a96c06f6) },
+  /* 245 */ { 8, 0.1259979361142023, CNST_LIMB(0xb427f4b3be74c361), CNST_LIMB(0x6bc6019636c7d0c2) },
+  /* 246 */ { 8, 0.1259047118299582, CNST_LIMB(0xba1f9a938041e100), CNST_LIMB(0x601c4205aebd9e47) },
+  /* 247 */ { 8, 0.1258120027502338, CNST_LIMB(0xc0435871d1110f41), CNST_LIMB(0x54ddc59756f05016) },
+  /* 248 */ { 8, 0.1257198038592741, CNST_LIMB(0xc694446f01000000), CNST_LIMB(0x4a0648979c838c18) },
+  /* 249 */ { 8, 0.1256281102107963, CNST_LIMB(0xcd137a5b57ac3ec1), CNST_LIMB(0x3f91b6e0bb3a053d) },
+  /* 250 */ { 8, 0.1255369169267456, CNST_LIMB(0xd3c21bcecceda100), CNST_LIMB(0x357c299a88ea76a5) },
+  /* 251 */ { 8, 0.1254462191960791, CNST_LIMB(0xdaa150410b788de1), CNST_LIMB(0x2bc1e517aecc56e3) },
+  /* 252 */ { 8, 0.1253560122735751, CNST_LIMB(0xe1b24521be010000), CNST_LIMB(0x225f56ceb3da9f5d) },
+  /* 253 */ { 8, 0.1252662914786691, CNST_LIMB(0xe8f62df12777c1a1), CNST_LIMB(0x1951136d53ad63ac) },
+  /* 254 */ { 8, 0.1251770521943144, CNST_LIMB(0xf06e445906fc0100), CNST_LIMB(0x1093d504b3cd7d93) },
+  /* 255 */ { 8, 0.1250882898658681, CNST_LIMB(0xf81bc845c81bf801), CNST_LIMB(0x824794d1ec1814f) },
+  /* 256 */ { 8, 0.1250000000000000, 0x8 },
+};
--- a/libports/src/lib/gmp/mpn/x86/add_n.asm
+++ b/libports/src/lib/gmp/mpn/x86/add_n.asm
@ -1,145 +0,0 @@
-dnl  Intel P6 mpn_add_n/mpn_sub_n -- mpn add or subtract.
-
-dnl  Copyright 2006 Free Software Foundation, Inc.
-dnl
-dnl  This file is part of the GNU MP Library.
-dnl
-dnl  The GNU MP Library is free software; you can redistribute it and/or modify
-dnl  it under the terms of the GNU Lesser General Public License as published
-dnl  by the Free Software Foundation; either version 3 of the License, or (at
-dnl  your option) any later version.
-dnl
-dnl  The GNU MP Library is distributed in the hope that it will be useful, but
-dnl  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-dnl  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-dnl  License for more details.
-dnl
-dnl  You should have received a copy of the GNU Lesser General Public License
-dnl  along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.
-
-include(`../config.m4')
-
-C TODO:
-C  * Avoid indexed adressing, it makes us stall on the two-ported register
-C    file.
-
-C                           cycles/limb
-C P6 model 0-8,10-12)           3.17
-C P6 model 9   (Banias)         ?
-C P6 model 13  (Dothan)         2.25
-
-
-define(`rp',	`%edi')
-define(`up',	`%esi')
-define(`vp',	`%ebx')
-define(`n',	`%ecx')
-
-ifdef(`OPERATION_add_n', `
-	define(ADCSBB,	      adc)
-	define(func,	      mpn_add_n)
-	define(func_nc,	      mpn_add_nc)')
-ifdef(`OPERATION_sub_n', `
-	define(ADCSBB,	      sbb)
-	define(func,	      mpn_sub_n)
-	define(func_nc,	      mpn_sub_nc)')
-
-MULFUNC_PROLOGUE(mpn_add_n mpn_add_nc mpn_sub_n mpn_sub_nc)
-
-ASM_START()
-
-	TEXT
-	ALIGN(16)
-
-PROLOGUE(func)
-	xor	%edx, %edx
-L(start):
-	push	%edi
-	push	%esi
-	push	%ebx
-
-	mov	16(%esp), rp
-	mov	20(%esp), up
-	mov	24(%esp), vp
-	mov	28(%esp), n
-
-	lea	(up,n,4), up
-	lea	(vp,n,4), vp
-	lea	(rp,n,4), rp
-
-	neg	n
-	mov	n, %eax
-	and	$-8, n
-	and	$7, %eax
-	shl	$2, %eax			C 4x
-ifdef(`PIC',`
-	call	L(pic_calc)
-L(here):
-',`
-	lea	L(ent) (%eax,%eax,2), %eax	C 12x
-')
-
-	shr	%edx				C set cy flag
-	jmp	*%eax
-
-ifdef(`PIC',`
-L(pic_calc):
-	C See mpn/x86/README about old gas bugs
-	lea	(%eax,%eax,2), %eax
-	add	$L(ent)-L(here), %eax
-	add	(%esp), %eax
-	ret_internal
-')
-
-L(end):
-	sbb	%eax, %eax
-	neg	%eax
-	pop	%ebx
-	pop	%esi
-	pop	%edi
-	ret
-
-	ALIGN(16)
-L(top):
-	jecxz	L(end)
-L(ent):
-Zdisp(	mov,	0,(up,n,4), %eax)
-Zdisp(	ADCSBB,	0,(vp,n,4), %eax)
-Zdisp(	mov,	%eax, 0,(rp,n,4))
-
-	mov	4(up,n,4), %edx
-	ADCSBB	4(vp,n,4), %edx
-	mov	%edx, 4(rp,n,4)
-
-	mov	8(up,n,4), %eax
-	ADCSBB	8(vp,n,4), %eax
-	mov	%eax, 8(rp,n,4)
-
-	mov	12(up,n,4), %edx
-	ADCSBB	12(vp,n,4), %edx
-	mov	%edx, 12(rp,n,4)
-
-	mov	16(up,n,4), %eax
-	ADCSBB	16(vp,n,4), %eax
-	mov	%eax, 16(rp,n,4)
-
-	mov	20(up,n,4), %edx
-	ADCSBB	20(vp,n,4), %edx
-	mov	%edx, 20(rp,n,4)
-
-	mov	24(up,n,4), %eax
-	ADCSBB	24(vp,n,4), %eax
-	mov	%eax, 24(rp,n,4)
-
-	mov	28(up,n,4), %edx
-	ADCSBB	28(vp,n,4), %edx
-	mov	%edx, 28(rp,n,4)
-
-	lea	8(n), n
-	jmp	L(top)
-
-EPILOGUE()
-
-PROLOGUE(func_nc)
-	movl	20(%esp), %edx
-	jmp	L(start)
-EPILOGUE()
--- a/libports/src/lib/gmp/mpn/x86/dummy.c
+++ b/libports/src/lib/gmp/mpn/x86/dummy.c
@ -1,21 +0,0 @@
-#include <stdio.h>
-
-void __gmpn_add_nc()
-{
-	printf("gmp: '__gmpn_add_nc' not yet implemented\n");
-}
-
-void __gmpn_sub_nc()
-{
-	printf("gmp: '__gmpn_sub_nc' not yet implemented\n");
-}
-
-void __gmpn_preinv_divrem_1()
-{
-	printf("gmp: '__gmpn_preinv_divrem_1' not yet implemented\n");
-}
-
-void __gmpn_preinv_mod_1()
-{
-	printf("gmp: '__gmpn_preinv_mod_1' not yet implemented\n");
-}
--- a/libports/src/lib/gmp/x86_32/config.m4
+++ b/libports/src/lib/gmp/x86_32/config.m4
--- a/libports/src/lib/gmp/x86_64/config.m4
+++ b/libports/src/lib/gmp/x86_64/config.m4
@ -0,0 +1,36 @@
+dnl config.m4.  Generated automatically by configure.
+changequote(<,>)
+ifdef(<__CONFIG_M4_INCLUDED__>,,<
+define(<CONFIG_TOP_SRCDIR>,<`../.'>)
+define(<WANT_ASSERT>,0)
+define(<WANT_PROFILING>,<`no'>)
+define(<M4WRAP_SPURIOUS>,<no>)
+define(<TEXT>, <.text>)
+define(<DATA>, <.data>)
+define(<LABEL_SUFFIX>, <:>)
+define(<GLOBL>, <.globl>)
+define(<GLOBL_ATTR>, <>)
+define(<GSYM_PREFIX>, <>)
+define(<RODATA>, <	.section	.rodata>)
+define(<TYPE>, <.type	$1,@$2>)
+define(<SIZE>, <.size	$1,$2>)
+define(<LSYM_PREFIX>, <.L>)
+define(<W32>, <.long>)
+define(<ALIGN_LOGARITHMIC>,<no>)
+define(<ALIGN_FILL_0x90>,<yes>)
+define(<SQR_KARATSUBA_THRESHOLD>,<32>)
+define(<SIZEOF_UNSIGNED>,<4>)
+define(<GMP_LIMB_BITS>,64)
+define(<GMP_NAIL_BITS>,0)
+define(<GMP_NUMB_BITS>,eval(GMP_LIMB_BITS-GMP_NAIL_BITS))
+>)
+changequote(`,')
+ifdef(`__CONFIG_M4_INCLUDED__',,`
+include(CONFIG_TOP_SRCDIR`/mpn/asm-defs.m4')
+include_mpn(`x86_64/x86_64-defs.m4')
+define_not_for_expansion(`HAVE_HOST_CPU_core2')
+define_not_for_expansion(`HAVE_ABI_64')
+define_not_for_expansion(`HAVE_LIMB_LITTLE_ENDIAN')
+define_not_for_expansion(`HAVE_DOUBLE_IEEE_LITTLE_ENDIAN')
+')
+define(`__CONFIG_M4_INCLUDED__')