svn commit: r316303 - in stable/11: sys/arm64/acpica sys/conf sys/contrib/dev/acpica sys/contrib/dev/acpica/common sys/contrib/dev/acpica/compiler sys/contrib/dev/acpica/components/debugger sys/con...

[Jung-uk Kim]

Author: jkim
Date: Thu Mar 30 20:18:34 2017
New Revision: 316303
URL: https://svnweb.freebsd.org/changeset/base/316303

Log:
  MFC:	r306686, r308953, r311462, r311529, r312438, r314611
  
  - Merge ACPICA 20170303.
  - Remove '-vd' option to make iasl(8) reproducible.
  
  Relnotes:	yes

Added:
  stable/11/sys/contrib/dev/acpica/compiler/aslhelp.c
     - copied, changed from r306686, head/sys/contrib/dev/acpica/compiler/aslhelp.c
  stable/11/sys/contrib/dev/acpica/compiler/aslhelpers.y
     - copied, changed from r306686, head/sys/contrib/dev/acpica/compiler/aslhelpers.y
  stable/11/sys/contrib/dev/acpica/compiler/aslkeywords.y
     - copied, changed from r306686, head/sys/contrib/dev/acpica/compiler/aslkeywords.y
  stable/11/sys/contrib/dev/acpica/compiler/aslprimaries.y
     - copied, changed from r306686, head/sys/contrib/dev/acpica/compiler/aslprimaries.y
  stable/11/sys/contrib/dev/acpica/compiler/cvcompiler.c
     - copied unchanged from r314611, head/sys/contrib/dev/acpica/compiler/cvcompiler.c
  stable/11/sys/contrib/dev/acpica/compiler/cvdisasm.c
     - copied unchanged from r314611, head/sys/contrib/dev/acpica/compiler/cvdisasm.c
  stable/11/sys/contrib/dev/acpica/compiler/cvparser.c
     - copied unchanged from r314611, head/sys/contrib/dev/acpica/compiler/cvparser.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c
     - copied, changed from r306686, head/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c
  stable/11/sys/contrib/dev/acpica/include/acconvert.h
     - copied unchanged from r314611, head/sys/contrib/dev/acpica/include/acconvert.h
  stable/11/sys/contrib/dev/acpica/include/platform/acgccex.h
     - copied, changed from r306686, head/sys/contrib/dev/acpica/include/platform/acgccex.h
  stable/11/sys/contrib/dev/acpica/os_specific/service_layers/osgendbg.c
     - copied, changed from r311462, head/sys/contrib/dev/acpica/os_specific/service_layers/osgendbg.c
Deleted:
  stable/11/sys/contrib/dev/acpica/components/utilities/utprint.c
  stable/11/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
