sync from head

2 files changed, 22 insertions, 20 deletions

diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 9eccb4d..5ee3d47 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -35,10 +35,10 @@ SRCS+=	hwacpi.c hwesleep.c hwgpe.c hwpci.c hwregs.c hwsleep.c	\
 	hwvalid.c hwxface.c hwxfsleep.c
 
 # components/namespace
-SRCS+=	nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c		\
-	nsload.c nsnames.c nsobject.c nsparse.c nspredef.c	\
-	nsprepkg.c nsrepair.c nsrepair2.c nssearch.c nsutils.c	\
-	nswalk.c nsxfeval.c nsxfname.c nsxfobj.c
+SRCS+=	nsaccess.c nsalloc.c nsconvert.c nsdump.c nseval.c	\
+	nsinit.c nsload.c nsnames.c nsobject.c nsparse.c	\
+	nspredef.c nsprepkg.c nsrepair.c nsrepair2.c nssearch.c	\
+	nsutils.c nswalk.c nsxfeval.c nsxfname.c nsxfobj.c
 
 # components/parser
 SRCS+=	psargs.c psloop.c psobject.c psopcode.c psopinfo.c	\
@@ -61,8 +61,9 @@ SRCS+=	tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c	\
 SRCS+=	utaddress.c utalloc.c utcache.c utcopy.c utdebug.c	\
 	utdecode.c utdelete.c uteval.c utexcep.c utglobal.c	\
 	utids.c	utinit.c utlock.c utmath.c utmisc.c utmutex.c	\
-	utobject.c utosi.c utownerid.c utresrc.c utstate.c	\
-	utstring.c uttrack.c utxface.c utxferror.c utxfinit.c
+	utobject.c utosi.c utownerid.c utpredef.c utresrc.c	\
+	utstate.c utstring.c uttrack.c utxface.c utxferror.c	\
+	utxfinit.c
 
 MAN=	acpidb.8
 WARNS?=	2
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index b348141..973b63d 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -11,18 +11,19 @@ SRCS+=	ahpredef.c dmextern.c dmrestag.c dmtable.c dmtbdump.c	\
 SRCS+=	aslanalyze.c aslbtypes.c aslcodegen.c aslcompile.c	\
 	aslcompiler.y.h aslcompilerlex.c aslcompilerparse.c	\
 	aslerror.c aslfileio.c aslfiles.c aslfold.c aslhex.c	\
-	asllength.c asllisting.c aslload.c asllookup.c		\
-	aslmain.c aslmap.c aslmethod.c aslnamesp.c aslopcodes.c	\
-	asloperands.c aslopt.c aslpredef.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 dtcompile.c dtexpress.c dtfield.c	\
-	dtio.c dtparser.y.h dtparserlex.c dtparserparse.c	\
-	dtsubtable.c dttable.c dttemplate.c dtutils.c		\
-	prexpress.c prmacros.c prparser.y.h prparserlex.c	\
-	prparserparse.c prscan.c prutils.c
+	asllength.c asllisting.c asllistsup.c aslload.c		\
+	asllookup.c aslmain.c aslmap.c aslmethod.c aslnamesp.c	\
+	asloffset.c aslopcodes.c asloperands.c aslopt.c		\
+	aslpredef.c aslprepkg.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	\
+	dtcompile.c dtexpress.c dtfield.c dtio.c dtparser.y.h	\
+	dtparserlex.c dtparserparse.c dtsubtable.c dttable.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
@@ -57,8 +58,8 @@ SRCS+=	tbfadt.c tbinstal.c tbutils.c tbxface.c
 SRCS+=	utaddress.c utalloc.c utcache.c utcopy.c utdebug.c	\
 	utdecode.c utdelete.c utexcep.c utglobal.c utinit.c	\
 	utlock.c utmath.c utmisc.c utmutex.c utobject.c		\
-	utownerid.c utresrc.c utstate.c utstring.c utxface.c	\
-	utxferror.c
+	utownerid.c utpredef.c utresrc.c utstate.c utstring.c	\
+	utxface.c utxferror.c
 
 # os_specific/service_layers
 SRCS+=	osunixxf.c