Module Name: src
Committed By: christos
Date: Sun Apr 25 23:40:52 UTC 2021
Modified Files:
src/etc/etc.cobalt: Makefile.inc
src/etc/etc.evbmips: Makefile.inc
src/etc/mtree: Makefile
Log Message:
Handle mipsn64
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/etc/etc.cobalt/Makefile.inc
cvs rdiff -u -r1.25 -r1.26 src/etc/etc.evbmips/Makefile.inc
cvs rdiff -u -r1.44 -r1.45 src/etc/mtree/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.cobalt/Makefile.inc
diff -u src/etc/etc.cobalt/Makefile.inc:1.5 src/etc/etc.cobalt/Makefile.inc:1.6
--- src/etc/etc.cobalt/Makefile.inc:1.5 Sun Feb 20 03:27:32 2011
+++ src/etc/etc.cobalt/Makefile.inc Sun Apr 25 19:40:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2011/02/20 08:27:32 matt Exp $
+# $NetBSD: Makefile.inc,v 1.6 2021/04/25 23:40:51 christos Exp $
#
# etc.cobalt/Makefile.inc -- cobalt-specific etc Makefile targets
#
@@ -6,7 +6,7 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
KERNEL_SETS= GENERIC32 GENERIC64 INSTALL32 INSTALL64
BUILD_KERNELS= RAMDISK32 RAMDISK64
Index: src/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.25 src/etc/etc.evbmips/Makefile.inc:1.26
--- src/etc/etc.evbmips/Makefile.inc:1.25 Sat Aug 15 01:03:06 2020
+++ src/etc/etc.evbmips/Makefile.inc Sun Apr 25 19:40:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.25 2020/08/15 05:03:06 simonb Exp $
+# $NetBSD: Makefile.inc,v 1.26 2021/04/25 23:40:52 christos Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -15,12 +15,12 @@ BUILD_KERNELS= INSTALL_CI20 INSTALL_OMS
KERNEL_SETS+= P4032 P5064 P6032
-.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.elif ${MACHINE_MIPS64}
KERNEL_SETS= MALTA32 MALTA64 XLSATX32 XLSATX64
BUILD_KERNELS= INSTALL_MALTA32 INSTALL_MALTA64
BUILD_KERNELS+= INSTALL_XLSATX32 INSTALL_XLSATX64
-. if ${MACHINE_ARCH} == "mips64el"
+. if !empty(MACHINE_ARCH:Mmips*64el)
KERNEL_SETS+= P5064-64
KERNEL_SETS+= LOONGSON
BUILD_KERNELS+= INSTALL_LOONGSON
@@ -36,7 +36,7 @@ BUILD_KERNELS= INSTALL_MALTA
.endif
# SBMIPS has a kernel for all targets
-KERNEL_SETS+= SBMIPS${MACHINE_ARCH:S/mips//:C/e[lb]//}
+KERNEL_SETS+= SBMIPS${MACHINE_ARCH:S/mipsn//:S/mips//:C/e[lb]//}
# Support for mkimage
MKIMAGE= ${NETBSDSRCDIR}/distrib/utils/embedded/mkimage
@@ -68,7 +68,7 @@ __mkimage: .USE
-S ${NETBSDSRCDIR} -B ${IMAGEENDIAN} ${MKI_OPTS.${.TARGET}} \
${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz
-.if ${MACHINE_ARCH} == "mips64eb"
+.if !empty(MACHINE_ARCH:Mmips*64eb)
smp_octeon: __mkimage
MKI_OPTS.smp_octeon= -K ${IMAGE.kern}
SNAP_MD_POST_DEPS+= smp_octeon
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.44 src/etc/mtree/Makefile:1.45
--- src/etc/mtree/Makefile:1.44 Fri Jun 12 10:12:20 2020
+++ src/etc/mtree/Makefile Sun Apr 25 19:40:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2020/06/12 14:12:20 roy Exp $
+# $NetBSD: Makefile,v 1.45 2021/04/25 23:40:52 christos Exp $
.include <bsd.own.mk>
@@ -9,7 +9,7 @@ EXTRA_DIST_FILES+= NetBSD.dist.Xorg
.endif
# Derived from MACHINE_CPU, but keeping 32/64bit for most.
-MTREE_MACHINE_ARCH=${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips64/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/arm.*/arm/:C/earm.*/arm/:S/earm/arm/:S/aarch64eb/aarch64/:S/or1knd/or1k/}
+MTREE_MACHINE_ARCH=${MACHINE_ARCH:C/mipse[bl]/mips/:C/mipsn?64e[bl]/mips64/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/e?arm.*/arm/:S/aarch64eb/aarch64/:S/or1knd/or1k/}
# The compat specific files
