Module Name: src
Committed By: matt
Date: Tue Aug 18 06:42:18 UTC 2009
Modified Files:
src/share/mk [matt-nb5-mips64]: bsd.own.mk bsd.sys.mk
Log Message:
fix a comment in vax. :)
add a commented out match for mips64 in MKPICLIB=no case
To generate a diff of this commit:
cvs rdiff -u -r1.542.2.9 -r1.542.2.9.4.1 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.179.8.1 -r1.179.8.2 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.own.mk
diff -u src/share/mk/bsd.own.mk:1.542.2.9 src/share/mk/bsd.own.mk:1.542.2.9.4.1
--- src/share/mk/bsd.own.mk:1.542.2.9 Wed Mar 18 05:39:06 2009
+++ src/share/mk/bsd.own.mk Tue Aug 18 06:42:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.542.2.9 2009/03/18 05:39:06 snj Exp $
+# $NetBSD: bsd.own.mk,v 1.542.2.9.4.1 2009/08/18 06:42:17 matt Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -516,13 +516,13 @@
# not just shared libraries, so don't build the _pic version.
#
.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
+# .${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
MKPICLIB:= no
.endif
#
# 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
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.179.8.1 src/share/mk/bsd.sys.mk:1.179.8.2
--- src/share/mk/bsd.sys.mk:1.179.8.1 Mon Aug 17 19:14:15 2009
+++ src/share/mk/bsd.sys.mk Tue Aug 18 06:42:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.179.8.1 2009/08/17 19:14:15 matt Exp $
+# $NetBSD: bsd.sys.mk,v 1.179.8.2 2009/08/18 06:42:18 matt Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -50,7 +50,7 @@
LINTFLAGS+= ${DESTDIR:D-d ${DESTDIR}/usr/include}
.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "hppa") || \
- (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb") || [
+ (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb") || \
(${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
HAS_SSP= no
.else
@@ -90,6 +90,10 @@
#CFLAGS+= -mips64 -mtune=sb1
#.endif
+.if (${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb") && \
+ ${MKPIC} == "no"
+COPTS+= -mno-abicalls -fno-PIC
+.endif
CFLAGS+= ${CPUFLAGS}
AFLAGS+= ${CPUFLAGS}
