Module Name: src
Committed By: matt
Date: Mon Jun 22 00:09:40 UTC 2015
Modified Files:
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
Log Message:
Reduce the amount that's include protected.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.11 -r1.12 src/compat/mips64/o32/bsd.o32.mk
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.10 src/compat/mips64/64/bsd.64.mk:1.11
--- src/compat/mips64/64/bsd.64.mk:1.10 Fri Jun 19 18:17:26 2015
+++ src/compat/mips64/64/bsd.64.mk Mon Jun 22 00:09:39 2015
@@ -1,11 +1,11 @@
-# $NetBSD: bsd.64.mk,v 1.10 2015/06/19 18:17:26 matt Exp $
+# $NetBSD: bsd.64.mk,v 1.11 2015/06/22 00:09:39 matt Exp $
-.ifndef MLIBDIR
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf64btsmip
.else
LD+= -m elf64ltsmip
.endif
+.ifndef MLIBDIR
MLIBDIR= 64
# XXX
@@ -18,6 +18,6 @@ CPUFLAGS+= -mabi=64
LDADD+= -mabi=64
LDFLAGS+= -mabi=64
MKDEPFLAGS+= -mabi=64
+.endif
.include "${.PARSEDIR}/../../Makefile.compat"
-.endif
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.11 src/compat/mips64/o32/bsd.o32.mk:1.12
--- src/compat/mips64/o32/bsd.o32.mk:1.11 Fri Jun 19 18:17:26 2015
+++ src/compat/mips64/o32/bsd.o32.mk Mon Jun 22 00:09:39 2015
@@ -1,11 +1,11 @@
-# $NetBSD: bsd.o32.mk,v 1.11 2015/06/19 18:17:26 matt Exp $
+# $NetBSD: bsd.o32.mk,v 1.12 2015/06/22 00:09:39 matt Exp $
-.ifndef MLIBDIR
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
.else
LD+= -m elf32ltsmip
.endif
+.ifndef MLIBDIR
MLIBDIR= o32
LIBGCC_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
@@ -16,6 +16,6 @@ CPUFLAGS+= -mabi=32 -march=mips3
LDADD+= -mabi=32 -march=mips3
LDFLAGS+= -mabi=32 -march=mips3
MKDEPFLAGS+= -mabi=32 -march=mips3
+.endif
.include "${.PARSEDIR}/../../Makefile.compat"
-.endif
