Module Name: src
Committed By: jmcneill
Date: Fri Sep 11 14:06:00 UTC 2020
Modified Files:
src/distrib/sets/lists/base: ad.aarch64
src/external/bsd/acpica/bin/iasl: Makefile
src/usr.sbin/acpitools/acpidump: Makefile
src/usr.sbin/acpitools/amldb: Makefile
Log Message:
Build acpi tools and iasl on aarch64eb, and fix set lists for MKDEBUG.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.25 -r1.26 src/external/bsd/acpica/bin/iasl/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/acpitools/acpidump/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/acpitools/amldb/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/sets/lists/base/ad.aarch64
diff -u src/distrib/sets/lists/base/ad.aarch64:1.33 src/distrib/sets/lists/base/ad.aarch64:1.34
--- src/distrib/sets/lists/base/ad.aarch64:1.33 Tue Sep 8 16:39:36 2020
+++ src/distrib/sets/lists/base/ad.aarch64 Fri Sep 11 14:06:00 2020
@@ -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
Index: src/external/bsd/acpica/bin/iasl/Makefile
diff -u src/external/bsd/acpica/bin/iasl/Makefile:1.25 src/external/bsd/acpica/bin/iasl/Makefile:1.26
--- src/external/bsd/acpica/bin/iasl/Makefile:1.25 Tue Oct 15 16:14:49 2019
+++ src/external/bsd/acpica/bin/iasl/Makefile Fri Sep 11 14:06:00 2020
@@ -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
Index: src/usr.sbin/acpitools/acpidump/Makefile
diff -u src/usr.sbin/acpitools/acpidump/Makefile:1.7 src/usr.sbin/acpitools/acpidump/Makefile:1.8
--- src/usr.sbin/acpitools/acpidump/Makefile:1.7 Sun Oct 14 13:36:32 2018
+++ src/usr.sbin/acpitools/acpidump/Makefile Fri Sep 11 14:06:00 2020
@@ -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
Index: src/usr.sbin/acpitools/amldb/Makefile
diff -u src/usr.sbin/acpitools/amldb/Makefile:1.6 src/usr.sbin/acpitools/amldb/Makefile:1.7
--- src/usr.sbin/acpitools/amldb/Makefile:1.6 Sun Oct 13 07:28:17 2019
+++ src/usr.sbin/acpitools/amldb/Makefile Fri Sep 11 14:06:00 2020
@@ -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 \
