MFC: r319365, r321670

Merge ACPICA 20170728.

2 files changed, 25 insertions, 23 deletions

diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index a2f486d..2f24d80 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -18,8 +18,9 @@ SRCS+=	dmbuffer.c dmcstyle.c dmdeferred.c dmnames.c dmopcode.c	\
 
 # components/dispatcher
 SRCS+=	dsargs.c dscontrol.c dsdebug.c dsfield.c dsinit.c	\
-	dsmethod.c dsmthdat.c dsobject.c dsopcode.c dsutils.c	\
-	dswexec.c dswload.c dswload2.c dswscope.c dswstate.c
+	dsmethod.c dsmthdat.c dsobject.c dsopcode.c dspkginit.c	\
+	dsutils.c dswexec.c dswload.c dswload2.c dswscope.c	\
+	dswstate.c
 
 # components/events
 SRCS+=	evevent.c evglock.c evgpe.c evgpeblk.c evgpeinit.c	\
@@ -64,9 +65,9 @@ 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 utresrc.c	\
-	utstate.c utstring.c utstrtoul64.c uttrack.c utuuid.c	\
-	utxface.c utxferror.c utxfinit.c
+	utobject.c utosi.c utownerid.c utpredef.c utresdecode.c	\
+	utresrc.c utstate.c utstring.c utstrtoul64.c uttrack.c	\
+	utuuid.c utxface.c utxferror.c utxfinit.c
 
 # os_specific/service_layers
 SRCS+=	osgendbg.c osunixxf.c
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index 91f50f0..77a13ec 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -5,8 +5,8 @@ PROG=	iasl
 # common
 SRCS=	acfileio.c adfile.c adisasm.c adwalk.c ahids.c		\
 	ahpredef.c ahtable.c ahuuids.c cmfsize.c dmextern.c	\
-	dmrestag.c dmtable.c dmtables.c dmtbdump.c dmtbinfo.c	\
-	getopt.c
+	dmrestag.c dmswitch.c dmtable.c dmtables.c dmtbdump.c	\
+	dmtbinfo.c getopt.c
 
 # compiler
 SRCS+=	aslanalyze.c aslascii.c aslbtypes.c aslcodegen.c	\
@@ -17,18 +17,19 @@ SRCS+=	aslanalyze.c aslascii.c aslbtypes.c aslcodegen.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 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
+	aslopt.c asloptions.c aslparseop.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 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
 
 # components/debugger
 SRCS+=	dbfileio.c
@@ -40,8 +41,8 @@ SRCS+=	dmbuffer.c dmcstyle.c dmdeferred.c dmnames.c dmopcode.c	\
 
 # components/dispatcher
 SRCS+=	dsargs.c dscontrol.c dsfield.c dsobject.c dsopcode.c	\
-	dsutils.c dswexec.c dswload.c dswload2.c dswscope.c	\
-	dswstate.c
+	dspkginit.c dsutils.c dswexec.c dswload.c dswload2.c	\
+	dswscope.c dswstate.c
 
 # components/executer
 SRCS+=	exconcat.c exconvrt.c excreate.c exdump.c exmisc.c	\
@@ -66,8 +67,8 @@ 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 utresrc.c utstate.c utstring.c utstrtoul64.c	\
-	utuuid.c utxface.c utxferror.c
+	utpredef.c utresdecode.c utresrc.c utstate.c utstring.c	\
+	utstrtoul64.c utuuid.c utxface.c utxferror.c
 
 # os_specific/service_layers
 SRCS+=	osunixxf.c