Module Name: src
Committed By: jmcneill
Date: Sun Oct 14 13:36:33 UTC 2018
Modified Files:
src/distrib/sets/lists/base: ad.aarch64
src/distrib/sets/lists/debug: ad.aarch64
src/external/bsd/acpica/bin/iasl: Makefile
src/usr.sbin/acpitools/acpidump: Makefile
src/usr.sbin/acpitools/amldb: Makefile
Log Message:
Add acpidump, amldb, and iasl to aarch64 build.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/debug/ad.aarch64
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/acpica/bin/iasl/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/acpitools/acpidump/Makefile
cvs rdiff -u -r1.4 -r1.5 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.30 src/distrib/sets/lists/base/ad.aarch64:1.31
--- src/distrib/sets/lists/base/ad.aarch64:1.30 Sat Aug 25 00:07:09 2018
+++ src/distrib/sets/lists/base/ad.aarch64 Sun Oct 14 13:36:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.30 2018/08/25 00:07:09 jmcneill Exp $
+# $NetBSD: ad.aarch64,v 1.31 2018/10/14 13:36:32 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,6 +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
./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
@@ -37,5 +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
+./usr/sbin/amldb base-sysutil-bin
./usr/sbin/ofctl base-sysutil-bin
./usr/sbin/tpctl base-sysutil-bin
Index: src/distrib/sets/lists/debug/ad.aarch64
diff -u src/distrib/sets/lists/debug/ad.aarch64:1.29 src/distrib/sets/lists/debug/ad.aarch64:1.30
--- src/distrib/sets/lists/debug/ad.aarch64:1.29 Wed Jul 18 01:25:00 2018
+++ src/distrib/sets/lists/debug/ad.aarch64 Sun Oct 14 13:36:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.29 2018/07/18 01:25:00 christos Exp $
+# $NetBSD: ad.aarch64,v 1.30 2018/10/14 13:36:33 jmcneill Exp $
./usr/lib/eabi/libarm_g.a comp-sys-debug debuglib,compat,llvm
./usr/lib/eabi/libc_vfp_g.a comp-sys-debug debuglib,compat,llvm
./usr/lib/eabihf/libarm_g.a comp-sys-debug debuglib,compat,llvm
@@ -13,6 +13,7 @@
./usr/libdata/debug/libexec/ld.elf_so-eabi.debug comp-sys-debug debug,compat,llvm
./usr/libdata/debug/libexec/ld.elf_so-eabihf.debug comp-sys-debug debug,compat,llvm
./usr/libdata/debug/libexec/ld.elf_so-oabi.debug comp-sys-debug debug,compat,llvm
+./usr/libdata/debug/usr/bin/iasl.debug comp-util-debug debug
./usr/libdata/debug/usr/lib/eabi comp-sys-debug compat,llvm
./usr/libdata/debug/usr/lib/eabi/i18n comp-sys-debug compat,llvm
./usr/libdata/debug/usr/lib/eabi/libarm.so.0.0.debug comp-sys-debug debug,compat,pic,llvm
@@ -27,5 +28,7 @@
./usr/libdata/debug/usr/libexec/ld.elf_so-eabi.debug comp-sys-debug debug,compat,llvm
./usr/libdata/debug/usr/libexec/ld.elf_so-eabihf.debug comp-sys-debug debug,compat,llvm
./usr/libdata/debug/usr/libexec/ld.elf_so-oabi.debug comp-sys-debug debug,compat,llvm
+./usr/libdata/debug/usr/sbin/acpidump.debug comp-sysutil-debug debug
+./usr/libdata/debug/usr/sbin/amldb.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/ofctl.debug comp-util-debug debug
./usr/libdata/debug/usr/sbin/tpctl.debug comp-sysutil-debug debug
Index: src/external/bsd/acpica/bin/iasl/Makefile
diff -u src/external/bsd/acpica/bin/iasl/Makefile:1.21 src/external/bsd/acpica/bin/iasl/Makefile:1.22
--- src/external/bsd/acpica/bin/iasl/Makefile:1.21 Thu Jun 28 07:56:22 2018
+++ src/external/bsd/acpica/bin/iasl/Makefile Sun Oct 14 13:36:33 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2018/06/28 07:56:22 maya Exp $
+# $NetBSD: Makefile,v 1.22 2018/10/14 13:36:33 jmcneill Exp $
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
+.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64")
PROG= iasl
.endif
BINDIR= /usr/bin
Index: src/usr.sbin/acpitools/acpidump/Makefile
diff -u src/usr.sbin/acpitools/acpidump/Makefile:1.6 src/usr.sbin/acpitools/acpidump/Makefile:1.7
--- src/usr.sbin/acpitools/acpidump/Makefile:1.6 Sat Jan 23 21:22:50 2016
+++ src/usr.sbin/acpitools/acpidump/Makefile Sun Oct 14 13:36:32 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:50 christos Exp $
+# $NetBSD: Makefile,v 1.7 2018/10/14 13:36:32 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")
+.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64")
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.4 src/usr.sbin/acpitools/amldb/Makefile:1.5
--- src/usr.sbin/acpitools/amldb/Makefile:1.4 Sat Jan 23 21:22:50 2016
+++ src/usr.sbin/acpitools/amldb/Makefile Sun Oct 14 13:36:32 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:50 christos Exp $
+# $NetBSD: Makefile,v 1.5 2018/10/14 13:36:32 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")
+.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64")
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 \