Module Name: src
Committed By: mrg
Date: Fri Jul 1 01:49:18 UTC 2011
Modified Files:
src/external/lgpl3/gmp/lib/libgmp/arch/i386: Makefile.inc config.h
Log Message:
use C versions of various sources for now. there's an m4 problem that
fails to properly deal with defframe() macro being defined.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc \
src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc:1.1 Wed Jun 29 08:06:47 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc Fri Jul 1 01:49:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/06/29 08:06:47 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/07/01 01:49:18 mrg Exp $
SRCS+= \
random.c \
@@ -134,25 +134,34 @@
andn_n.c mpn/generic/logops_n.c \
ASM_SRCS_LIST= \
- add_n.asm mpn/x86/aors_n.asm \
- sqr_basecase.asm mpn/x86/sqr_basecase.asm \
submul_1.asm mpn/x86/aorsmul_1.asm \
- umul.asm mpn/x86/umul.asm \
- mul_basecase.asm mpn/x86/mul_basecase.asm \
- lshift.asm mpn/x86/lshift.asm \
- mul_1.asm mpn/x86/mul_1.asm \
- divrem_1.asm mpn/x86/divrem_1.asm \
- copyd.asm mpn/x86/copyd.asm \
bdiv_dbm1c.asm mpn/x86/bdiv_dbm1c.asm \
- udiv.asm mpn/x86/udiv.asm \
- dive_1.asm mpn/x86/dive_1.asm \
- copyi.asm mpn/x86/copyi.asm \
- rshift.asm mpn/x86/rshift.asm \
- mod_34lsub1.asm mpn/x86/mod_34lsub1.asm \
- invert_limb.asm mpn/x86/invert_limb.asm \
addmul_1.asm mpn/x86/aorsmul_1.asm \
divrem_2.asm mpn/x86/divrem_2.asm \
- sub_n.asm mpn/x86/aors_n.asm \
+
+# XXX using C versions
+# add_n.asm mpn/x86/aors_n.asm \
+# bdiv_q_1.asm mpn/x86_64/bdiv_q_1.asm \
+# copyd.asm mpn/x86/copyd.asm \
+# copyi.asm mpn/x86/copyi.asm \
+# dive_1.asm mpn/x86/dive_1.asm \
+# divrem_1.asm mpn/x86/divrem_1.asm \
+# invert_limb.asm mpn/x86/invert_limb.asm \
+# lshift.asm mpn/x86/lshift.asm \
+# rshift.asm mpn/x86/rshift.asm \
+# mod_34lsub1.asm mpn/x86/mod_34lsub1.asm \
+# umul.asm mpn/x86/umul.asm \
+# mul_1.asm mpn/x86/mul_1.asm \
+# sqr_basecase.asm mpn/x86/sqr_basecase.asm \
+# mul_basecase.asm mpn/x86/mul_basecase.asm \
+# sub_n.asm mpn/x86/aors_n.asm \
+
+# udiv.asm mpn/x86/udiv.asm \
+
+SRCS+= add_n.c bdiv_q_1.c copyd.c copyi.c dive_1.c lshift.c rshift.c mod_34lsub1.c
+SRCS+= mul_1.c sqr_basecase.c mul_basecase.c sub_n.c divrem_1.c
+# XXX? put in C_SRCS_LIST?
+# divrem.c
gen-trialdivtab: gen-trialdivtab.c
${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
Index: src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h:1.1 Wed Jun 29 08:06:47 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h Fri Jul 1 01:49:18 2011
@@ -215,7 +215,8 @@
implementation of the corresponding routine exists. */
#define HAVE_NATIVE_mpn_add_n 1
/* #undef HAVE_NATIVE_mpn_add_n_sub_n */
-#define HAVE_NATIVE_mpn_add_nc 1
+/* XXXMRG */
+/* #define HAVE_NATIVE_mpn_add_nc 1 */
/* #undef HAVE_NATIVE_mpn_addaddmul_1msb0 */
/* #undef HAVE_NATIVE_mpn_addlsh1_n */
/* #undef HAVE_NATIVE_mpn_addlsh2_n */
@@ -243,7 +244,8 @@
#define HAVE_NATIVE_mpn_divrem_2 1
/* #undef HAVE_NATIVE_mpn_gcd_1 */
/* #undef HAVE_NATIVE_mpn_hamdist */
-#define HAVE_NATIVE_mpn_invert_limb 1
+/* XXXMRG */
+/* #define HAVE_NATIVE_mpn_invert_limb 1 */
/* #undef HAVE_NATIVE_mpn_ior_n */
/* #undef HAVE_NATIVE_mpn_iorn_n */
#define HAVE_NATIVE_mpn_lshift 1
@@ -281,7 +283,7 @@
#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_sublsh2_n */
/* #undef HAVE_NATIVE_mpn_sublsh_n */
