Module Name: src
Committed By: mrg
Date: Fri Jul 1 01:30:17 UTC 2011
Modified Files:
src/compat/amd64/i386: bsd.i386.mk
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
src/compat/sparc64/sparc: bsd.sparc.mk
src/external/lgpl3/gmp/lib/libgmp: Makefile
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
Log Message:
- add support for src/compat builds
- use .include not .sinclude for the arch Makefile.inc file
- clean up
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/amd64/i386/bsd.i386.mk
cvs rdiff -u -r1.4 -r1.5 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.4 -r1.5 src/compat/mips64/o32/bsd.o32.mk
cvs rdiff -u -r1.2 -r1.3 src/compat/sparc64/sparc/bsd.sparc.mk
cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/lgpl3/mpfr/lib/libmpfr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/amd64/i386/bsd.i386.mk
diff -u src/compat/amd64/i386/bsd.i386.mk:1.2 src/compat/amd64/i386/bsd.i386.mk:1.3
--- src/compat/amd64/i386/bsd.i386.mk:1.2 Sat Dec 19 00:15:13 2009
+++ src/compat/amd64/i386/bsd.i386.mk Fri Jul 1 01:30:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.i386.mk,v 1.2 2009/12/19 00:15:13 christos Exp $
+# $NetBSD: bsd.i386.mk,v 1.3 2011/07/01 01:30:16 mrg Exp $
LD+= -m elf_i386
MLIBDIR= i386
@@ -10,5 +10,7 @@
CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
+LIBMPFR_MACHINE_ARCH= ${MLIBDIR}
+LIBGMP_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.4 src/compat/mips64/64/bsd.64.mk:1.5
--- src/compat/mips64/64/bsd.64.mk:1.4 Sat Dec 19 04:11:32 2009
+++ src/compat/mips64/64/bsd.64.mk Fri Jul 1 01:30:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.64.mk,v 1.4 2009/12/19 04:11:32 christos Exp $
+# $NetBSD: bsd.64.mk,v 1.5 2011/07/01 01:30:16 mrg Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf64btsmip
@@ -13,4 +13,7 @@
LDFLAGS+= -mabi=64
MKDEPFLAGS+= -mabi=64
+LIBMPFR_MACHINE_ARCH= ${MLIBDIR}
+LIBGMP_MACHINE_ARCH= ${MLIBDIR}
+
.include "${.PARSEDIR}/../../Makefile.compat"
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.4 src/compat/mips64/o32/bsd.o32.mk:1.5
--- src/compat/mips64/o32/bsd.o32.mk:1.4 Sat Dec 19 04:11:33 2009
+++ src/compat/mips64/o32/bsd.o32.mk Fri Jul 1 01:30:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.4 2009/12/19 04:11:33 christos Exp $
+# $NetBSD: bsd.o32.mk,v 1.5 2011/07/01 01:30:16 mrg Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
@@ -13,4 +13,7 @@
LDFLAGS+= -mabi=32 -march=mips3
MKDEPFLAGS+= -mabi=32 -march=mips3
+LIBMPFR_MACHINE_ARCH= ${MLIBDIR}
+LIBGMP_MACHINE_ARCH= ${MLIBDIR}
+
.include "${.PARSEDIR}/../../Makefile.compat"
Index: src/compat/sparc64/sparc/bsd.sparc.mk
diff -u src/compat/sparc64/sparc/bsd.sparc.mk:1.2 src/compat/sparc64/sparc/bsd.sparc.mk:1.3
--- src/compat/sparc64/sparc/bsd.sparc.mk:1.2 Sat Dec 19 04:11:33 2009
+++ src/compat/sparc64/sparc/bsd.sparc.mk Fri Jul 1 01:30:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sparc.mk,v 1.2 2009/12/19 04:11:33 christos Exp $
+# $NetBSD: bsd.sparc.mk,v 1.3 2011/07/01 01:30:16 mrg Exp $
LD+= -m elf32_sparc
MLIBDIR= sparc
@@ -10,5 +10,7 @@
CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
+LIBMPFR_MACHINE_ARCH= ${MLIBDIR}
+LIBGMP_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
Index: src/external/lgpl3/gmp/lib/libgmp/Makefile
diff -u src/external/lgpl3/gmp/lib/libgmp/Makefile:1.4 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.5
--- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.4 Wed Jun 29 08:09:43 2011
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile Fri Jul 1 01:30:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/06/29 08:09:43 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/07/01 01:30:16 mrg Exp $
.include <bsd.init.mk>
@@ -139,24 +139,10 @@
.endfor
-.if 0
-# Build the generic popcount/hamdist for now
-.for _srcfile in \
- ${MPN_GENERIC_SRCS}
-mpn_${_srcfile}: Makefile
- echo '#include "mpn/generic/popham.c"' > ${.TARGET}
-
-COPTS.mpn_${_srcfile}+= -DOPERATION_${_srcfile:R}
-
-SRCS+= mpn_${_srcfile}
-CLEANFILES+= mpn_${_srcfile}
-.endfor
-.endif
-
INCS= gmp.h
INCSDIR= /usr/include
-CPPFLAGS+= -I. -I${DIST} -I${.CURDIR}/arch/${MACHINE_ARCH} -D__GMP_WITHIN_GMP -DHAVE_CONFIG_H
+CPPFLAGS+= -I. -I${DIST} -I${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH} -D__GMP_WITHIN_GMP -DHAVE_CONFIG_H
WITHOUT_MAN= yes
@@ -190,12 +176,17 @@
CLEANFILES+= ${DPSRCS} gen-fac_ui gen-fib gen-bases gen-psqr
-.sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
+.if defined(MLIBDIR)
+LIBGMP_MACHINE_ARCH:=${MLIBDIR}
+.endif
+LIBGMP_MACHINE_ARCH?=${MACHINE_ARCH}
+
+.include "${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH}/Makefile.inc"
.include <bsd.lib.mk>
.PATH: ${DIST} \
${DIST}/mpn/generic \
- ${.CURDIR}/arch/${MACHINE_ARCH} \
+ ${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH} \
${DIST}/mpf \
${DIST}/mpz
Index: src/external/lgpl3/mpfr/lib/libmpfr/Makefile
diff -u src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.2 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.3
--- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.2 Thu Jun 23 04:38:36 2011
+++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Fri Jul 1 01:30:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/23 04:38:36 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/01 01:30:16 mrg Exp $
.include <bsd.init.mk>
@@ -470,10 +470,13 @@
-DHAVE_CEIL=1 \
-DHAVE_ATTRIBUTE_MODE=1
-.if ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
CPPFLAGS+= -DHAVE_LDOUBLE_IEEE_EXT_LITTLE=1
.endif
+.if ${MACHINE_ARCH} == "sparc64"
+CPPFLAGS+= -DHAVE_LDOUBLE_IEEE_QUAD_BIG=1
+.endif
WITHOUT_MAN= yes
