Module Name: src
Committed By: christos
Date: Sun Apr 25 23:40:06 UTC 2021
Modified Files:
src/distrib/cobalt/instkernel: Makefile
src/distrib/evbmips/instkernel/instkernel: Makefile
src/distrib/evbmips/instkernel/ramdisk: Makefile
src/distrib/pmax/instkernel: Makefile
src/distrib/pmax/miniroot: Makefile.inc
src/distrib/pmax/ramdisk: Makefile
Log Message:
handle mipsn64
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/cobalt/instkernel/Makefile
cvs rdiff -u -r1.7 -r1.8 src/distrib/evbmips/instkernel/instkernel/Makefile
cvs rdiff -u -r1.14 -r1.15 src/distrib/evbmips/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.44 -r1.45 src/distrib/pmax/instkernel/Makefile
cvs rdiff -u -r1.25 -r1.26 src/distrib/pmax/miniroot/Makefile.inc
cvs rdiff -u -r1.54 -r1.55 src/distrib/pmax/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cobalt/instkernel/Makefile
diff -u src/distrib/cobalt/instkernel/Makefile:1.2 src/distrib/cobalt/instkernel/Makefile:1.3
--- src/distrib/cobalt/instkernel/Makefile:1.2 Sun Feb 20 03:26:08 2011
+++ src/distrib/cobalt/instkernel/Makefile Sun Apr 25 19:40:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/20 08:26:08 matt Exp $
+# $NetBSD: Makefile,v 1.3 2021/04/25 23:40:05 christos Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,7 +6,7 @@
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
SFX= 64
.endif
Index: src/distrib/evbmips/instkernel/instkernel/Makefile
diff -u src/distrib/evbmips/instkernel/instkernel/Makefile:1.7 src/distrib/evbmips/instkernel/instkernel/Makefile:1.8
--- src/distrib/evbmips/instkernel/instkernel/Makefile:1.7 Wed Jul 15 08:15:30 2020
+++ src/distrib/evbmips/instkernel/instkernel/Makefile Sun Apr 25 19:40:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/07/15 12:15:30 simonb Exp $
+# $NetBSD: Makefile,v 1.8 2021/04/25 23:40:05 christos Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,12 +12,12 @@ MDSETTARGETS= INSTALL_CI20 ${RAMDISK}
MDSETTARGETS+= INSTALL_OMSAL400 ${RAMDISK} -
MDSETTARGETS+= INSTALL_MALTA ${RAMDISK} -
-.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.elif ${MACHINE_MIPS64}
MDSETTARGETS= INSTALL_MALTA32 ${RAMDISK} -
MDSETTARGETS+= INSTALL_MALTA64 ${RAMDISK} -
MDSETTARGETS+= INSTALL_XLSATX32 ${RAMDISK} -
MDSETTARGETS+= INSTALL_XLSATX64 ${RAMDISK} -
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
MDSETTARGETS+= INSTALL_LOONGSON ${RAMDISK} -
.else
MDSETTARGETS+= INSTALL_OCTEON ${RAMDISK} -
Index: src/distrib/evbmips/instkernel/ramdisk/Makefile
diff -u src/distrib/evbmips/instkernel/ramdisk/Makefile:1.14 src/distrib/evbmips/instkernel/ramdisk/Makefile:1.15
--- src/distrib/evbmips/instkernel/ramdisk/Makefile:1.14 Thu Jan 9 15:07:46 2020
+++ src/distrib/evbmips/instkernel/ramdisk/Makefile Sun Apr 25 19:40:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/01/09 20:07:46 martin Exp $
+# $NetBSD: Makefile,v 1.15 2021/04/25 23:40:05 christos Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -13,7 +13,7 @@ DBG= -Os
CRUNCHBIN= ramdiskbin
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
-.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:M*el)
IMAGEENDIAN= le
.else
IMAGEENDIAN= be
Index: src/distrib/pmax/instkernel/Makefile
diff -u src/distrib/pmax/instkernel/Makefile:1.44 src/distrib/pmax/instkernel/Makefile:1.45
--- src/distrib/pmax/instkernel/Makefile:1.44 Sun Aug 16 07:43:36 2020
+++ src/distrib/pmax/instkernel/Makefile Sun Apr 25 19:40:05 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.44 2020/08/16 11:43:36 mrg Exp $
+# $NetBSD: Makefile,v 1.45 2021/04/25 23:40:05 christos Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
SFX= 64
.endif
Index: src/distrib/pmax/miniroot/Makefile.inc
diff -u src/distrib/pmax/miniroot/Makefile.inc:1.25 src/distrib/pmax/miniroot/Makefile.inc:1.26
--- src/distrib/pmax/miniroot/Makefile.inc:1.25 Tue Jan 24 13:04:04 2017
+++ src/distrib/pmax/miniroot/Makefile.inc Sun Apr 25 19:40:05 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.25 2017/01/24 18:04:04 christos Exp $
+# $NetBSD: Makefile.inc,v 1.26 2021/04/25 23:40:05 christos Exp $
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
SFX= 64
.endif
Index: src/distrib/pmax/ramdisk/Makefile
diff -u src/distrib/pmax/ramdisk/Makefile:1.54 src/distrib/pmax/ramdisk/Makefile:1.55
--- src/distrib/pmax/ramdisk/Makefile:1.54 Mon Sep 7 05:05:10 2020
+++ src/distrib/pmax/ramdisk/Makefile Sun Apr 25 19:40:06 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.54 2020/09/07 09:05:10 mrg Exp $
+# $NetBSD: Makefile,v 1.55 2021/04/25 23:40:06 christos Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
IMAGETAR= diskimage.tgz
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
IMAGESIZE= 4500k
.else
IMAGESIZE= 4200k
