[src/trunk]: src Handle mipsn64

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b409ac355a88
branches:  trunk
changeset: 378837:b409ac355a88
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 25 23:40:51 2021 +0000

description:
Handle mipsn64

diffstat:

 etc/etc.cobalt/Makefile.inc          |   4 ++--
 etc/etc.evbmips/Makefile.inc         |  10 +++++-----
 etc/mtree/Makefile                   |   4 ++--
 sys/arch/pmax/stand/Makefile.booters |   4 ++--
 sys/modules/dtrace/Makefile          |   4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diffs (113 lines):

diff -r e52c8936a79a -r b409ac355a88 etc/etc.cobalt/Makefile.inc
--- a/etc/etc.cobalt/Makefile.inc       Sun Apr 25 23:40:05 2021 +0000
+++ b/etc/etc.cobalt/Makefile.inc       Sun Apr 25 23:40:51 2021 +0000
@@ -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
diff -r e52c8936a79a -r b409ac355a88 etc/etc.evbmips/Makefile.inc
--- a/etc/etc.evbmips/Makefile.inc      Sun Apr 25 23:40:05 2021 +0000
+++ b/etc/etc.evbmips/Makefile.inc      Sun Apr 25 23:40:51 2021 +0000
@@ -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 @@ IMAGEENDIAN=  le
             -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
diff -r e52c8936a79a -r b409ac355a88 etc/mtree/Makefile
--- a/etc/mtree/Makefile        Sun Apr 25 23:40:05 2021 +0000
+++ b/etc/mtree/Makefile        Sun Apr 25 23:40:51 2021 +0000
@@ -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
 
diff -r e52c8936a79a -r b409ac355a88 sys/arch/pmax/stand/Makefile.booters
--- a/sys/arch/pmax/stand/Makefile.booters      Sun Apr 25 23:40:05 2021 +0000
+++ b/sys/arch/pmax/stand/Makefile.booters      Sun Apr 25 23:40:51 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.64 2019/01/01 19:41:04 christos Exp $
+# $NetBSD: Makefile.booters,v 1.65 2021/04/25 23:42:08 christos Exp $
 
 NOMAN=         # defined
 NOPIE=         # defined
@@ -29,7 +29,7 @@ CFLAGS+=      -Wall -Wmissing-prototypes -Wst
 CFLAGS+=       -Werror
 LDBUG=         -T $S/arch/mips/conf/stand.ldscript
 
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
 AFLAGS+=       -mips3 -mabi=32
 CFLAGS+=       -mips3 -mabi=32
 LDBUG+=                -m elf32ltsmip
diff -r e52c8936a79a -r b409ac355a88 sys/modules/dtrace/Makefile
--- a/sys/modules/dtrace/Makefile       Sun Apr 25 23:40:05 2021 +0000
+++ b/sys/modules/dtrace/Makefile       Sun Apr 25 23:40:51 2021 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.9 2021/04/10 15:34:05 simonb Exp $
+#      $NetBSD: Makefile,v 1.10 2021/04/25 23:41:23 christos Exp $
 # $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=                dtrace sdt fbt lockstat profile syscall
 
-.if ${MACHINE_ARCH} == "x86_64" || !empty(MACHINE_ARCH:Mmips64*)
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_MIPS64}
 SUBDIR+=       netbsd32_syscall
 .endif