Module Name: src
Committed By: mrg
Date: Sun Jul 10 03:05:34 UTC 2011
Modified Files:
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb: Makefile.inc
gmp-mparam.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el: Makefile.inc
gmp-mparam.h gmp.h
Log Message:
make mips64 builds of gmp and mpfr work including compat libs.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.6 -r1.7 src/compat/mips64/o32/bsd.o32.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.6 src/compat/mips64/64/bsd.64.mk:1.7
--- src/compat/mips64/64/bsd.64.mk:1.6 Mon Jul 4 12:00:49 2011
+++ src/compat/mips64/64/bsd.64.mk Sun Jul 10 03:05:33 2011
@@ -1,10 +1,11 @@
-# $NetBSD: bsd.64.mk,v 1.6 2011/07/04 12:00:49 mrg Exp $
+# $NetBSD: bsd.64.mk,v 1.7 2011/07/10 03:05:33 mrg Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf64btsmip
.else
LD+= -m elf64ltsmip
.endif
+LIBGMP_MACHINE_ARCH= ${MACHINE_ARCH}
MLIBDIR= 64
COPTS+= -mabi=64
@@ -13,7 +14,4 @@
LDFLAGS+= -mabi=64
MKDEPFLAGS+= -mabi=64
-LIBMPFR_MACHINE_ARCH= mipseb
-LIBGMP_MACHINE_ARCH= mipseb
-
.include "${.PARSEDIR}/../../Makefile.compat"
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.6 src/compat/mips64/o32/bsd.o32.mk:1.7
--- src/compat/mips64/o32/bsd.o32.mk:1.6 Mon Jul 4 12:00:49 2011
+++ src/compat/mips64/o32/bsd.o32.mk Sun Jul 10 03:05:33 2011
@@ -1,10 +1,11 @@
-# $NetBSD: bsd.o32.mk,v 1.6 2011/07/04 12:00:49 mrg Exp $
+# $NetBSD: bsd.o32.mk,v 1.7 2011/07/10 03:05:33 mrg Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
.else
LD+= -m elf32ltsmip
.endif
+LIBGMP_MACHINE_ARCH= ${MACHINE_ARCH}
MLIBDIR= o32
COPTS+= -mabi=32 -march=mips3
@@ -13,7 +14,4 @@
LDFLAGS+= -mabi=32 -march=mips3
MKDEPFLAGS+= -mabi=32 -march=mips3
-LIBMPFR_MACHINE_ARCH= mipsel
-LIBGMP_MACHINE_ARCH= mipsel
-
.include "${.PARSEDIR}/../../Makefile.compat"
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc:1.1 Sun Jul 3 13:43:23 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc Sun Jul 10 03:05:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/07/03 13:43:23 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/07/10 03:05:33 mrg Exp $
SRCS+= \
random.c \
@@ -156,12 +156,14 @@
gen-trialdivtab: gen-trialdivtab.c
${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
-# XXX
-# XXX is this right?
+.if (defined(CPUFLAGS) && !empty(CPUFLAGS:M-mabi=64))
GMP_LIMB_BITS=64
+.else
+GMP_LIMB_BITS=32
+.endif
trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
+trialdivtab.h: gen-trialdivtab Makefile
${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
CLEANFILES+= trialdivtab.h
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h:1.1 Sun Jul 3 13:43:23 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h Sun Jul 10 03:05:33 2011
@@ -19,8 +19,13 @@
with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
+#ifdef _ABI64
#define GMP_LIMB_BITS 64
#define BYTES_PER_MP_LIMB 8
+#else
+#define GMP_LIMB_BITS 32
+#define BYTES_PER_MP_LIMB 4
+#endif
/* Generated by tuneup.c, 2004-02-10, gcc 3.2 & MIPSpro C 7.2.1 (R1x000) */
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h:1.1 Sun Jul 3 13:43:23 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h Sun Jul 10 03:05:33 2011
@@ -30,7 +30,11 @@
#if ! defined (__GMP_WITHIN_CONFIGURE)
#define __GMP_HAVE_HOST_CPU_FAMILY_power 0
#define __GMP_HAVE_HOST_CPU_FAMILY_powerpc 0
+#ifdef _ABI64
#define GMP_LIMB_BITS 64
+#else
+#define GMP_LIMB_BITS 32
+#endif
#define GMP_NAIL_BITS 0
#endif
#define GMP_NUMB_BITS (GMP_LIMB_BITS - GMP_NAIL_BITS)
@@ -55,7 +59,9 @@
/* Instantiated by configure. */
#if ! defined (__GMP_WITHIN_CONFIGURE)
+#ifdef _LP64
#define _LONG_LONG_LIMB 1
+#endif
#define __GMP_LIBGMP_DLL 0
#endif
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc:1.1 Sun Jul 3 13:43:23 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc Sun Jul 10 03:05:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/07/03 13:43:23 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/07/10 03:05:34 mrg Exp $
SRCS+= \
random.c \
@@ -152,12 +152,14 @@
gen-trialdivtab: gen-trialdivtab.c
${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
-# XXX
-# XXX is this right?
+.if (defined(CPUFLAGS) && !empty(CPUFLAGS:M-mabi=64))
GMP_LIMB_BITS=64
+.else
+GMP_LIMB_BITS=32
+.endif
trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
+trialdivtab.h: gen-trialdivtab Makefile
${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
CLEANFILES+= trialdivtab.h
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h:1.1 Sun Jul 3 13:43:23 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h Sun Jul 10 03:05:34 2011
@@ -19,8 +19,13 @@
with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
+#ifdef _ABI64
#define GMP_LIMB_BITS 64
#define BYTES_PER_MP_LIMB 8
+#else
+#define GMP_LIMB_BITS 32
+#define BYTES_PER_MP_LIMB 4
+#endif
/* Generated by tuneup.c, 2004-02-10, gcc 3.2 & MIPSpro C 7.2.1 (R1x000) */
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h:1.1 Sun Jul 3 13:43:23 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h Sun Jul 10 03:05:34 2011
@@ -30,7 +30,11 @@
#if ! defined (__GMP_WITHIN_CONFIGURE)
#define __GMP_HAVE_HOST_CPU_FAMILY_power 0
#define __GMP_HAVE_HOST_CPU_FAMILY_powerpc 0
+#ifdef _ABI64
#define GMP_LIMB_BITS 64
+#else
+#define GMP_LIMB_BITS 32
+#endif
#define GMP_NAIL_BITS 0
#endif
#define GMP_NUMB_BITS (GMP_LIMB_BITS - GMP_NAIL_BITS)
@@ -55,7 +59,9 @@
/* Instantiated by configure. */
#if ! defined (__GMP_WITHIN_CONFIGURE)
+#ifdef _LP64
#define _LONG_LONG_LIMB 1
+#endif
#define __GMP_LIBGMP_DLL 0
#endif