Modified:
  stable/11/sys/arm64/acpica/OsdEnvironment.c
  stable/11/sys/conf/files
  stable/11/sys/contrib/dev/acpica/acpica_prep.sh
  stable/11/sys/contrib/dev/acpica/changes.txt
  stable/11/sys/contrib/dev/acpica/common/acfileio.c
  stable/11/sys/contrib/dev/acpica/common/acgetline.c
  stable/11/sys/contrib/dev/acpica/common/adfile.c
  stable/11/sys/contrib/dev/acpica/common/adisasm.c
  stable/11/sys/contrib/dev/acpica/common/adwalk.c
  stable/11/sys/contrib/dev/acpica/common/ahids.c
  stable/11/sys/contrib/dev/acpica/common/ahpredef.c
  stable/11/sys/contrib/dev/acpica/common/ahtable.c
  stable/11/sys/contrib/dev/acpica/common/ahuuids.c
  stable/11/sys/contrib/dev/acpica/common/cmfsize.c
  stable/11/sys/contrib/dev/acpica/common/dmextern.c
  stable/11/sys/contrib/dev/acpica/common/dmrestag.c
  stable/11/sys/contrib/dev/acpica/common/dmtable.c
  stable/11/sys/contrib/dev/acpica/common/dmtables.c
  stable/11/sys/contrib/dev/acpica/common/dmtbdump.c
  stable/11/sys/contrib/dev/acpica/common/dmtbinfo.c
  stable/11/sys/contrib/dev/acpica/common/getopt.c
  stable/11/sys/contrib/dev/acpica/compiler/aslanalyze.c
  stable/11/sys/contrib/dev/acpica/compiler/aslascii.c
  stable/11/sys/contrib/dev/acpica/compiler/aslbtypes.c
  stable/11/sys/contrib/dev/acpica/compiler/aslcodegen.c
  stable/11/sys/contrib/dev/acpica/compiler/aslcompile.c
  stable/11/sys/contrib/dev/acpica/compiler/aslcompiler.h
  stable/11/sys/contrib/dev/acpica/compiler/aslcompiler.l
  stable/11/sys/contrib/dev/acpica/compiler/aslcstyle.y
  stable/11/sys/contrib/dev/acpica/compiler/asldebug.c
  stable/11/sys/contrib/dev/acpica/compiler/asldefine.h
  stable/11/sys/contrib/dev/acpica/compiler/aslerror.c
  stable/11/sys/contrib/dev/acpica/compiler/aslexternal.c
  stable/11/sys/contrib/dev/acpica/compiler/aslfileio.c
  stable/11/sys/contrib/dev/acpica/compiler/aslfiles.c
  stable/11/sys/contrib/dev/acpica/compiler/aslfold.c
  stable/11/sys/contrib/dev/acpica/compiler/aslglobal.h
  stable/11/sys/contrib/dev/acpica/compiler/aslhex.c
  stable/11/sys/contrib/dev/acpica/compiler/asllength.c
  stable/11/sys/contrib/dev/acpica/compiler/asllisting.c
  stable/11/sys/contrib/dev/acpica/compiler/asllistsup.c
  stable/11/sys/contrib/dev/acpica/compiler/aslload.c
  stable/11/sys/contrib/dev/acpica/compiler/asllookup.c
  stable/11/sys/contrib/dev/acpica/compiler/aslmain.c
  stable/11/sys/contrib/dev/acpica/compiler/aslmap.c
  stable/11/sys/contrib/dev/acpica/compiler/aslmapenter.c
  stable/11/sys/contrib/dev/acpica/compiler/aslmapoutput.c
  stable/11/sys/contrib/dev/acpica/compiler/aslmaputils.c
  stable/11/sys/contrib/dev/acpica/compiler/aslmessages.c
  stable/11/sys/contrib/dev/acpica/compiler/aslmessages.h
  stable/11/sys/contrib/dev/acpica/compiler/aslmethod.c
  stable/11/sys/contrib/dev/acpica/compiler/aslnamesp.c
  stable/11/sys/contrib/dev/acpica/compiler/asloffset.c
  stable/11/sys/contrib/dev/acpica/compiler/aslopcodes.c
  stable/11/sys/contrib/dev/acpica/compiler/asloperands.c
  stable/11/sys/contrib/dev/acpica/compiler/aslopt.c
  stable/11/sys/contrib/dev/acpica/compiler/asloptions.c
  stable/11/sys/contrib/dev/acpica/compiler/aslparser.y
  stable/11/sys/contrib/dev/acpica/compiler/aslpld.c
  stable/11/sys/contrib/dev/acpica/compiler/aslpredef.c
  stable/11/sys/contrib/dev/acpica/compiler/aslprepkg.c
  stable/11/sys/contrib/dev/acpica/compiler/aslprintf.c
  stable/11/sys/contrib/dev/acpica/compiler/aslprune.c
  stable/11/sys/contrib/dev/acpica/compiler/aslresource.c
  stable/11/sys/contrib/dev/acpica/compiler/aslresources.y
  stable/11/sys/contrib/dev/acpica/compiler/aslrestype1.c
  stable/11/sys/contrib/dev/acpica/compiler/aslrestype1i.c
  stable/11/sys/contrib/dev/acpica/compiler/aslrestype2.c
  stable/11/sys/contrib/dev/acpica/compiler/aslrestype2d.c
  stable/11/sys/contrib/dev/acpica/compiler/aslrestype2e.c
  stable/11/sys/contrib/dev/acpica/compiler/aslrestype2q.c
  stable/11/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  stable/11/sys/contrib/dev/acpica/compiler/aslrestype2w.c
  stable/11/sys/contrib/dev/acpica/compiler/aslrules.y
  stable/11/sys/contrib/dev/acpica/compiler/aslstartup.c
  stable/11/sys/contrib/dev/acpica/compiler/aslstubs.c
  stable/11/sys/contrib/dev/acpica/compiler/aslsupport.l
  stable/11/sys/contrib/dev/acpica/compiler/aslsupport.y
  stable/11/sys/contrib/dev/acpica/compiler/asltokens.y
  stable/11/sys/contrib/dev/acpica/compiler/asltransform.c
  stable/11/sys/contrib/dev/acpica/compiler/asltree.c
  stable/11/sys/contrib/dev/acpica/compiler/asltypes.h
  stable/11/sys/contrib/dev/acpica/compiler/asltypes.y
  stable/11/sys/contrib/dev/acpica/compiler/aslutils.c
  stable/11/sys/contrib/dev/acpica/compiler/asluuid.c
  stable/11/sys/contrib/dev/acpica/compiler/aslwalks.c
  stable/11/sys/contrib/dev/acpica/compiler/aslxref.c
  stable/11/sys/contrib/dev/acpica/compiler/aslxrefout.c
  stable/11/sys/contrib/dev/acpica/compiler/dtcompile.c
  stable/11/sys/contrib/dev/acpica/compiler/dtcompiler.h
  stable/11/sys/contrib/dev/acpica/compiler/dtexpress.c
  stable/11/sys/contrib/dev/acpica/compiler/dtfield.c
  stable/11/sys/contrib/dev/acpica/compiler/dtio.c
  stable/11/sys/contrib/dev/acpica/compiler/dtparser.l
  stable/11/sys/contrib/dev/acpica/compiler/dtparser.y
  stable/11/sys/contrib/dev/acpica/compiler/dtsubtable.c
  stable/11/sys/contrib/dev/acpica/compiler/dttable.c
  stable/11/sys/contrib/dev/acpica/compiler/dttable1.c
  stable/11/sys/contrib/dev/acpica/compiler/dttable2.c
  stable/11/sys/contrib/dev/acpica/compiler/dttemplate.c
  stable/11/sys/contrib/dev/acpica/compiler/dttemplate.h
  stable/11/sys/contrib/dev/acpica/compiler/dtutils.c
  stable/11/sys/contrib/dev/acpica/compiler/preprocess.h
  stable/11/sys/contrib/dev/acpica/compiler/prexpress.c
  stable/11/sys/contrib/dev/acpica/compiler/prmacros.c
  stable/11/sys/contrib/dev/acpica/compiler/prparser.l
  stable/11/sys/contrib/dev/acpica/compiler/prparser.y
  stable/11/sys/contrib/dev/acpica/compiler/prscan.c
  stable/11/sys/contrib/dev/acpica/compiler/prutils.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbconvert.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbexec.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbfileio.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbhistry.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbinput.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbnames.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbobject.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbstats.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbtest.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbutils.c
  stable/11/sys/contrib/dev/acpica/components/debugger/dbxface.c
  stable/11/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  stable/11/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c
  stable/11/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
  stable/11/sys/contrib/dev/acpica/components/disassembler/dmnames.c
  stable/11/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  stable/11/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
  stable/11/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
  stable/11/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
  stable/11/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
  stable/11/sys/contrib/dev/acpica/components/disassembler/dmutils.c
  stable/11/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dsdebug.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dswscope.c
  stable/11/sys/contrib/dev/acpica/components/dispatcher/dswstate.c
  stable/11/sys/contrib/dev/acpica/components/events/evevent.c
  stable/11/sys/contrib/dev/acpica/components/events/evglock.c
  stable/11/sys/contrib/dev/acpica/components/events/evgpe.c
  stable/11/sys/contrib/dev/acpica/components/events/evgpeblk.c
  stable/11/sys/contrib/dev/acpica/components/events/evgpeinit.c
  stable/11/sys/contrib/dev/acpica/components/events/evgpeutil.c
  stable/11/sys/contrib/dev/acpica/components/events/evhandler.c
  stable/11/sys/contrib/dev/acpica/components/events/evmisc.c
  stable/11/sys/contrib/dev/acpica/components/events/evregion.c
  stable/11/sys/contrib/dev/acpica/components/events/evrgnini.c
  stable/11/sys/contrib/dev/acpica/components/events/evsci.c
  stable/11/sys/contrib/dev/acpica/components/events/evxface.c
  stable/11/sys/contrib/dev/acpica/components/events/evxfevnt.c
  stable/11/sys/contrib/dev/acpica/components/events/evxfgpe.c
  stable/11/sys/contrib/dev/acpica/components/events/evxfregn.c
  stable/11/sys/contrib/dev/acpica/components/executer/exconcat.c
  stable/11/sys/contrib/dev/acpica/components/executer/exconfig.c
  stable/11/sys/contrib/dev/acpica/components/executer/exconvrt.c
  stable/11/sys/contrib/dev/acpica/components/executer/excreate.c
  stable/11/sys/contrib/dev/acpica/components/executer/exdebug.c
  stable/11/sys/contrib/dev/acpica/components/executer/exdump.c
  stable/11/sys/contrib/dev/acpica/components/executer/exfield.c
  stable/11/sys/contrib/dev/acpica/components/executer/exfldio.c
  stable/11/sys/contrib/dev/acpica/components/executer/exmisc.c
  stable/11/sys/contrib/dev/acpica/components/executer/exmutex.c
  stable/11/sys/contrib/dev/acpica/components/executer/exnames.c
  stable/11/sys/contrib/dev/acpica/components/executer/exoparg1.c
  stable/11/sys/contrib/dev/acpica/components/executer/exoparg2.c
  stable/11/sys/contrib/dev/acpica/components/executer/exoparg3.c
  stable/11/sys/contrib/dev/acpica/components/executer/exoparg6.c
  stable/11/sys/contrib/dev/acpica/components/executer/exprep.c
  stable/11/sys/contrib/dev/acpica/components/executer/exregion.c
  stable/11/sys/contrib/dev/acpica/components/executer/exresnte.c
  stable/11/sys/contrib/dev/acpica/components/executer/exresolv.c
  stable/11/sys/contrib/dev/acpica/components/executer/exresop.c
  stable/11/sys/contrib/dev/acpica/components/executer/exstore.c
  stable/11/sys/contrib/dev/acpica/components/executer/exstoren.c
  stable/11/sys/contrib/dev/acpica/components/executer/exstorob.c
  stable/11/sys/contrib/dev/acpica/components/executer/exsystem.c
  stable/11/sys/contrib/dev/acpica/components/executer/extrace.c
  stable/11/sys/contrib/dev/acpica/components/executer/exutils.c
  stable/11/sys/contrib/dev/acpica/components/hardware/hwacpi.c
  stable/11/sys/contrib/dev/acpica/components/hardware/hwesleep.c
  stable/11/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  stable/11/sys/contrib/dev/acpica/components/hardware/hwpci.c
  stable/11/sys/contrib/dev/acpica/components/hardware/hwregs.c
  stable/11/sys/contrib/dev/acpica/components/hardware/hwsleep.c
  stable/11/sys/contrib/dev/acpica/components/hardware/hwtimer.c
  stable/11/sys/contrib/dev/acpica/components/hardware/hwvalid.c
  stable/11/sys/contrib/dev/acpica/components/hardware/hwxface.c
  stable/11/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsalloc.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsarguments.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsconvert.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsdump.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nseval.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsinit.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsload.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsnames.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsobject.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsparse.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nspredef.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsrepair.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nssearch.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsutils.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nswalk.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsxfname.c
  stable/11/sys/contrib/dev/acpica/components/namespace/nsxfobj.c
  stable/11/sys/contrib/dev/acpica/components/parser/psargs.c
  stable/11/sys/contrib/dev/acpica/components/parser/psloop.c
  stable/11/sys/contrib/dev/acpica/components/parser/psobject.c
  stable/11/sys/contrib/dev/acpica/components/parser/psopcode.c
  stable/11/sys/contrib/dev/acpica/components/parser/psopinfo.c
  stable/11/sys/contrib/dev/acpica/components/parser/psparse.c
  stable/11/sys/contrib/dev/acpica/components/parser/psscope.c
  stable/11/sys/contrib/dev/acpica/components/parser/pstree.c
  stable/11/sys/contrib/dev/acpica/components/parser/psutils.c
  stable/11/sys/contrib/dev/acpica/components/parser/pswalk.c
  stable/11/sys/contrib/dev/acpica/components/parser/psxface.c
  stable/11/sys/contrib/dev/acpica/components/resources/rsaddr.c
  stable/11/sys/contrib/dev/acpica/components/resources/rscalc.c
  stable/11/sys/contrib/dev/acpica/components/resources/rscreate.c
  stable/11/sys/contrib/dev/acpica/components/resources/rsdump.c
  stable/11/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
  stable/11/sys/contrib/dev/acpica/components/resources/rsinfo.c
  stable/11/sys/contrib/dev/acpica/components/resources/rsio.c
  stable/11/sys/contrib/dev/acpica/components/resources/rsirq.c
  stable/11/sys/contrib/dev/acpica/components/resources/rslist.c
  stable/11/sys/contrib/dev/acpica/components/resources/rsmemory.c
  stable/11/sys/contrib/dev/acpica/components/resources/rsmisc.c
  stable/11/sys/contrib/dev/acpica/components/resources/rsserial.c
  stable/11/sys/contrib/dev/acpica/components/resources/rsutils.c
  stable/11/sys/contrib/dev/acpica/components/resources/rsxface.c
  stable/11/sys/contrib/dev/acpica/components/tables/tbdata.c
  stable/11/sys/contrib/dev/acpica/components/tables/tbfadt.c
  stable/11/sys/contrib/dev/acpica/components/tables/tbfind.c
  stable/11/sys/contrib/dev/acpica/components/tables/tbinstal.c
  stable/11/sys/contrib/dev/acpica/components/tables/tbprint.c
  stable/11/sys/contrib/dev/acpica/components/tables/tbutils.c
  stable/11/sys/contrib/dev/acpica/components/tables/tbxface.c
  stable/11/sys/contrib/dev/acpica/components/tables/tbxfload.c
  stable/11/sys/contrib/dev/acpica/components/tables/tbxfroot.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utaddress.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utalloc.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utascii.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utbuffer.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utcache.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utcopy.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utdebug.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utdecode.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utdelete.c
  stable/11/sys/contrib/dev/acpica/components/utilities/uterror.c
  stable/11/sys/contrib/dev/acpica/components/utilities/uteval.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utexcep.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utglobal.c
  stable/11/sys/contrib/dev/acpica/components/utilities/uthex.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utids.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utinit.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utlock.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utmath.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utmisc.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utmutex.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utnonansi.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utobject.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utosi.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utownerid.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utpredef.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utresrc.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utstate.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utstring.c
  stable/11/sys/contrib/dev/acpica/components/utilities/uttrack.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utuuid.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utxface.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utxferror.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utxfinit.c
  stable/11/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
  stable/11/sys/contrib/dev/acpica/include/acapps.h
  stable/11/sys/contrib/dev/acpica/include/acbuffer.h
  stable/11/sys/contrib/dev/acpica/include/acclib.h
  stable/11/sys/contrib/dev/acpica/include/accommon.h
  stable/11/sys/contrib/dev/acpica/include/acconfig.h
  stable/11/sys/contrib/dev/acpica/include/acdebug.h
  stable/11/sys/contrib/dev/acpica/include/acdisasm.h
  stable/11/sys/contrib/dev/acpica/include/acdispat.h
  stable/11/sys/contrib/dev/acpica/include/acevents.h
  stable/11/sys/contrib/dev/acpica/include/acexcep.h
  stable/11/sys/contrib/dev/acpica/include/acglobal.h
  stable/11/sys/contrib/dev/acpica/include/achware.h
  stable/11/sys/contrib/dev/acpica/include/acinterp.h
  stable/11/sys/contrib/dev/acpica/include/aclocal.h
  stable/11/sys/contrib/dev/acpica/include/acmacros.h
  stable/11/sys/contrib/dev/acpica/include/acnames.h
  stable/11/sys/contrib/dev/acpica/include/acnamesp.h
  stable/11/sys/contrib/dev/acpica/include/acobject.h
  stable/11/sys/contrib/dev/acpica/include/acopcode.h
  stable/11/sys/contrib/dev/acpica/include/acoutput.h
  stable/11/sys/contrib/dev/acpica/include/acparser.h
  stable/11/sys/contrib/dev/acpica/include/acpi.h
  stable/11/sys/contrib/dev/acpica/include/acpiosxf.h
  stable/11/sys/contrib/dev/acpica/include/acpixf.h
  stable/11/sys/contrib/dev/acpica/include/acpredef.h
  stable/11/sys/contrib/dev/acpica/include/acresrc.h
  stable/11/sys/contrib/dev/acpica/include/acrestyp.h
  stable/11/sys/contrib/dev/acpica/include/acstruct.h
  stable/11/sys/contrib/dev/acpica/include/actables.h
  stable/11/sys/contrib/dev/acpica/include/actbl.h
  stable/11/sys/contrib/dev/acpica/include/actbl1.h
  stable/11/sys/contrib/dev/acpica/include/actbl2.h
  stable/11/sys/contrib/dev/acpica/include/actbl3.h
  stable/11/sys/contrib/dev/acpica/include/actypes.h
  stable/11/sys/contrib/dev/acpica/include/acutils.h
  stable/11/sys/contrib/dev/acpica/include/acuuid.h
  stable/11/sys/contrib/dev/acpica/include/amlcode.h
  stable/11/sys/contrib/dev/acpica/include/amlresrc.h
  stable/11/sys/contrib/dev/acpica/include/platform/acenv.h
  stable/11/sys/contrib/dev/acpica/include/platform/acenvex.h
  stable/11/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  stable/11/sys/contrib/dev/acpica/include/platform/acgcc.h
  stable/11/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  stable/11/sys/dev/acpica/Osd/OsdDebug.c
  stable/11/sys/dev/acpica/Osd/OsdHardware.c
  stable/11/sys/dev/acpica/Osd/OsdTable.c
  stable/11/sys/x86/acpica/OsdEnvironment.c
  stable/11/sys/x86/acpica/madt.c
  stable/11/sys/x86/acpica/srat.c
  stable/11/sys/x86/xen/pvcpu_enum.c
  stable/11/usr.sbin/acpi/acpidb/Makefile
  stable/11/usr.sbin/acpi/acpidb/acpidb.c
  stable/11/usr.sbin/acpi/iasl/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm64/acpica/OsdEnvironment.c
