Module Name: src
Committed By: matt
Date: Mon Dec 14 01:00:46 UTC 2009
Modified Files:
src/share/mk: bsd.kmodule.mk bsd.own.mk bsd.prog.mk bsd.sys.mk
Log Message:
Merge from matt-nb5-mips64
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.612 -r1.613 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.244 -r1.245 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.187 -r1.188 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.21 src/share/mk/bsd.kmodule.mk:1.22
--- src/share/mk/bsd.kmodule.mk:1.21 Tue Nov 10 14:47:52 2009
+++ src/share/mk/bsd.kmodule.mk Mon Dec 14 01:00:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.21 2009/11/10 14:47:52 skrll Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.22 2009/12/14 01:00:46 matt Exp $
# We are not building this with PIE
MKPIE=no
@@ -43,7 +43,8 @@
${PROG}: ${OBJS} ${DPADD}
${_MKTARGET_LINK}
- ${LD} -T ${KMODSCRIPT} -r -d -o ${.TARGET} ${OBJS}
+ ${CC} ${LDFLAGS} -nostdlib -Wl,-T,${KMODSCRIPT},-r,-d \
+ -o ${.TARGET} ${OBJS}
##### Install rules
.if !target(kmodinstall)
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.612 src/share/mk/bsd.own.mk:1.613
--- src/share/mk/bsd.own.mk:1.612 Sun Dec 13 09:10:16 2009
+++ src/share/mk/bsd.own.mk Mon Dec 14 01:00:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.612 2009/12/13 09:10:16 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.613 2009/12/14 01:00:46 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -532,8 +532,7 @@
#
# On VAX using ELF, all objects are PIC, not just shared libraries,
-# so don't build the _pic version. Unless we are using GCC3 which
-# doesn't support PIC yet.
+# so don't build the _pic version.
#
.if ${MACHINE_ARCH} == "vax"
MKPICLIB= no
@@ -653,7 +652,8 @@
#
# MK* options which have variable defaults.
#
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" || \
+ ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
MKCOMPAT?= yes
.else
# Don't let this build where it really isn't supported.
@@ -680,9 +680,9 @@
_MKVARS.yes= \
MKATF \
MKBINUTILS \
- MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS \
+ MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS MKCXX \
MKDOC \
- MKGCC MKGCCCMDS MKGDB \
+ MKGCC MKGCCCMDS MKGDB MKGROFF \
MKHESIOD MKHTML \
MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
MKKERBEROS \
@@ -741,6 +741,11 @@
# Force some options off if their dependencies are off.
#
+.if ${MKCXX} == "no"
+MKATF:= no
+MKGROFF:= no
+.endif
+
.if ${MKCRYPTO} == "no"
MKKERBEROS:= no
.endif
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.244 src/share/mk/bsd.prog.mk:1.245
--- src/share/mk/bsd.prog.mk:1.244 Tue Dec 8 15:18:42 2009
+++ src/share/mk/bsd.prog.mk Mon Dec 14 01:00:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.244 2009/12/08 15:18:42 uebayasi Exp $
+# $NetBSD: bsd.prog.mk,v 1.245 2009/12/14 01:00:46 matt Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -309,7 +309,7 @@
${_P}.ro: ${OBJS.${_P}} ${DPADD}
${_MKTARGET_LINK}
- ${LD} -r -dc -o ${.TARGET} ${OBJS.${_P}}
+ ${CC} ${LDFLAGS} -nostdlib -Wl,-r,-dc -o ${.TARGET} ${OBJS.${_P}}
.if defined(_PROGDEBUG.${_P})
${_PROGDEBUG.${_P}}: ${_P}
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.187 src/share/mk/bsd.sys.mk:1.188
--- src/share/mk/bsd.sys.mk:1.187 Sun Dec 13 18:40:50 2009
+++ src/share/mk/bsd.sys.mk Mon Dec 14 01:00:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.187 2009/12/13 18:40:50 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.188 2009/12/14 01:00:46 matt Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -89,6 +89,18 @@
CFLAGS+= -Wa,-Av8plus
.endif
+.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+CPUFLAGS+= -Wa,--fatal-warnings
+.endif
+
+#.if ${MACHINE} == "sbmips"
+#CFLAGS+= -mips64 -mtune=sb1
+#.endif
+
+#.if (${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb") && \
+# (defined(MKPIC) && ${MKPIC} == "no")
+#CPUFLAGS+= -mno-abicalls -fno-PIC
+#.endif
CFLAGS+= ${CPUFLAGS}
AFLAGS+= ${CPUFLAGS}
