MFC: r306686, r308953, r311462, r311529, r312438, r314611

- Merge ACPICA 20170303.
- Remove '-vd' option to make iasl(8) reproducible.

Relnotes:	yes

3 files changed, 19 insertions, 17 deletions

diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 3f6cbb4..a2f486d 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -64,12 +64,12 @@ SRCS+=	utaddress.c utalloc.c utascii.c utbuffer.c utcache.c	\
 	utcopy.c utdebug.c utdecode.c utdelete.c uterror.c	\
 	uteval.c utexcep.c utglobal.c uthex.c utids.c utinit.c	\
 	utlock.c utmath.c utmisc.c utmutex.c utnonansi.c	\
-	utobject.c utosi.c utownerid.c utpredef.c utprint.c	\
-	utresrc.c utstate.c utstring.c uttrack.c utuuid.c	\
+	utobject.c utosi.c utownerid.c utpredef.c utresrc.c	\
+	utstate.c utstring.c utstrtoul64.c uttrack.c utuuid.c	\
 	utxface.c utxferror.c utxfinit.c
 
 # os_specific/service_layers
-SRCS+=	oslibcfs.c osunixxf.c
+SRCS+=	osgendbg.c osunixxf.c
 
 MAN=	acpidb.8
 WARNS?=	3
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index fefe6da..1f20cb5 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -495,7 +495,7 @@ load_dsdt(const char *dsdtfile)
 
 	AcpiInitializeDebugger();
 	AcpiGbl_DebuggerConfiguration = 0;
-	AcpiDbUserCommands(':', NULL);
+	AcpiDbUserCommands();
 
 	if (dounlink) {
 		unlink(filetmp);
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index 4217c96..91f50f0 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -12,20 +12,21 @@ SRCS=	acfileio.c adfile.c adisasm.c adwalk.c ahids.c		\
 SRCS+=	aslanalyze.c aslascii.c aslbtypes.c aslcodegen.c	\
 	aslcompile.c aslcompiler.y.h aslcompilerlex.c		\
 	aslcompilerparse.c asldebug.c aslerror.c aslexternal.c	\
-	aslfileio.c aslfiles.c aslfold.c aslhex.c asllength.c	\
-	asllisting.c asllistsup.c aslload.c asllookup.c		\
-	aslmain.c aslmap.c aslmapenter.c aslmapoutput.c		\
-	aslmaputils.c aslmessages.c aslmethod.c aslnamesp.c	\
-	asloffset.c aslopcodes.c asloperands.c aslopt.c		\
-	asloptions.c aslpld.c aslpredef.c aslprepkg.c		\
+	aslfileio.c aslfiles.c aslfold.c aslhelp.c aslhex.c	\
+	asllength.c asllisting.c asllistsup.c aslload.c		\
+	asllookup.c aslmain.c aslmap.c aslmapenter.c		\
+	aslmapoutput.c aslmaputils.c aslmessages.c aslmethod.c	\
+	aslnamesp.c asloffset.c aslopcodes.c asloperands.c	\
+	aslopt.c asloptions.c aslpld.c aslpredef.c aslprepkg.c	\
 	aslprintf.c aslprune.c aslresource.c aslrestype1.c	\
 	aslrestype1i.c aslrestype2.c aslrestype2d.c		\
 	aslrestype2e.c aslrestype2q.c aslrestype2s.c		\
 	aslrestype2w.c aslstartup.c aslstubs.c asltransform.c	\
 	asltree.c aslutils.c asluuid.c aslwalks.c aslxref.c	\
-	aslxrefout.c dtcompile.c dtexpress.c dtfield.c dtio.c	\
-	dtparser.y.h dtparserlex.c dtparserparse.c dtsubtable.c	\
-	dttable.c dttable1.c dttable2.c dttemplate.c dtutils.c	\
+	aslxrefout.c cvcompiler.c cvdisasm.c cvparser.c		\
+	dtcompile.c dtexpress.c dtfield.c dtio.c dtparser.y.h	\
+	dtparserlex.c dtparserparse.c dtsubtable.c dttable.c	\
+	dttable1.c dttable2.c dttemplate.c dtutils.c		\
 	prexpress.c prmacros.c prparser.y.h prparserlex.c	\
 	prparserparse.c prscan.c prutils.c
 
@@ -65,11 +66,11 @@ SRCS+=	utaddress.c utalloc.c utascii.c utbuffer.c utcache.c	\
 	utcopy.c utdebug.c utdecode.c utdelete.c uterror.c	\
 	utexcep.c utglobal.c uthex.c utinit.c utlock.c utmath.c	\
 	utmisc.c utmutex.c utnonansi.c utobject.c utownerid.c	\
-	utpredef.c utprint.c utresrc.c utstate.c utstring.c	\
+	utpredef.c utresrc.c utstate.c utstring.c utstrtoul64.c	\
 	utuuid.c utxface.c utxferror.c
 
 # os_specific/service_layers
-SRCS+=	oslibcfs.c osunixxf.c
+SRCS+=	osunixxf.c
 
 WARNS?=	2
 
@@ -85,8 +86,9 @@ CLEANFILES= aslcompiler.y aslcompiler.y.h aslcompilerlex.c	\
 	prparser.y.h prparserlex.c prparserparse.c		\
 	prparserparse.h
 
-PARSER=	aslcstyle.y aslparser.y aslresources.y aslrules.y	\
-	aslsupport.y asltokens.y asltypes.y
+PARSER=	aslcstyle.y aslhelpers.y aslkeywords.y aslparser.y	\
+	aslprimaries.y aslresources.y aslrules.y aslsupport.y	\
+	asltokens.y asltypes.y
 
 aslcompilerlex.c: aslcompiler.l aslsupport.l
 	${LEX} ${LFLAGS} -PAslCompiler -o${.TARGET} \