==============================================================================
--- stable/11/sys/arm64/acpica/OsdEnvironment.c	Thu Mar 30 20:14:43 2017	(r316302)
+++ stable/11/sys/arm64/acpica/OsdEnvironment.c	Thu Mar 30 20:18:34 2017	(r316303)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/aclocal.h>
 #include <contrib/dev/acpica/include/actables.h>
 
 static u_long acpi_root_phys;

Modified: stable/11/sys/conf/files
==============================================================================
--- stable/11/sys/conf/files	Thu Mar 30 20:14:43 2017	(r316302)
+++ stable/11/sys/conf/files	Thu Mar 30 20:18:34 2017	(r316303)
@@ -479,11 +479,12 @@ contrib/dev/acpica/components/utilities/
 contrib/dev/acpica/components/utilities/utresrc.c	optional acpi
 contrib/dev/acpica/components/utilities/utstate.c	optional acpi
 contrib/dev/acpica/components/utilities/utstring.c	optional acpi
+contrib/dev/acpica/components/utilities/utstrtoul64.c	optional acpi
 contrib/dev/acpica/components/utilities/utuuid.c	optional acpi acpi_debug
 contrib/dev/acpica/components/utilities/utxface.c	optional acpi
 contrib/dev/acpica/components/utilities/utxferror.c	optional acpi
 contrib/dev/acpica/components/utilities/utxfinit.c	optional acpi
