summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2015-06-22 00:09:39 +0000
committermatt <matt@NetBSD.org>2015-06-22 00:09:39 +0000
commit3581bcf8092723eb0680d6962b606393f57bb63a (patch)
tree801175b3b4f499088a1727af5123d4b7d9489128 /compat
parentee4efc5e694ee76d26406e5b229821157c627c0f (diff)
Reduce the amount that's include protected.
Diffstat (limited to 'compat')
-rw-r--r--compat/mips64/64/bsd.64.mk6
-rw-r--r--compat/mips64/o32/bsd.o32.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/compat/mips64/64/bsd.64.mk b/compat/mips64/64/bsd.64.mk
index 81996c17989..b8e7739f620 100644
--- a/compat/mips64/64/bsd.64.mk
+++ b/compat/mips64/64/bsd.64.mk
@@ -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
diff --git a/compat/mips64/o32/bsd.o32.mk b/compat/mips64/o32/bsd.o32.mk
index c275e54ed16..b9455566cdc 100644
--- a/compat/mips64/o32/bsd.o32.mk
+++ b/compat/mips64/o32/bsd.o32.mk
@@ -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