diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 892f1e8c0cdb..ca9c90f26469 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -1,92 +1,96 @@
 # $FreeBSD$
 
 PROG=	acpidb
 SRCS=	acpidb.c
 
 # common
 SRCS+=	acfileio.c acgetline.c ahids.c ahuuids.c cmfsize.c
 
 # components/debugger
 SRCS+=	dbcmds.c dbconvert.c dbdisply.c dbexec.c dbfileio.c	\
 	dbhistry.c dbinput.c dbmethod.c dbnames.c dbobject.c	\
 	dbstats.c dbtest.c dbutils.c dbxface.c
 
 # components/disassembler
 SRCS+=	dmbuffer.c dmcstyle.c dmdeferred.c dmnames.c dmopcode.c	\
 	dmresrc.c dmresrcl.c dmresrcl2.c dmresrcs.c dmutils.c	\
 	dmwalk.c
 
 # components/dispatcher
 SRCS+=	dsargs.c dscontrol.c dsdebug.c dsfield.c dsinit.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	\
 	evgpeutil.c evhandler.c evmisc.c evregion.c evrgnini.c	\
 	evsci.c evxface.c evxfevnt.c evxfregn.c
 
 # components/executer
 SRCS+=	exconcat.c exconfig.c exconvrt.c excreate.c exdebug.c	\
 	exdump.c exfield.c exfldio.c exmisc.c exmutex.c		\
 	exnames.c exoparg1.c exoparg2.c exoparg3.c exoparg6.c	\
 	exprep.c exregion.c exresnte.c exresolv.c exresop.c	\
 	exserial.c exstore.c exstoren.c exstorob.c exsystem.c	\
 	extrace.c exutils.c
 
 # components/hardware
 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 nsarguments.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	\
 	psparse.c psscope.c pstree.c psutils.c pswalk.c		\
 	psxface.c
 
 # components/resources
 SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsdumpinfo.c	\
 	rsinfo.c rsio.c rsirq.c rslist.c rsmemory.c rsmisc.c	\
 	rsserial.c rsutils.c rsxface.c
 
 # components/tables
 SRCS+=	tbdata.c tbfadt.c tbfind.c tbinstal.c tbprint.c		\
 	tbutils.c tbxface.c tbxfload.c
 
 # components/utilities
 SRCS+=	utaddress.c utalloc.c utascii.c utbuffer.c utcache.c	\
 	utcksum.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	\
 	utresdecode.c utresrc.c utstate.c utstring.c		\
 	utstrsuppt.c utstrtoul64.c uttrack.c utuuid.c utxface.c	\
 	utxferror.c utxfinit.c
 
 # os_specific/service_layers
 SRCS+=	osgendbg.c osunixxf.c
 
 MAN=	acpidb.8
 WARNS?=	3
 
 CFLAGS+= -DACPI_DB_APP -DACPI_EXEC_APP -fno-strict-aliasing
 LIBADD=	pthread
 
 .include <bsd.prog.mk>
 
 # clang 6.0.0 and higher warn about the ACPI_ROOT_OBJECT and
 # ACPI_TO_POINTER macros from sys/contrib/dev/acpica/include/actypes.h,
 # that they use arithmetic on a null pointer treated as a cast from
 # integer to pointer, which is a GNU extension.
 #
 # Turn off the warning, because this is in contributed code.
 .if ${COMPILER_TYPE} == "clang"
 CWARNFLAGS+=	-Wno-null-pointer-arithmetic
 .endif