-#contrib/dev/acpica/components/utilities/utxfmutex.c	optional acpi
+contrib/dev/acpica/os_specific/service_layers/osgendbg.c	optional acpi acpi_debug
 contrib/ipfilter/netinet/fil.c	optional ipfilter inet \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \

Modified: stable/11/sys/contrib/dev/acpica/acpica_prep.sh
==============================================================================
--- stable/11/sys/contrib/dev/acpica/acpica_prep.sh	Thu Mar 30 20:14:43 2017	(r316302)
+++ stable/11/sys/contrib/dev/acpica/acpica_prep.sh	Thu Mar 30 20:18:34 2017	(r316303)
@@ -17,23 +17,24 @@ dst="$(realpath .)/acpi_ca_destination"
 fulldirs="common compiler components include os_specific"
 
 # files to remove
-stripdirs="generate libraries tests tools"
+stripdirs="generate libraries parsers preprocessor tests tools"
 stripfiles="Makefile README accygwin.h acdragonfly.h acdragonflyex.h	\
 	acefi.h acefiex.h achaiku.h acintel.h aclinux.h aclinuxex.h	\
 	acmacosx.h acmsvc.h acmsvcex.h acnetbsd.h acos2.h acqnx.h	\
 	acwin.h acwin64.h acwinex.h new_table.txt osbsdtbl.c osefitbl.c	\
 	osefixf.c osfreebsdtbl.c oslinuxtbl.c osunixdir.c osunixmap.c	\
-	oswindir.c oswintbl.c oswinxf.c readme.txt utclib.c"
+	oswindir.c oswintbl.c oswinxf.c readme.txt utclib.c utprint.c"
 
 # include files to canonify
 src_headers="acapps.h acbuffer.h acclib.h accommon.h acconfig.h		\
-	acdebug.h acdisasm.h acdispat.h acevents.h acexcep.h acglobal.h	\
-	achware.h acinterp.h aclocal.h acmacros.h acnames.h acnamesp.h	\
-	acobject.h acopcode.h acoutput.h acparser.h acpi.h acpiosxf.h	\
-	acpixf.h acpredef.h acresrc.h acrestyp.h acstruct.h actables.h	\
-	actbl.h actbl1.h actbl2.h actbl3.h actypes.h acutils.h acuuid.h	\
-	amlcode.h amlresrc.h platform/acenv.h platform/acenvex.h	\
-	platform/acfreebsd.h platform/acgcc.h"
+	acconvert.h acdebug.h acdisasm.h acdispat.h acevents.h		\
+	acexcep.h acglobal.h achware.h acinterp.h aclocal.h acmacros.h	\
+	acnames.h acnamesp.h acobject.h acopcode.h acoutput.h		\
+	acparser.h acpi.h acpiosxf.h acpixf.h acpredef.h acresrc.h	\
+	acrestyp.h acstruct.h actables.h actbl.h actbl1.h actbl2.h	\
+	actbl3.h actypes.h acutils.h acuuid.h amlcode.h amlresrc.h	\
+	platform/acenv.h platform/acenvex.h platform/acfreebsd.h	\
+	platform/acgcc.h"
 comp_headers="aslcompiler.h asldefine.h aslglobal.h aslmessages.h	\
 	aslsupport.l asltypes.h dtcompiler.h dttemplate.h preprocess.h"
 platform_headers="acfreebsd.h acgcc.h"
@@ -87,6 +88,6 @@ rm -rf ${wrk}
 # assist the developer in generating a diff
 echo "Directories you may want to 'svn diff':"
 echo "    sys/contrib/dev/acpica sys/dev/acpica \\"
-echo "    sys/amd64/acpica sys/i386/acpica sys/x86/acpica \\"
-echo "    sys/amd64/include sys/i386/include include \\"
+echo "    sys/amd64/acpica sys/arm64/acpica sys/i386/acpica sys/x86/acpica \\"
+echo "    sys/amd64/include sys/arm64/include sys/i386/include include \\"
 echo "    sys/boot sys/conf sys/modules/acpi usr.sbin/acpi"

Modified: stable/11/sys/contrib/dev/acpica/changes.txt
==============================================================================
--- stable/11/sys/contrib/dev/acpica/changes.txt	Thu Mar 30 20:14:43 2017	(r316302)
+++ stable/11/sys/contrib/dev/acpica/changes.txt	Thu Mar 30 20:18:34 2017	(r316303)
@@ -1,7 +1,553 @@
 ----------------------------------------
-27 May 2016. Summary of changes for version 20160527:
+03 March 2017. Summary of changes for version 20170303:
 
