[src/trunk]: src/distrib/evbarm Correctly support aarch64eb and earmv7hfeb in...

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

details:   https://anonhg.NetBSD.org/src/rev/a7731103f5eb
branches:  trunk
changeset: 946094:a7731103f5eb
user:      rin <rin%NetBSD.org@localhost>
date:      Mon Nov 16 11:38:29 2020 +0000

description:
Correctly support aarch64eb and earmv7hfeb in a similar manner to
their little-endian counterparts.

Fix build failures for periodic binary snapshots.

diffstat:

 distrib/evbarm/Makefile                    |  8 ++++----
 distrib/evbarm/installimage/Makefile       |  6 +++---
 distrib/evbarm/instkernel/ramdisk/Makefile |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (71 lines):

diff -r c6d1de8cf93f -r a7731103f5eb distrib/evbarm/Makefile
--- a/distrib/evbarm/Makefile   Mon Nov 16 00:12:13 2020 +0000
+++ b/distrib/evbarm/Makefile   Mon Nov 16 11:38:29 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2020/10/15 08:59:57 jmcneill Exp $
+#      $NetBSD: Makefile,v 1.15 2020/11/16 11:38:29 rin Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,10 +6,10 @@
 .include <bsd.kernobj.mk>
 
 SUBDIR=                gzboot instkernel
-.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "earmv7hf"
+.if !empty(MACHINE_ARCH:Maarch64*) || !empty(MACHINE_ARCH:Mearmv7hf*)
 SUBDIR+=       installimage
 .endif
-.if ${MACHINE_ARCH} == "aarch64"
+.if !empty(MACHINE_ARCH:Maarch64*)
 SUBDIR+=       isoimage
 .endif
 TARGETS+=      release
@@ -22,7 +22,7 @@
        ${RELEASE_INSTALL} ${MDECBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
 .endif
 
-.if ${MACHINE_ARCH} == "aarch64"
+.if !empty(MACHINE_ARCH:Maarch64*)
 iso_image:
        ${MAKEDIRTARGET} isoimage iso_image
 .endif
diff -r c6d1de8cf93f -r a7731103f5eb distrib/evbarm/installimage/Makefile
--- a/distrib/evbarm/installimage/Makefile      Mon Nov 16 00:12:13 2020 +0000
+++ b/distrib/evbarm/installimage/Makefile      Mon Nov 16 11:38:29 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2020/06/02 14:27:32 jmcneill Exp $
+#      $NetBSD: Makefile,v 1.7 2020/11/16 11:38:29 rin Exp $
 
 .include <bsd.own.mk>
 
@@ -6,10 +6,10 @@
 
 INSTIMAGEMB?=  1550                    # for all installation binaries
 
-.if ${MACHINE_ARCH} == "aarch64"
+.if !empty(MACHINE_ARCH:Maarch64*)
 EFIBOOT=               ${WORKDIR}/usr/mdec/bootaa64.efi
 KERN_SET=              kern-GENERIC64
-.elif ${MACHINE_ARCH} == "earmv7hf"
+.elif !empty(MACHINE_ARCH:Mearmv7hf*)
 EFIBOOT+=              ${WORKDIR}/usr/mdec/bootarm.efi
 KERN_SET=              kern-GENERIC
 .endif
diff -r c6d1de8cf93f -r a7731103f5eb distrib/evbarm/instkernel/ramdisk/Makefile
--- a/distrib/evbarm/instkernel/ramdisk/Makefile        Mon Nov 16 00:12:13 2020 +0000
+++ b/distrib/evbarm/instkernel/ramdisk/Makefile        Mon Nov 16 11:38:29 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2018/04/01 04:35:01 ryo Exp $
+#      $NetBSD: Makefile,v 1.20 2020/11/16 11:38:29 rin Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -28,7 +28,7 @@
                ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
                ${DISTRIBDIR}/common/services
 
-.if !empty(MACHINE_ARCH:Maarch64)
+.if !empty(MACHINE_ARCH:Maarch64*)
 UBOOT_IMAGE_ARCH=      arm64
 .else
 UBOOT_IMAGE_ARCH=      arm