+
+# AcpiUtInitStackPtrTrace intentionally leaks a pointer to an
+# on-stack variable.
+CWARNFLAGS.utdebug.c+= ${NO_WDANGLING_POINTER}
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index 15b6d7a03c3d..6b95cc1d7457 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -1,150 +1,154 @@
 # $FreeBSD$
 
 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 dmswitch.c dmtable.c dmtables.c dmtbdump.c	\
 	dmtbdump1.c dmtbdump2.c dmtbdump3.c dmtbinfo.c		\
 	dmtbinfo1.c dmtbinfo2.c dmtbinfo3.c getopt.c
 
 # compiler
 SRCS+=	aslallocate.c aslanalyze.c aslascii.c aslbtypes.c	\
 	aslcache.c aslcodegen.c aslcompile.c aslcompiler.y.h	\
 	aslcompilerlex.c aslcompilerparse.c asldebug.c		\
 	aslerror.c aslexternal.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	\
 	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 dtcompilerparser.y.h dtcompilerparserlex.c	\
 	dtcompilerparserparse.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
 
 # components/disassembler
 SRCS+=	dmbuffer.c dmcstyle.c dmdeferred.c dmnames.c dmopcode.c	\
 	dmresrc.c dmresrcl.c dmresrcl2.c dmresrcs.c dmutils.c	\
 	dmwalk.c
 
 # components/dispatcher
 SRCS+=	dsargs.c dscontrol.c dsfield.c dsobject.c dsopcode.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	\
 	exmutex.c exnames.c exoparg1.c exoparg2.c exoparg3.c	\
 	exoparg6.c exprep.c exresnte.c exresolv.c exresop.c	\
 	exstore.c exstoren.c exstorob.c exsystem.c exutils.c
 
 # components/parser
 SRCS+=	psargs.c psloop.c psobject.c psopcode.c psopinfo.c	\
 	psparse.c psscope.c pstree.c psutils.c pswalk.c
 
 # components/namespace
 SRCS+=	nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c	\
 	nsparse.c nssearch.c nsutils.c nswalk.c
 
 # components/tables
 SRCS+=	tbdata.c tbfadt.c tbinstal.c tbprint.c tbutils.c	\
 	tbxface.c tbxfload.c
 
 # components/utilities
 SRCS+=	utaddress.c utalloc.c utascii.c utbuffer.c utcache.c	\
 	utcksum.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 utresdecode.c		\
 	utresrc.c utstate.c utstring.c utstrsuppt.c		\
 	utstrtoul64.c utuuid.c utxface.c utxferror.c
 
 # os_specific/service_layers
 SRCS+=	osunixxf.c
 
 WARNS?=	2
 
 MAN=	iasl.8
 
 CFLAGS+= -DACPI_ASL_COMPILER -I.
 LFLAGS= -i -s
 DLFLAGS=-i
 YFLAGS= -d
 
 CLEANFILES= aslcompiler.y aslcompiler.y.h aslcompilerlex.c	\
 	aslcompilerparse.c aslcompilerparse.h			\
 	dtcompilerparser.y.h dtcompilerparserlex.c		\
 	dtcompilerparserparse.c	dtcompilerparserparse.h		\
 	dtparser.y.h dtparserlex.c dtparserparse.c		\
 	dtparserparse.h prparser.y.h prparserlex.c		\
 	prparserparse.c prparserparse.h
 
 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} \
 	    ${ACPICA_DIR}/compiler/aslcompiler.l
 
 aslcompiler.y: ${PARSER}
 	m4 -P -I${ACPICA_DIR}/compiler \
 	    ${ACPICA_DIR}/compiler/aslparser.y > ${.TARGET}
 
 .ORDER: aslcompilerparse.c aslcompilerparse.h
 aslcompilerparse.h: .NOMETA
 aslcompilerparse.c aslcompilerparse.h: aslcompiler.y
 	${YACC} ${YFLAGS} -pAslCompiler -oaslcompilerparse.c ${.ALLSRC}
 
 aslcompiler.y.h: aslcompilerparse.h .NOMETA
 	ln -f ${.ALLSRC} ${.TARGET}
 
 dtcompilerparserlex.c: dtcompilerparser.l
 	${LEX} ${DLFLAGS} -PDtCompilerParser -o${.TARGET} ${.ALLSRC}
 
 .ORDER: dtcompilerparserparse.c dtcompilerparserparse.h
 dtcompilerparserparse.h: .NOMETA
 dtcompilerparserparse.c dtcompilerparserparse.h: dtcompilerparser.y
 	${YACC} ${YFLAGS} -pDtCompilerParser -odtcompilerparserparse.c \
 	    ${.ALLSRC}
 
 dtcompilerparser.y.h: dtcompilerparserparse.h .NOMETA
 	ln -f ${.ALLSRC} ${.TARGET}
 
 dtparserlex.c: dtparser.l
 	${LEX} ${DLFLAGS} -PDtParser -o${.TARGET} ${.ALLSRC}
 
 .ORDER: dtparserparse.c dtparserparse.h
 dtparserparse.h: .NOMETA
 dtparserparse.c dtparserparse.h: dtparser.y
 	${YACC} ${YFLAGS} -pDtParser -odtparserparse.c ${.ALLSRC}
 
 dtparser.y.h: dtparserparse.h .NOMETA
 	ln -f ${.ALLSRC} ${.TARGET}
 
 prparserlex.c: prparser.l
 	${LEX} ${LFLAGS} -PPrParser -o${.TARGET} ${.ALLSRC}
 
 .ORDER: prparserparse.c prparserparse.h
 prparserparse.h: .NOMETA
 prparserparse.c prparserparse.h: prparser.y
 	${YACC} ${YFLAGS} -pPrParser -oprparserparse.c ${.ALLSRC}
 
 prparser.y.h: prparserparse.h .NOMETA
 	ln -f ${.ALLSRC} ${.TARGET}
 
+# AcpiUtInitStackPtrTrace intentionally leaks a pointer to an
+# on-stack variable.
+CWARNFLAGS.utdebug.c+= ${NO_WDANGLING_POINTER}
+
 .include <bsd.prog.mk>