-This release is available at https://acpica.org/downloads
+
+0) ACPICA licensing:
+
+The licensing information at the start of each source code module has 
+been updated. In addition to the Intel license, the dual GPLv2/BSD 
+license has been added for completeness. Now, a single version of the 
+source code should be suitable for all ACPICA customers. This is the 
+major change for this release since it affects all source code modules.
+
+
+1) ACPICA kernel-resident subsystem: 
+
+Fixed two issues with the common asltypes.h header that could cause 
+problems in some environments: (Kim Jung-uk)
+    Removed typedef for YY_BUFFER_STATE ?
+       Fixes an error with earlier versions of Flex.
+    Removed use of FILE typedef (which is only defined in stdio.h)
+
+
+2) iASL Compiler/Disassembler and Tools: 
+
+Disassembler: fixed a regression introduced in 20170224. A fix for a 
+memory leak related to resource descriptor tags (names) could fault when 
+the disassembler was generated with 64-bit compilers.
+
+The ASLTS test suite has been updated to implement a new testing 
+architecture. During generation of the suite from ASL source, both the 
+ASL and ASL+ compilers are now validated, as well as the disassembler 
+itself (Erik Schmauss). The architecture executes as follows:
+
+    For every ASL source module:
+        Compile (legacy ASL compilation)
+        Disassemble the resulting AML to ASL+ source code
+        Compile the new ASL+ module
+        Perform a binary compare on the legacy AML and the new ASL+ AML
+    The ASLTS suite then executes normally using the AML binaries.
+
+----------------------------------------
+24 February 2017. Summary of changes for version 20170224:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Interpreter: Fixed two issues with the control method return value auto-
+repair feature, where an attempt to double-delete an internal object 
+could result in an ACPICA warning (for _CID repair and others). No fault 
+occurs, however, because the attempted deletion (actually a release to an 
+internal cache) is detected and ignored via object poisoning.
+
+Debugger: Fixed an AML interpreter mutex issue during the single stepping 
+of control methods. If certain debugger commands are executed during 
+stepping, a mutex aquire/release error could occur. Lv Zheng.
+
+Fixed some issues generating ACPICA with the Intel C compiler by 
+restoring the original behavior and compiler-specific include file in 
+acenv.h. Lv Zheng.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version: 141.7K Code, 58.5K Data, 200.2K Total
+    Debug Version:     207.5K Code, 82.7K Data, 290.2K Total
+  Previous Release:
+    Non-Debug Version: 137.4K Code, 52.6K Data, 190.0K Total
+    Debug Version:     201.5K Code, 82.2K Data, 283.7K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL/Disassembler: A preliminary version of a new ASL-to-ASL+ conversion 
+tool has been designed, implemented, and included in this release. The 
+key feature of this utility is that the original comments within the 
+input ASL file are preserved during the conversion process, and included 
+within the converted ASL+ file -- thus creating a transparent conversion 
+of existing ASL files to ASL+ (ASL 2.0). Erik Schmauss.
+
+    Usage: iasl -ca <ASL-filename>  // Output is a .dsl file with 
+converted code
+
+iASL/Disassembler: Improved the detection and correct disassembly of 
+Switch/Case operators. This feature detects sequences of if/elseif/else 
+operators that originated from ASL Switch/Case/Default operators and 
+emits the original operators. David Box.
+
+iASL: Improved the IORT ACPI table support in the following areas. Lv 
+Zheng:
+    Clear MappingOffset if the MappingCount is zero.
+    Fix the disassembly of the SMMU GSU interrupt offset.
+    Update the template file for the IORT table.
+
+Disassembler: Enhanced the detection and disassembly of resource 
+template/descriptor within a Buffer object. An EndTag descriptor is now 
+required to have a zero second byte, since all known ASL compilers emit 
+this. This helps eliminate incorrect decisions when a buffer is 
+disassembled (false positives on resource templates).
+
+----------------------------------------
+19 January 2017. Summary of changes for version 20170119:
+
+
+1) General ACPICA software:
+
+Entire source code base: Added the 2017 copyright to all source code 
+legal/licensing module headers and utility/tool signons. This includes 
+the standard Linux dual-license header. This affects virtually every file 
+in the ACPICA core subsystem, iASL compiler, all ACPICA utilities, and 
+the ACPICA test suite.
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL: Removed/fixed an inadvertent remark when a method argument 
+containing a reference is used as a target operand within the method (and 
+never used as a simple argument), as in the example below. Jeffrey Hugo.
+
+    dsdt.asl   1507:    Store(0x1, Arg0)
+    Remark   2146 -                ^ Method Argument is never used (Arg0)
+
+All tools: Removed the bit width of the compiler that generated the tool 
+from the common signon for all user space tools. This proved to be 
+confusing and unnecessary. This includes similar removal of HARDWARE_NAME 
+from the generic makefiles (Thomas Petazzoni). Example below.
+
+    Old:
+    ASL+ Optimizing Compiler version 20170119-32
+    ASL+ Optimizing Compiler version 20170119-64
+
+    New:
+    ASL+ Optimizing Compiler version 20170119
+
+----------------------------------------
+22 December 2016. Summary of changes for version 20161222:
+
+
+1) ACPICA kernel-resident subsystem:
+
+AML Debugger: Implemented a new mechanism to simplify and enhance 
+debugger integration into all environments, including kernel debuggers 
+and user-space utilities, as well as remote debug services. This 
+mechanism essentially consists of new OSL interfaces to support debugger 
+initialization/termination, as well as wait/notify interfaces to perform 
+the debugger handshake with the host. Lv Zheng.
+
+    New OSL interfaces:
+        AcpiOsInitializeDebugger (void)
+        AcpiOsTerminateDebugger (void)
+        AcpiOsWaitCommandReady (void)
+        AcpiOsNotifyCommandComplete (void)
+
+    New OS services layer:
+        osgendbg.c -- Example implementation, and used for AcpiExec
+
+Update for Generic Address Space (GAS) support: Although the AccessWidth 
+and/or BitOffset fields of the GAS are not often used, this change now 
+fully supports these fields. This affects the internal support for FADT 
+registers, registers in other ACPI data tables, and the AcpiRead and 
+AcpiWrite public interfaces. Lv Zheng.
+
+Sleep support: In order to simplify integration of ACPI sleep for the 
+various host operating systems, a new OSL interface has been introduced. 
+AcpiOsEnterSleep allows the host to perform any required operations 
+before the final write to the sleep control register(s) is performed by 
+ACPICA. Lv Zheng.
+
+    New OSL interface:
+        AcpiOsEnterSleep(SleepState, RegisterAValue, RegisterBValue)
+
+    Called from these internal interfaces:
+        AcpiHwLegacySleep
+        AcpiHwExtendedSleep
+
+EFI support: Added a very small EFI/ACPICA example application. Provides 
+a simple demo for EFI integration, as well as assisting with resolution 
+of issues related to customer ACPICA/EFI integration. Lv Zheng. See:
+
+    source/tools/efihello/efihello.c
+
+Local C library: Implemented several new functions to enhance ACPICA 
+portability, for environments where these clib functions are not 
+available (such as EFI). Lv Zheng:
+    putchar
+    getchar
+    strpbrk
+    strtok
+    memmove
+
+Fixed a regression where occasionally a valid resource descriptor was 
+incorrectly detected as invalid at runtime, and a 
+AE_AML_NO_RESOURCE_END_TAG was returned.
+
+Fixed a problem with the recently implemented support that enables 
+control method invocations as Target operands to many ASL operators. 
+Warnings of this form: "Needed type [Reference], found [Processor]" were 
+seen at runtime for some method invocations.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version: 141.5K Code, 58.5K Data, 200.0K Total
+    Debug Version:     201.7K Code, 82.7K Data, 284.4K Total
+  Previous Release:
+    Non-Debug Version: 140.5K Code, 58.5K Data, 198.9K Total
+    Debug Version:     201.3K Code, 82.7K Data, 284.0K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+Disassembler: Enhanced output by adding the capability to detect and 
+disassemble ASL Switch/Case statements back to the original ASL source 
+code instead of if/else blocks. David Box.
+
+AcpiHelp: Split a large file into separate files based upon 
+functionality/purpose. New files are:
+    ahaml.c
+    ahasl.c
+
+----------------------------------------
+17 November 2016. Summary of changes for version 20161117:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Table Manager: Fixed a regression introduced in 20160729, "FADT support 
+cleanup". This was an attempt to remove all references in the source to 
+the FADT version 2, which never was a legal version number. It was 
+skipped because it was an early version of 64-bit support that was 
+eventually abandoned for the current 64-bit support.
+
+Interpreter: Fixed a problem where runtime implicit conversion was 
+incorrectly disabled for the ASL operators below. This brings the 
+behavior into compliance with the ACPI specification:
+    FromBCD
+    ToBCD
+    ToDecimalString
+    ToHexString
+    ToInteger
+    ToBuffer
+
+Table Manager: Added a new public interface, AcpiPutTable, used to 
+release and free an ACPI table returned by AcpiGetTable and related 
+interfaces. Lv Zheng.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version: 140.5K Code, 58.5K Data, 198.9K Total
+    Debug Version:     201.3K Code, 82.7K Data, 284.0K Total
+  Previous Release:
+    Non-Debug Version: 140.4K Code, 58.1K Data, 198.5K Total
+    Debug Version:     200.7K Code, 82.1K Data, 282.8K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+Disassembler: Fixed a regression for disassembly of Resource Template. 
+Detection of templates in the AML stream missed some types of templates.
+
+iASL: Fixed a problem where an Access Size error was returned for the PCC 
+address space when the AccessSize of the GAS register is greater than a 
+DWORD. Hoan Tran.
+
+iASL: Implemented several grammar changes for the operators below. These 
+changes are slated for the next version of the ACPI specification:
+    RefOf        - Disallow method invocation as an operand
+    CondRefOf    - Disallow method invocation as an operand
+    DerefOf      - Disallow operands that use the result from operators 
+that
+                   do not return a reference (Changed TermArg to 
+SuperName).
+
+iASL: Control method invocations are now allowed for Target operands, as 
+per the ACPI specification. Removed error for using a control method 
+invocation as a Target operand.
+
+Disassembler: Improved detection of Resource Templates, Unicode, and 
+Strings within Buffer objects. These subtypes do not contain a specific 
+opcode to indicate the originating ASL code, and they must be detected by 
+other means within the disassembler. 
+
+iASL: Implemented an optimization improvement for 32-bit ACPI tables 
+(DSDT/SSDT). For the 32-bit case only, compute the optimum integer opcode 
+only after 64-bit to 32-bit truncation. A truncation warning message is 
+still emitted, however.
+
+AcpiXtract: Implemented handling for both types of line terminators (LF 
+or CR/LF) so that it can accept AcpiDump output files from any system. 
+Peter Wu.
+
+AcpiBin: Added two new options for comparing AML files:
+    -a: compare and display ALL mismatches
+    -o: start compare at this offset into the second file
+
+----------------------------------------
+30 September 2016. Summary of changes for version 20160930:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Fixed a regression in the internal AcpiTbFindTable function where a non 
+AE_OK exception could inadvertently be returned even if the function did 
+not fail. This problem affects the following operators:
+    DataTableRegion
+    LoadTable
+
+Fixed a regression in the LoadTable operator where a load to any 
+namespace location other than the root no longer worked properly.
+
+Increased the maximum loop count value that will result in the 
+AE_AML_INFINITE_LOOP exception. This is a mechanism that is intended to 
+prevent infinite loops within the AML interpreter and thus the host OS 
+kernel. The value is increased from 0xFFFF to 0xFFFFF loops (65,535 to 
+1,048,575).
+
+Moved the AcpiGbl_MaxLoopIterations configuration variable to the public 
+acpixf.h file. This allows hosts to easily configure the maximum loop 
+count at runtime.
+
+Removed an illegal character in the strtoul64.c file. This character 
+caused errors with some C compilers.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version: 140.4K Code, 58.1K Data, 198.5K Total
+    Debug Version:     200.7K Code, 82.1K Data, 282.8K Total
+  Previous Release:
+    Non-Debug Version: 140.0K Code, 58.1K Data, 198.1K Total
+    Debug Version:     200.3K Code, 82.1K Data, 282.4K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+Disassembler: Fixed a problem with the conversion of Else{If{ blocks into 
+the simpler ASL ElseIf keyword. During the conversion, a trailing If 
+block could be lost and missing from the disassembled output.
+
+iASL: Fixed a missing parser rule for the ObjectType operator. For ASL+, 
+the missing rule caused a parse error when using the Index operator as an 
+operand to ObjectType. This construct now compiles properly. Example:
+    ObjectType(PKG1[4]).
+
+iASL: Correctly handle unresolved symbols in the hardware map file (-lm 
+option). Previously, unresolved symbols could cause a protection fault. 
+Such symbols are now marked as unresolved in the map file.
+
+iASL: Implemented support to allow control method invocations as an 
+operand to the ASL DeRefOf operator. Example:
+    DeRefOf(MTH1(Local0))
+
+Disassembler: Improved support for the ToPLD ASL macro. Detection of a 
+possible _PLD buffer now includes examination of both the normal buffer 
+length (16 or 20) as well as the surrounding AML package length.
+
+Disassembler: Fixed a problem with the decoding of complex expressions 
+within the Divide operator for ASL+. For the case where both the quotient 
+and remainder targets are specified, the entire statement cannot be 
+disassembled. Previously, the output incorrectly contained a mix of ASL- 
+and ASL+ operators. This mixed statement causes a syntax error when 
+compiled. Example:
+    Divide (Add (INT1, 6), 128, RSLT, QUOT)  // was incorrectly 
+disassembled to:
+    Divide (INT1 + 6, 128, RSLT, QUOT)
+
+iASL/Tools: Added support to process AML and non-AML ACPI tables 
+consistently. For the disassembler and AcpiExec, allow all types of ACPI 
+tables (AML and data tables). For the iASL -e option, allow only AML 
+tables (DSDT/SSDT).
+
+----------------------------------------
+31 August 2016. Summary of changes for version 20160831:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Improve support for the so-called "module-level code", which is defined 
+to be math, logical and control AML opcodes that appear outside of any 
+control method. This change improves the support by adding more opcodes 
+that can be executed in the manner. Some other issues have been solved, 
+and the ASL grammar changes to support such code under all scope 
+operators (Device, etc.) are complete. Lv Zheng.
+
+UEFI support: these OSL functions have been implemented. This is an 
+additional step toward supporting the AcpiExec utility natively (with 
+full hardware access) under UEFI. Marcelo Ferreira.
+    AcpiOsReadPciConfiguration
+    AcpiOsWritePciConfiguration
+
+Fixed a possible mutex error during control method auto-serialization. Lv 
+Zheng. 
+
+Updated support for the Generic Address Structure by fully implementing 
+all GAS fields when a 32-bit address is expanded to a 64-bit GAS. Lv 
+Zheng.
+
+Updated the return value for the internal _OSI method. Instead of 
+0xFFFFFFFF, the "Ones" value is now returned, which is 0xFFFFFFFFFFFFFFFF 
+for 64-bit ACPI tables. This fixes an incompatibility with other ACPI 
+implementations, and will be reflected and clarified in the next version 
+of the ACPI specification.
+
+Implemented two new table events that can be passed to an ACPICA table 
+handler. These events are used to indicate a table installation or 
+uninstallation. These events are used in addition to existed table load 
+and unload events. Lv Zheng.
+
+Implemented a cleanup for all internal string-to-integer conversions. 
+Consolidate multiple versions of this functionality and limit possible 
+bases to either 10 or 16 to simplify the code. Adds a new file, 
+utstrtoul64.
+
+Cleanup the inclusion order of the various compiler-specific headers. 
+This simplifies build configuration management. The compiler-specific 
+headers are now split out from the host-specific headers. Lv Zheng.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version: 140.1K Code, 58.1K Data, 198.1K Total
+    Debug Version:     200.3K Code, 82.1K Data, 282.4K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL/AcpiExec: Added a command line option to display the build date/time 
+of the tool (-vd). This can be useful to verify that the correct version 
+of the tools are being used.
+
+AML Debugger: Implemented a new subcommand ("execute predef") to execute 
+all predefined control methods and names within the current namespace. 
+This can be useful for debugging problems with ACPI tables and the ACPI 
+namespace.
+
+----------------------------------------
+29 July 2016. Summary of changes for version 20160729:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Implemented basic UEFI support for the various ACPICA tools. This 
+includes:
+1) An OSL to implement the various AcpiOs* interfaces on UEFI.
+2) Support to obtain the ACPI tables on UEFI.
+3) Local implementation of required C library functions not available on 
+UEFI.
+4) A front-end (main) function for the tools for UEFI-related 
+initialization.
+
+The initial deployment of this support is the AcpiDump utility executing 
+as an UEFI application via EDK2 (EDKII, "UEFI Firmware Development Kit"). 
+Current environments supported are Linux/Unix. MSVC generation is not 
+supported at this time. See the generate/efi/README file for build 
+instructions. Lv Zheng.
+
+Future plans include porting the AcpiExec utility to execute natively on 
+the platform with I/O and memory access. This will allow viewing/dump of 
+the platform namespace and native execution of ACPI control methods that 
+access the actual hardware. To fully implement this support, the OSL 
+functions below must be implemented with UEFI interfaces. Any community 
+help in the implementation of these functions would be appreciated:
+    AcpiOsReadPort
+    AcpiOsWritePort
+    AcpiOsReadMemory
+    AcpiOsWriteMemory
+    AcpiOsReadPciConfiguration
+    AcpiOsWritePciConfiguration
+
+Restructured and standardized the C library configuration for ACPICA, 
+resulting in the various configuration options below. This includes a 
+global restructuring of the compiler-dependent and platform-dependent 
+include files. These changes may affect the existing platform-dependent 
+configuration files on some hosts. Lv Zheng. 
+
+The current C library configuration options appear below. For any issues, 
+it may be helpful to examine the existing compiler-dependent and 
+platform-dependent files as examples. Lv Zheng. 
+
+1) Linux kernel:
+    ACPI_USE_STANDARD_HEADERS=n in order not to use system-provided C 
+library.
+    ACPI_USE_SYSTEM_CLIBRARY=y in order not to use ACPICA mini C library.
+2) Unix/Windows/BSD applications:
+    ACPI_USE_STANDARD_HEADERS=y in order to use system-provided C 
+library.
+    ACPI_USE_SYSTEM_CLIBRARY=y in order not to use ACPICA mini C library.
+3) UEFI applications:
+    ACPI_USE_STANDARD_HEADERS=n in order not to use system-provided C 
+library.
+    ACPI_USE_SYSTEM_CLIBRARY=n in order to use ACPICA mini C library.
+4) UEFI applications (EDK2/StdLib):
+    ACPI_USE_STANDARD_HEADERS=y in order to use EDK2 StdLib C library.
+    ACPI_USE_SYSTEM_CLIBRARY=y in order to use EDK2 StdLib C library.
+
+
+AML interpreter: "module-level code" support. Allows for execution of so-
+called "executable" AML code (math/logical operations, etc.) outside of 
+control methods not just at the module level (top level) but also within 
+any scope declared outside of a control method - Scope{}, Device{}, 
+Processor{}, PowerResource{}, and ThermalZone{}. Lv Zheng. 
+
+Simplified the configuration of the "maximum AML loops" global option by 
+adding a global public variable, "AcpiGbl_MaxLoopIterations" which can be 
+modified at runtime.
+
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version: 139.1K Code, 22.9K Data, 162.0K Total
+    Debug Version:     199.0K Code, 81.8K Data, 280.8K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL: Add full support for the RASF ACPI table (RAS Features Table). 
+Includes disassembler, data table compiler, and header support.
+
+iASL Expand "module-level code" support. Allows for 
+compilation/disassembly of so-called "executable" AML code (math/logical 
+operations, etc.) outside of control methods not just at the module level 
+(top level) but also within any scope declared outside of a control 
+method - Scope{}, Device{}, Processor{}, PowerResource{}, and 
+ThermalZone{}.
+
+AcpiDump: Added support for dumping all SSDTs on newer versions of 
+Windows. These tables are now easily available -- SSDTs are not available 
+through the registry on older versions.
+
+----------------------------------------
+27 May 2016. Summary of changes for version 20160527:
 
 
 1) ACPICA kernel-resident subsystem:

