[src/trunk]: src/usr.sbin/acpitools/amldb Build acpi tools and iasl on aarch6...

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

details:   https://anonhg.NetBSD.org/src/rev/1d9c71a915eb
branches:  trunk
changeset: 976034:1d9c71a915eb
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Sep 11 14:06:00 2020 +0000

description:
Build acpi tools and iasl on aarch64eb, and fix set lists for MKDEBUG.

diffstat:

 distrib/sets/lists/base/ad.aarch64    |  8 ++++----
 external/bsd/acpica/bin/iasl/Makefile |  4 ++--
 usr.sbin/acpitools/acpidump/Makefile  |  4 ++--
 usr.sbin/acpitools/amldb/Makefile     |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs (67 lines):

diff -r 106cddbc0bf0 -r 1d9c71a915eb distrib/sets/lists/base/ad.aarch64
--- a/distrib/sets/lists/base/ad.aarch64        Fri Sep 11 13:58:45 2020 +0000
+++ b/distrib/sets/lists/base/ad.aarch64        Fri Sep 11 14:06:00 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.33 2020/09/08 16:39:36 jmcneill Exp $
+# $NetBSD: ad.aarch64,v 1.34 2020/09/11 14:06:00 jmcneill Exp $
 ./lib/eabi                                     base-compat-lib         compat,llvm
 ./lib/eabi/npf                                 base-compat-lib         compat,llvm
 ./lib/eabihf                                   base-compat-lib         compat,llvm
@@ -8,7 +8,7 @@
 ./libexec/ld.elf_so-eabi                       base-compat-shlib       compat,pic,llvm
 ./libexec/ld.elf_so-eabihf                     base-compat-shlib       compat,pic,llvm
 ./libexec/ld.elf_so-oabi                       base-sysutil-bin        compat,pic,llvm
-./usr/bin/iasl                                 base-util-bin           endian=1234
+./usr/bin/iasl                                 base-util-bin
 ./usr/lib/eabi                                 base-compat-lib         compat,llvm
 ./usr/lib/eabi/i18n                            base-compat-lib         compat,llvm
 ./usr/lib/eabi/libarm.so.0                     base-compat-shlib       compat,pic,llvm
@@ -38,7 +38,7 @@
 ./usr/libexec/ld.elf_so-eabihf                 base-compat-shlib       compat,pic,llvm
 ./usr/libexec/ld.elf_so-oabi                   base-sysutil-bin        compat,pic,llvm
 ./usr/mdec/bootaa64.efi                                base-sysutil-bin
-./usr/sbin/acpidump                            base-sysutil-bin        endian=1234
-./usr/sbin/amldb                               base-sysutil-bin        endian=1234
+./usr/sbin/acpidump                            base-sysutil-bin
+./usr/sbin/amldb                               base-sysutil-bin
 ./usr/sbin/ofctl                               base-sysutil-bin
 ./usr/sbin/tpctl                               base-sysutil-bin
diff -r 106cddbc0bf0 -r 1d9c71a915eb external/bsd/acpica/bin/iasl/Makefile
--- a/external/bsd/acpica/bin/iasl/Makefile     Fri Sep 11 13:58:45 2020 +0000
+++ b/external/bsd/acpica/bin/iasl/Makefile     Fri Sep 11 14:06:00 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2019/10/15 16:14:49 christos Exp $
+# $NetBSD: Makefile,v 1.26 2020/09/11 14:06:00 jmcneill Exp $
 
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64")
+.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || !empty(MACHINE_ARCH:Maarch64*))
 PROG=  iasl
 .endif
 BINDIR=        /usr/bin
diff -r 106cddbc0bf0 -r 1d9c71a915eb usr.sbin/acpitools/acpidump/Makefile
--- a/usr.sbin/acpitools/acpidump/Makefile      Fri Sep 11 13:58:45 2020 +0000
+++ b/usr.sbin/acpitools/acpidump/Makefile      Fri Sep 11 14:06:00 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2018/10/14 13:36:32 jmcneill Exp $
+# $NetBSD: Makefile,v 1.8 2020/09/11 14:06:00 jmcneill Exp $
 # $FreeBSD: src/usr.sbin/acpi/acpidump/Makefile,v 1.7 2003/08/28 03:33:07 njl Exp $
 
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64")
+.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || !empty(MACHINE_ARCH:Maarch64*))
 CPPFLAGS+=-I${.CURDIR}/../../../sys -D_KERNTYPES
 CPPFLAGS+=-I${.CURDIR}/..
 PROG=  acpidump
diff -r 106cddbc0bf0 -r 1d9c71a915eb usr.sbin/acpitools/amldb/Makefile
--- a/usr.sbin/acpitools/amldb/Makefile Fri Sep 11 13:58:45 2020 +0000
+++ b/usr.sbin/acpitools/amldb/Makefile Fri Sep 11 14:06:00 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:17 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2020/09/11 14:06:00 jmcneill Exp $
 # Id: Makefile,v 1.5 2000/07/14 18:16:30 iwasaki Exp 
 # $FreeBSD: src/usr.sbin/acpi/amldb/Makefile,v 1.7 2001/10/22 17:25:32 iwasaki Exp $
 
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64")
+.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || !empty(MACHINE_ARCH:Maarch64*))
 PROG=  amldb
 SRCS=  amldb.c debug.c region.c
 SRCS+= aml_parse.c aml_name.c aml_amlmem.c aml_memman.c aml_store.c \