Module Name: src
Committed By: yamt
Date: Thu May 22 15:40:38 UTC 2014
Modified Files:
src/external/bsd/acpica/bin/iasl [yamt-pagecache]: Makefile iasl.8
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/external/bsd/acpica/bin/iasl/Makefile
cvs rdiff -u -r1.2 -r1.2.4.1 src/external/bsd/acpica/bin/iasl/iasl.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/acpica/bin/iasl/Makefile
diff -u src/external/bsd/acpica/bin/iasl/Makefile:1.4.2.1 src/external/bsd/acpica/bin/iasl/Makefile:1.4.2.2
--- src/external/bsd/acpica/bin/iasl/Makefile:1.4.2.1 Tue Apr 17 00:02:59 2012
+++ src/external/bsd/acpica/bin/iasl/Makefile Thu May 22 15:40:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.2.1 2012/04/17 00:02:59 yamt Exp $
+# $NetBSD: Makefile,v 1.4.2.2 2014/05/22 15:40:38 yamt Exp $
.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
PROG= iasl
@@ -20,81 +20,235 @@ LDADD+= -ll -ly -lrt -lpthread
DPADD+= ${LIBL} ${LIBY} ${LIBRT} ${LIBPTHREAD}
DPSRCS= aslcompilerparse.c aslcompilerlex.c \
- dtparserparse.c dtparserlex.c
+ dtparserparse.c dtparserlex.c prparserparse.c prparserlex.c
.PATH: ${TOPDIR}
-SRCS+= aslcompilerparse.c aslcompilerlex.c adfile.c \
- aslanalyze.c aslbtypes.c aslcodegen.c aslcompile.c \
- aslerror.c aslfiles.c aslfold.c asllength.c \
- asllisting.c aslload.c asllookup.c aslmain.c aslmap.c \
- aslopcodes.c asloperands.c aslopt.c aslpredef.c \
- aslresource.c aslrestype1.c aslrestype1i.c \
- aslrestype2.c aslrestype2d.c aslrestype2e.c \
- aslrestype2q.c aslrestype2w.c aslstartup.c aslstubs.c \
- asltransform.c asltree.c aslutils.c asluuid.c \
- aslwalks.c dtcompile.c dtexpress.c dtfield.c dtio.c \
- dtparserparse.c dtparserlex.c \
- dtsubtable.c dttable.c dttemplate.c dtutils.c
+SRCS+= \
+ adfile.c \
+ aslanalyze.c \
+ aslbtypes.c \
+ aslcodegen.c \
+ aslcompile.c \
+ aslcompilerlex.c \
+ aslcompilerparse.c \
+ aslerror.c \
+ aslfileio.c \
+ aslfiles.c \
+ aslfold.c \
+ aslhex.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 \
+ asloptions.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 \
+ dtparserlex.c \
+ dtparserparse.c \
+ dtsubtable.c \
+ dttable.c \
+ dttemplate.c \
+ dtutils.c \
+ prexpress.c \
+ prmacros.c \
+ prparserlex.c \
+ prparserparse.c \
+ prscan.c \
+ prutils.c
.PATH: ${TOPDIR}/../common
-SRCS+= adisasm.c adwalk.c dmextern.c dmrestag.c dmtable.c \
- dmtbdump.c dmtbinfo.c getopt.c
+SRCS+= \
+ adisasm.c \
+ adwalk.c \
+ ahpredef.c \
+ dmextern.c \
+ dmrestag.c \
+ dmtable.c \
+ dmtbdump.c \
+ dmtbinfo.c \
+ getopt.c
.PATH: ${TOPDIR}/../debugger
SRCS+= dbfileio.c
.PATH: ${TOPDIR}/../disassembler
-SRCS+= dmbuffer.c dmnames.c dmobject.c dmopcode.c dmresrc.c \
- dmresrcl.c dmresrcs.c dmutils.c dmwalk.c
+SRCS+= \
+ dmbuffer.c \
+ dmdeferred.c \
+ dmnames.c \
+ dmobject.c \
+ dmopcode.c \
+ dmresrc.c \
+ dmresrcl.c \
+ dmresrcl2.c \
+ dmresrcs.c \
+ dmutils.c \
+ dmwalk.c
.PATH: ${TOPDIR}/../dispatcher
-SRCS+= dsargs.c dscontrol.c dsfield.c dsobject.c dsopcode.c \
- dsutils.c dswexec.c dswload.c dswload2.c dswscope.c \
+SRCS+= \
+ dsargs.c \
+ dscontrol.c \
+ dsfield.c \
+ dsobject.c \
+ dsopcode.c \
+ dsutils.c \
+ dswexec.c \
+ dswload.c \
+ dswload2.c \
+ dswscope.c \
dswstate.c
.PATH: ${TOPDIR}/../executer
-SRCS+= exconvrt.c excreate.c exdump.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 \
- exstore.c exstoren.c exstorob.c exsystem.c exutils.c
+SRCS+= \
+ exconvrt.c \
+ excreate.c \
+ exdump.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 \
+ exstore.c \
+ exstoren.c \
+ exstorob.c \
+ exsystem.c \
+ exutils.c
.PATH: ${TOPDIR}/../parser
-SRCS+= psargs.c psloop.c psopcode.c psparse.c psscope.c \
- pstree.c psutils.c pswalk.c
+SRCS+= \
+ psargs.c \
+ psloop.c \
+ psobject.c \
+ psopcode.c \
+ psopinfo.c \
+ psparse.c \
+ psscope.c \
+ pstree.c \
+ psutils.c \
+ pswalk.c
.PATH: ${TOPDIR}/../tables
-SRCS+= tbfadt.c tbinstal.c tbutils.c tbxface.c
+SRCS+= \
+ tbfadt.c \
+ tbinstal.c \
+ tbprint.c \
+ tbutils.c \
+ tbxface.c
.PATH: ${TOPDIR}/../namespace
-SRCS+= nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c \
- nsparse.c nssearch.c nsutils.c nswalk.c nsxfobj.c
+SRCS+= \
+ nsaccess.c \
+ nsalloc.c \
+ nsdump.c \
+ nsnames.c \
+ nsobject.c \
+ nsparse.c \
+ nssearch.c \
+ nsutils.c \
+ nswalk.c \
+ nsxfobj.c \
.PATH: ${TOPDIR}/../utilities
-SRCS+= utalloc.c utcache.c utcopy.c utdebug.c utdecode.c \
- utdelete.c utglobal.c utinit.c utlock.c utmath.c \
- utmisc.c utmutex.c utobject.c utosi.c utresrc.c \
- utstate.c utxface.c utxferror.c
+SRCS+= \
+ utaddress.c \
+ utalloc.c \
+ utbuffer.c \
+ utcache.c \
+ utcopy.c \
+ utdebug.c \
+ utdecode.c \
+ utdelete.c \
+ uterror.c \
+ utexcep.c \
+ utglobal.c \
+ utinit.c \
+ utlock.c \
+ utmath.c \
+ utmisc.c \
+ utmutex.c \
+ utobject.c \
+ utosi.c \
+ utownerid.c \
+ utpredef.c \
+ utresrc.c \
+ utstate.c \
+ utstring.c \
+ utxface.c \
+ utxferror.c
.PATH: ${TOPDIR}/../os_specific/service_layers
SRCS+= osunixxf.c
-aslcompilerparse.c: ${TOPDIR}/aslcompiler.y
+aslcompiler.y.h aslcompilerparse.c: ${TOPDIR}/aslcompiler.y
${YACC} -v -d -o${.TARGET} -pAslCompiler ${.ALLSRC}
mv -f ${.PREFIX}.h aslcompiler.y.h
aslcompilerlex.c: ${TOPDIR}/aslcompiler.l
${LEX} -i -PAslCompiler -o${.TARGET} ${.ALLSRC}
-dtparserparse.c: ${TOPDIR}/dtparser.y
+aslcompilerlex.o: aslcompiler.y.h
+
+dtparser.y.h dtparserparse.c: ${TOPDIR}/dtparser.y
${YACC} -v -d -o${.TARGET} -pDtParser ${.ALLSRC}
mv -f ${.PREFIX}.h dtparser.y.h
dtparserlex.c: ${TOPDIR}/dtparser.l
${LEX} -i -PDtParser -o${.TARGET} ${.ALLSRC}
+dtparserlex.o: dtparser.y.h
+
+prparser.y.h prparserparse.c: ${TOPDIR}/prparser.y
+ ${YACC} -v -d -o${.TARGET} -pPrParser ${.ALLSRC}
+ mv -f ${.PREFIX}.h prparser.y.h
+
+prparserlex.c: ${TOPDIR}/prparser.l
+ ${LEX} -i -PPrParser -o${.TARGET} ${.ALLSRC}
+
+prparserlex.o: prparser.y.h
+
CLEANFILES+= aslcompilerlex.c aslcompilerparse.c \
aslcompiler.y.h aslcompilerparse.output \
dtparserlex.c dtparserparse.c \
- dtparser.y.h dtparserparse.output
+ dtparser.y.h dtparserparse.output \
+ prparserlex.c prparserparse.c \
+ prparser.y.h prparserparse.output \
.include <bsd.prog.mk>
Index: src/external/bsd/acpica/bin/iasl/iasl.8
diff -u src/external/bsd/acpica/bin/iasl/iasl.8:1.2 src/external/bsd/acpica/bin/iasl/iasl.8:1.2.4.1
--- src/external/bsd/acpica/bin/iasl/iasl.8:1.2 Thu Feb 17 17:07:55 2011
+++ src/external/bsd/acpica/bin/iasl/iasl.8 Thu May 22 15:40:38 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: iasl.8,v 1.2 2011/02/17 17:07:55 wiz Exp $
+.\" $NetBSD: iasl.8,v 1.2.4.1 2014/05/22 15:40:38 yamt Exp $
.\"
.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -197,10 +197,10 @@ It first appeared in
.Sh AUTHORS
.An -nosplit
Among Intel engineers,
-.An Robert Moore Aq robert.mo...@intel.com
+.An Robert Moore Aq Mt robert.mo...@intel.com
was the chief architect behind
.Nm .
This manual page was written for
.Nx
by
-.An Jukka Ruohonen Aq jruoho...@iki.fi .
+.An Jukka Ruohonen Aq Mt jruoho...@iki.fi .
