Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/compat/mips64 Reduce the amount that's include protected.



details:   https://anonhg.NetBSD.org/src/rev/f82e20f7a047
branches:  trunk
changeset: 339004:f82e20f7a047
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 22 00:09:39 2015 +0000

description:
Reduce the amount that's include protected.

diffstat:

 compat/mips64/64/bsd.64.mk   |  6 +++---
 compat/mips64/o32/bsd.o32.mk |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r 15e45aba595b -r f82e20f7a047 compat/mips64/64/bsd.64.mk
--- a/compat/mips64/64/bsd.64.mk        Mon Jun 22 00:06:38 2015 +0000
+++ b/compat/mips64/64/bsd.64.mk        Mon Jun 22 00:09:39 2015 +0000
@@ -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 @@
 LDADD+=                -mabi=64
 LDFLAGS+=      -mabi=64
 MKDEPFLAGS+=   -mabi=64
+.endif
 
 .include "${.PARSEDIR}/../../Makefile.compat"
-.endif
diff -r 15e45aba595b -r f82e20f7a047 compat/mips64/o32/bsd.o32.mk
--- a/compat/mips64/o32/bsd.o32.mk      Mon Jun 22 00:06:38 2015 +0000
+++ b/compat/mips64/o32/bsd.o32.mk      Mon Jun 22 00:09:39 2015 +0000
@@ -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 @@
 LDADD+=                -mabi=32 -march=mips3
 LDFLAGS+=      -mabi=32 -march=mips3
 MKDEPFLAGS+=   -mabi=32 -march=mips3
+.endif
 
 .include "${.PARSEDIR}/../../Makefile.compat"
-.endif



Home | Main Index | Thread Index | Old Index