Modified: stable/11/sys/contrib/dev/acpica/common/acfileio.c
==============================================================================
--- stable/11/sys/contrib/dev/acpica/common/acfileio.c	Thu Mar 30 20:14:43 2017	(r316302)
+++ stable/11/sys/contrib/dev/acpica/common/acfileio.c	Thu Mar 30 20:18:34 2017	(r316303)
@@ -4,10 +4,118 @@
  *
  *****************************************************************************/
 
-/*
- * Copyright (C) 2000 - 2016, Intel Corp.
+/******************************************************************************
+ *
+ * 1. Copyright Notice
+ *
+ * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp.
  * All rights reserved.
  *
+ * 2. License
+ *
+ * 2.1. This is your license from Intel Corp. under its intellectual property
+ * rights. You may have additional license terms from the party that provided
+ * you this software, covering your right to use that party's intellectual
+ * property rights.
+ *
+ * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
+ * copy of the source code appearing in this file ("Covered Code") an
+ * irrevocable, perpetual, worldwide license under Intel's copyrights in the
+ * base code distributed originally by Intel ("Original Intel Code") to copy,
+ * make derivatives, distribute, use and display any portion of the Covered
+ * Code in any form, with the right to sublicense such rights; and
+ *
+ * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
+ * license (with the right to sublicense), under only those claims of Intel
+ * patents that are infringed by the Original Intel Code, to make, use, sell,
+ * offer to sell, and import the Covered Code and derivative works thereof
+ * solely to the minimum extent necessary to exercise the above copyright
+ * license, and in no event shall the patent license extend to any additions
+ * to or modifications of the Original Intel Code. No other license or right
+ * is granted directly or by implication, estoppel or otherwise;
+ *
+ * The above copyright and patent license is granted only if the following
+ * conditions are met:
+ *
+ * 3. Conditions
+ *
+ * 3.1. Redistribution of Source with Rights to Further Distribute Source.
+ * Redistribution of source code of any substantial portion of the Covered
+ * Code or modification with rights to further distribute source must include
+ * the above Copyright Notice, the above License, this list of Conditions,
+ * and the following Disclaimer and Export Compliance provision. In addition,
+ * Licensee must cause all Covered Code to which Licensee contributes to
+ * contain a file documenting the changes Licensee made to create that Covered
+ * Code and the date of any change. Licensee must include in that file the
+ * documentation of any changes made by any predecessor Licensee. Licensee
+ * must include a prominent statement that the modification is derived,
+ * directly or indirectly, from Original Intel Code.
+ *
+ * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
+ * Redistribution of source code of any substantial portion of the Covered
+ * Code or modification without rights to further distribute source must
+ * include the following Disclaimer and Export Compliance provision in the
+ * documentation and/or other materials provided with distribution. In
+ * addition, Licensee may not authorize further sublicense of source of any
+ * portion of the Covered Code, and must include terms to the effect that the
+ * license from Licensee to its licensee is limited to the intellectual
+ * property embodied in the software Licensee provides to its licensee, and
+ * not to intellectual property embodied in modifications its licensee may
+ * make.
+ *
+ * 3.3. Redistribution of Executable. Redistribution in executable form of any
+ * substantial portion of the Covered Code or modification must reproduce the
+ * above Copyright Notice, and the following Disclaimer and Export Compliance
+ * provision in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3.4. Intel retains all right, title, and interest in and to the Original
+ * Intel Code.
+ *
+ * 3.5. Neither the name Intel nor any other trademark owned or controlled by
+ * Intel shall be used in advertising or otherwise to promote the sale, use or
+ * other dealings in products derived from or relating to the Covered Code
+ * without prior written authorization from Intel.
+ *
+ * 4. Disclaimer and Export Compliance
+ *
+ * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
+ * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
+ * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
+ * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
+ * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
+ * PARTICULAR PURPOSE.
+ *
+ * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
+ * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
+ * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
+ * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
+ * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
+ * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
+ * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
+ * LIMITED REMEDY.
+ *
+ * 4.3. Licensee shall not export, either directly or indirectly, any of this
+ * software or system incorporating such software without first obtaining any
+ * required license or other approval from the U. S. Department of Commerce or
+ * any other agency or department of the United States Government. In the
+ * event Licensee exports any such software from the United States or
+ * re-exports any such software from a foreign destination, Licensee shall
+ * ensure that the distribution and export/re-export of the software is in
+ * compliance with all laws, regulations, orders, or other restrictions of the
+ * U.S. Export Administration Regulations. Licensee agrees that neither it nor
+ * any of its subsidiaries will export/re-export any technical data, process,
+ * software, or service, directly or indirectly, to any country for which the
+ * United States government or any agency thereof requires an export license,
+ * other governmental approval, or letter of assurance, without first obtaining
+ * such license, approval or letter.
+ *
+ *****************************************************************************
+ *
+ * Alternatively, you may choose to be licensed under the terms of the
+ * following license:
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -23,30 +131,29 @@
  *    of any contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
  *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Alternatively, you may choose to be licensed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ *****************************************************************************/
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
-#include <contrib/dev/acpica/include/acapps.h>
 #include <contrib/dev/acpica/include/actables.h>
 #include <contrib/dev/acpica/include/acutils.h>
-#include <errno.h>
+#include <contrib/dev/acpica/include/acapps.h>
 
 #define _COMPONENT          ACPI_UTILITIES
         ACPI_MODULE_NAME    ("acfileio")
@@ -98,7 +205,7 @@ AcGetAllTablesFromFile (
     File = fopen (Filename, "rb");
     if (!File)
     {
-        perror ("Could not open input file");
+        fprintf (stderr, "Could not open input file: %s\n", Filename);
         if (errno == ENOENT)
         {
             return (AE_NOT_EXIST);
@@ -113,7 +220,7 @@ AcGetAllTablesFromFile (
     if (FileSize == ACPI_UINT32_MAX)
     {
         Status = AE_ERROR;
-        goto ErrorExit;
+        goto Exit;
     }
 
     fprintf (stderr,
@@ -125,7 +232,7 @@ AcGetAllTablesFromFile (
     if (FileSize < sizeof (ACPI_TABLE_HEADER))
     {
         Status = AE_BAD_HEADER;
-        goto ErrorExit;
+        goto Exit;
     }
 
     /* Check for an non-binary file */
@@ -135,7 +242,8 @@ AcGetAllTablesFromFile (
         fprintf (stderr,
             "    %s: File does not appear to contain a valid AML table\n",
             Filename);
-        return (AE_TYPE);
+        Status = AE_TYPE;
+        goto Exit;
     }
 
     /* Read all tables within the file */
@@ -154,23 +262,31 @@ AcGetAllTablesFromFile (
         }
         else if (Status == AE_TYPE)
         {
-            return (AE_OK);
+            Status = AE_OK;
+            goto Exit;
         }
         else if (ACPI_FAILURE (Status))
         {
-            goto ErrorExit;
+            goto Exit;
         }
 
         /* Print table header for iASL/disassembler only */
 
 #ifdef ACPI_ASL_COMPILER
 
-            AcpiTbPrintTableHeader (0, Table);
+        AcpiTbPrintTableHeader (0, Table);
 #endif
 
         /* Allocate and link a table descriptor */
 
         TableDesc = AcpiOsAllocate (sizeof (ACPI_NEW_TABLE_DESC));
+        if (!TableDesc)
+        {
+            AcpiOsFree (Table);
+            Status = AE_NO_MEMORY;
+            goto Exit;
+        }
+
         TableDesc->Table = Table;
         TableDesc->Next = NULL;
 
@@ -205,7 +321,7 @@ AcGetAllTablesFromFile (
         *ReturnListHead = ListHead;
     }
 
-ErrorExit:
+Exit:
     fclose(File);
     return (Status);
 }
@@ -265,10 +381,11 @@ AcGetOneTableFromFile (
 
     if (GetOnlyAmlTables)
     {
-        /* Table must be an AML table (DSDT/SSDT) or FADT */
-
-        if (!ACPI_COMPARE_NAME (TableHeader.Signature, ACPI_SIG_FADT) &&
-            !AcpiUtIsAmlTable (&TableHeader))
+        /*
+         * Table must be an AML table (DSDT/SSDT).
+         * Used for iASL -e option only.
+         */
+        if (!AcpiUtIsAmlTable (&TableHeader))
         {
             fprintf (stderr,
                 "    %s: Table [%4.4s] is not an AML table - ignoring\n",
@@ -280,7 +397,7 @@ AcGetOneTableFromFile (
 
     /* Allocate a buffer for the entire table */
 
-    Table = AcpiOsAllocate ((size_t) TableHeader.Length);
+    Table = AcpiOsAllocate ((ACPI_SIZE) TableHeader.Length);
     if (!Table)
     {
         return (AE_NO_MEMORY);
@@ -388,13 +505,13 @@ AcValidateTableHeader (
     long                    TableOffset)
 {
     ACPI_TABLE_HEADER       TableHeader;
-    size_t                  Actual;
+    ACPI_SIZE               Actual;
     long                    OriginalOffset;
     UINT32                  FileSize;
     UINT32                  i;
 
 
-    ACPI_FUNCTION_TRACE ("AcValidateTableHeader");
+    ACPI_FUNCTION_TRACE (AcValidateTableHeader);
 
 
     /* Read a potential table header */

Modified: stable/11/sys/contrib/dev/acpica/common/acgetline.c
==============================================================================
--- stable/11/sys/contrib/dev/acpica/common/acgetline.c	Thu Mar 30 20:14:43 2017	(r316302)
+++ stable/11/sys/contrib/dev/acpica/common/acgetline.c	Thu Mar 30 20:18:34 2017	(r316303)
@@ -4,10 +4,118 @@
  *
  *****************************************************************************/
 
-/*
- * Copyright (C) 2000 - 2016, Intel Corp.
+/******************************************************************************
+ *
+ * 1. Copyright Notice
+ *
+ * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp.
  * All rights reserved.
  *
+ * 2. License
+ *
+ * 2.1. This is your license from Intel Corp. under its intellectual property
+ * rights. You may have additional license terms from the party that provided
+ * you this software, covering your right to use that party's intellectual
+ * property rights.
+ *
+ * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
+ * copy of the source code appearing in this file ("Covered Code") an
+ * irrevocable, perpetual, worldwide license under Intel's copyrights in the
+ * base code distributed originally by Intel ("Original Intel Code") to copy,
+ * make derivatives, distribute, use and display any portion of the Covered
+ * Code in any form, with the right to sublicense such rights; and
+ *
+ * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
+ * license (with the right to sublicense), under only those claims of Intel
+ * patents that are infringed by the Original Intel Code, to make, use, sell,
+ * offer to sell, and import the Covered Code and derivative works thereof
+ * solely to the minimum extent necessary to exercise the above copyright
+ * license, and in no event shall the patent license extend to any additions
+ * to or modifications of the Original Intel Code. No other license or right
+ * is granted directly or by implication, estoppel or otherwise;
+ *
+ * The above copyright and patent license is granted only if the following
+ * conditions are met:
+ *
+ * 3. Conditions
+ *
+ * 3.1. Redistribution of Source with Rights to Further Distribute Source.
+ * Redistribution of source code of any substantial portion of the Covered
+ * Code or modification with rights to further distribute source must include
+ * the above Copyright Notice, the above License, this list of Conditions,
+ * and the following Disclaimer and Export Compliance provision. In addition,
+ * Licensee must cause all Covered Code to which Licensee contributes to
+ * contain a file documenting the changes Licensee made to create that Covered
+ * Code and the date of any change. Licensee must include in that file the
+ * documentation of any changes made by any predecessor Licensee. Licensee
+ * must include a prominent statement that the modification is derived,
+ * directly or indirectly, from Original Intel Code.
+ *
+ * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
+ * Redistribution of source code of any substantial portion of the Covered
+ * Code or modification without rights to further distribute source must
+ * include the following Disclaimer and Export Compliance provision in the
+ * documentation and/or other materials provided with distribution. In
+ * addition, Licensee may not authorize further sublicense of source of any
+ * portion of the Covered Code, and must include terms to the effect that the
+ * license from Licensee to its licensee is limited to the intellectual
+ * property embodied in the software Licensee provides to its licensee, and
+ * not to intellectual property embodied in modifications its licensee may
+ * make.
+ *
+ * 3.3. Redistribution of Executable. Redistribution in executable form of any
+ * substantial portion of the Covered Code or modification must reproduce the
+ * above Copyright Notice, and the following Disclaimer and Export Compliance
+ * provision in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3.4. Intel retains all right, title, and interest in and to the Original
+ * Intel Code.
+ *
+ * 3.5. Neither the name Intel nor any other trademark owned or controlled by
+ * Intel shall be used in advertising or otherwise to promote the sale, use or
+ * other dealings in products derived from or relating to the Covered Code
+ * without prior written authorization from Intel.

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***