Date: Thu, 19 Feb 2015 01:29:25 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278980 - in projects/ifnet: . cddl/contrib/opensolaris/lib/libdtrace/common etc lib/libc/rpc lib/libc/stdio sbin/camcontrol share/mk sys/amd64/amd64 sys/cam sys/cam/scsi sys/conf sys/c... Message-ID: <201502190129.t1J1TP4w030449@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Thu Feb 19 01:29:24 2015 New Revision: 278980 URL: https://svnweb.freebsd.org/changeset/base/278980 Log: Merge head r257698 through r278979. Added: projects/ifnet/sys/conf/config.mk - copied unchanged from r278979, head/sys/conf/config.mk projects/ifnet/sys/contrib/dev/acpica/compiler/aslprintf.c - copied unchanged from r278979, head/sys/contrib/dev/acpica/compiler/aslprintf.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslprune.c - copied unchanged from r278979, head/sys/contrib/dev/acpica/compiler/aslprune.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c - copied unchanged from r278979, head/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c Deleted: projects/ifnet/sys/dev/cxgb/sys/mbufq.h projects/ifnet/sys/dev/xen/netfront/mbufq.h Modified: projects/ifnet/Makefile.inc1 projects/ifnet/UPDATING projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c projects/ifnet/etc/network.subr projects/ifnet/lib/libc/rpc/clnt_dg.c projects/ifnet/lib/libc/rpc/rpc_soc.c projects/ifnet/lib/libc/stdio/xprintf_float.c projects/ifnet/sbin/camcontrol/camcontrol.c projects/ifnet/share/mk/bsd.dep.mk projects/ifnet/share/mk/bsd.libnames.mk projects/ifnet/sys/amd64/amd64/ptrace_machdep.c projects/ifnet/sys/cam/cam_ccb.h projects/ifnet/sys/cam/scsi/scsi_da.c projects/ifnet/sys/cam/scsi/scsi_enc_ses.c projects/ifnet/sys/conf/files projects/ifnet/sys/conf/kmod.mk projects/ifnet/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/ifnet/sys/contrib/dev/acpica/common/acgetline.c projects/ifnet/sys/contrib/dev/acpica/common/adfile.c projects/ifnet/sys/contrib/dev/acpica/common/adisasm.c projects/ifnet/sys/contrib/dev/acpica/common/adwalk.c projects/ifnet/sys/contrib/dev/acpica/common/ahids.c projects/ifnet/sys/contrib/dev/acpica/common/ahpredef.c projects/ifnet/sys/contrib/dev/acpica/common/ahuuids.c projects/ifnet/sys/contrib/dev/acpica/common/cmfsize.c projects/ifnet/sys/contrib/dev/acpica/common/dmextern.c projects/ifnet/sys/contrib/dev/acpica/common/dmrestag.c projects/ifnet/sys/contrib/dev/acpica/common/dmtable.c projects/ifnet/sys/contrib/dev/acpica/common/dmtbdump.c projects/ifnet/sys/contrib/dev/acpica/common/dmtbinfo.c projects/ifnet/sys/contrib/dev/acpica/common/getopt.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslascii.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslbtypes.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslcompile.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/ifnet/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/ifnet/sys/contrib/dev/acpica/compiler/asldefine.h projects/ifnet/sys/contrib/dev/acpica/compiler/aslerror.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslfileio.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslfiles.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslfold.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslglobal.h projects/ifnet/sys/contrib/dev/acpica/compiler/aslhex.c projects/ifnet/sys/contrib/dev/acpica/compiler/asllength.c projects/ifnet/sys/contrib/dev/acpica/compiler/asllisting.c projects/ifnet/sys/contrib/dev/acpica/compiler/asllistsup.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslload.c projects/ifnet/sys/contrib/dev/acpica/compiler/asllookup.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmain.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmap.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmapenter.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmapoutput.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmaputils.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmessages.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmessages.h projects/ifnet/sys/contrib/dev/acpica/compiler/aslmethod.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslnamesp.c projects/ifnet/sys/contrib/dev/acpica/compiler/asloffset.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslopcodes.c projects/ifnet/sys/contrib/dev/acpica/compiler/asloperands.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslopt.c projects/ifnet/sys/contrib/dev/acpica/compiler/asloptions.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslparser.y projects/ifnet/sys/contrib/dev/acpica/compiler/aslpredef.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslprepkg.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslresource.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype1.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype1i.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype2.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype2d.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype2e.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype2q.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype2s.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype2w.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrules.y projects/ifnet/sys/contrib/dev/acpica/compiler/aslstartup.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslstubs.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslsupport.l projects/ifnet/sys/contrib/dev/acpica/compiler/aslsupport.y projects/ifnet/sys/contrib/dev/acpica/compiler/asltokens.y projects/ifnet/sys/contrib/dev/acpica/compiler/asltransform.c projects/ifnet/sys/contrib/dev/acpica/compiler/asltree.c projects/ifnet/sys/contrib/dev/acpica/compiler/asltypes.h projects/ifnet/sys/contrib/dev/acpica/compiler/asltypes.y projects/ifnet/sys/contrib/dev/acpica/compiler/aslutils.c projects/ifnet/sys/contrib/dev/acpica/compiler/asluuid.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslwalks.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslxref.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtcompile.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/ifnet/sys/contrib/dev/acpica/compiler/dtexpress.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtfield.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtio.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtparser.l projects/ifnet/sys/contrib/dev/acpica/compiler/dtparser.y projects/ifnet/sys/contrib/dev/acpica/compiler/dtsubtable.c projects/ifnet/sys/contrib/dev/acpica/compiler/dttable.c projects/ifnet/sys/contrib/dev/acpica/compiler/dttemplate.c projects/ifnet/sys/contrib/dev/acpica/compiler/dttemplate.h projects/ifnet/sys/contrib/dev/acpica/compiler/dtutils.c projects/ifnet/sys/contrib/dev/acpica/compiler/preprocess.h projects/ifnet/sys/contrib/dev/acpica/compiler/prexpress.c projects/ifnet/sys/contrib/dev/acpica/compiler/prmacros.c projects/ifnet/sys/contrib/dev/acpica/compiler/prparser.l projects/ifnet/sys/contrib/dev/acpica/compiler/prparser.y projects/ifnet/sys/contrib/dev/acpica/compiler/prscan.c projects/ifnet/sys/contrib/dev/acpica/compiler/prutils.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbhistry.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbstats.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbtest.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmnames.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmobject.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmutils.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsargs.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsfield.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsinit.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsobject.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsutils.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dswexec.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dswload.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dswload2.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dswscope.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dswstate.c projects/ifnet/sys/contrib/dev/acpica/components/events/evevent.c projects/ifnet/sys/contrib/dev/acpica/components/events/evglock.c projects/ifnet/sys/contrib/dev/acpica/components/events/evgpe.c projects/ifnet/sys/contrib/dev/acpica/components/events/evgpeblk.c projects/ifnet/sys/contrib/dev/acpica/components/events/evgpeinit.c projects/ifnet/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/ifnet/sys/contrib/dev/acpica/components/events/evhandler.c projects/ifnet/sys/contrib/dev/acpica/components/events/evmisc.c projects/ifnet/sys/contrib/dev/acpica/components/events/evregion.c projects/ifnet/sys/contrib/dev/acpica/components/events/evrgnini.c projects/ifnet/sys/contrib/dev/acpica/components/events/evsci.c projects/ifnet/sys/contrib/dev/acpica/components/events/evxface.c projects/ifnet/sys/contrib/dev/acpica/components/events/evxfevnt.c projects/ifnet/sys/contrib/dev/acpica/components/events/evxfgpe.c projects/ifnet/sys/contrib/dev/acpica/components/events/evxfregn.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exconfig.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exconvrt.c projects/ifnet/sys/contrib/dev/acpica/components/executer/excreate.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exdebug.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exdump.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exfield.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exfldio.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exmisc.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exmutex.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exnames.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exoparg1.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exoparg2.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exoparg3.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exoparg6.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exprep.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exregion.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exresnte.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exresolv.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exresop.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exstore.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exstoren.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exstorob.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exsystem.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exutils.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwacpi.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwesleep.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwpci.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwregs.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwsleep.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwvalid.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsalloc.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsarguments.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsconvert.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nseval.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsinit.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsload.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsnames.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsobject.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsparse.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nspredef.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsprepkg.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsrepair.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsrepair2.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nssearch.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsutils.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nswalk.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsxfname.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsxfobj.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psargs.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psloop.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psobject.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psopcode.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psopinfo.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psparse.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psscope.c projects/ifnet/sys/contrib/dev/acpica/components/parser/pstree.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psutils.c projects/ifnet/sys/contrib/dev/acpica/components/parser/pswalk.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psxface.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsaddr.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rscalc.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rscreate.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsdump.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsinfo.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsio.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsirq.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rslist.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsmemory.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsmisc.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsserial.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsutils.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsxface.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbdata.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbfind.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbprint.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbutils.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbxface.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utaddress.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utalloc.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utbuffer.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utcache.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utcopy.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utdebug.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utdecode.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utdelete.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/uterror.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/uteval.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utexcep.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utfileio.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/uthex.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utids.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utinit.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utlock.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utmath.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utmutex.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utobject.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utosi.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utownerid.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utpredef.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utprint.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utresrc.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utstate.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utstring.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/uttrack.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utuuid.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utxface.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utxferror.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utxfinit.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utxfmutex.c projects/ifnet/sys/contrib/dev/acpica/include/acapps.h projects/ifnet/sys/contrib/dev/acpica/include/acbuffer.h projects/ifnet/sys/contrib/dev/acpica/include/accommon.h projects/ifnet/sys/contrib/dev/acpica/include/acconfig.h projects/ifnet/sys/contrib/dev/acpica/include/acdebug.h projects/ifnet/sys/contrib/dev/acpica/include/acdisasm.h projects/ifnet/sys/contrib/dev/acpica/include/acdispat.h projects/ifnet/sys/contrib/dev/acpica/include/acevents.h projects/ifnet/sys/contrib/dev/acpica/include/acexcep.h projects/ifnet/sys/contrib/dev/acpica/include/acglobal.h projects/ifnet/sys/contrib/dev/acpica/include/achware.h projects/ifnet/sys/contrib/dev/acpica/include/acinterp.h projects/ifnet/sys/contrib/dev/acpica/include/aclocal.h projects/ifnet/sys/contrib/dev/acpica/include/acmacros.h projects/ifnet/sys/contrib/dev/acpica/include/acnames.h projects/ifnet/sys/contrib/dev/acpica/include/acnamesp.h projects/ifnet/sys/contrib/dev/acpica/include/acobject.h projects/ifnet/sys/contrib/dev/acpica/include/acopcode.h projects/ifnet/sys/contrib/dev/acpica/include/acoutput.h projects/ifnet/sys/contrib/dev/acpica/include/acparser.h projects/ifnet/sys/contrib/dev/acpica/include/acpi.h projects/ifnet/sys/contrib/dev/acpica/include/acpiosxf.h projects/ifnet/sys/contrib/dev/acpica/include/acpixf.h projects/ifnet/sys/contrib/dev/acpica/include/acpredef.h projects/ifnet/sys/contrib/dev/acpica/include/acresrc.h projects/ifnet/sys/contrib/dev/acpica/include/acrestyp.h projects/ifnet/sys/contrib/dev/acpica/include/acstruct.h projects/ifnet/sys/contrib/dev/acpica/include/actables.h projects/ifnet/sys/contrib/dev/acpica/include/actbl.h projects/ifnet/sys/contrib/dev/acpica/include/actbl1.h projects/ifnet/sys/contrib/dev/acpica/include/actbl2.h projects/ifnet/sys/contrib/dev/acpica/include/actbl3.h projects/ifnet/sys/contrib/dev/acpica/include/actypes.h projects/ifnet/sys/contrib/dev/acpica/include/acutils.h projects/ifnet/sys/contrib/dev/acpica/include/amlcode.h projects/ifnet/sys/contrib/dev/acpica/include/amlresrc.h projects/ifnet/sys/contrib/dev/acpica/include/platform/acenv.h projects/ifnet/sys/contrib/dev/acpica/include/platform/acenvex.h projects/ifnet/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/ifnet/sys/contrib/dev/acpica/include/platform/acgcc.h projects/ifnet/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c projects/ifnet/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c projects/ifnet/sys/dev/cardbus/cardbus.c projects/ifnet/sys/dev/cxgb/cxgb_adapter.h projects/ifnet/sys/dev/cxgb/cxgb_sge.c projects/ifnet/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/ifnet/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h projects/ifnet/sys/dev/mpr/mpr_sas.c projects/ifnet/sys/dev/mps/mps_sas.c projects/ifnet/sys/dev/pccbb/pccbb.c projects/ifnet/sys/dev/random/fortuna.c projects/ifnet/sys/dev/random/yarrow.c projects/ifnet/sys/dev/sfxge/common/efx_ev.c projects/ifnet/sys/dev/sfxge/common/efx_mcdi.h projects/ifnet/sys/dev/sfxge/common/efx_regs_mcdi.h projects/ifnet/sys/dev/sfxge/common/siena_nic.c projects/ifnet/sys/dev/sfxge/common/siena_nvram.c projects/ifnet/sys/dev/sfxge/common/siena_phy.c projects/ifnet/sys/dev/sfxge/sfxge.h projects/ifnet/sys/dev/sfxge/sfxge_ev.c projects/ifnet/sys/dev/sfxge/sfxge_rx.c projects/ifnet/sys/dev/sfxge/sfxge_tx.c projects/ifnet/sys/dev/sfxge/sfxge_tx.h projects/ifnet/sys/dev/spibus/spi.h projects/ifnet/sys/dev/spibus/spibus.c projects/ifnet/sys/dev/spibus/spibusvar.h projects/ifnet/sys/dev/xen/netfront/netfront.c projects/ifnet/sys/i386/i386/ptrace_machdep.c projects/ifnet/sys/kern/kern_descrip.c projects/ifnet/sys/kern/sysv_shm.c projects/ifnet/sys/modules/Makefile projects/ifnet/sys/modules/dpt/Makefile projects/ifnet/sys/modules/ed/Makefile projects/ifnet/sys/modules/ep/Makefile projects/ifnet/sys/modules/if_gif/Makefile projects/ifnet/sys/modules/if_gre/Makefile projects/ifnet/sys/modules/si/Makefile projects/ifnet/sys/modules/vx/Makefile projects/ifnet/sys/netinet/igmp.c projects/ifnet/sys/netinet6/mld6.c projects/ifnet/sys/powerpc/powermac/atibl.c projects/ifnet/sys/powerpc/powermac/nvbl.c projects/ifnet/sys/sys/mbuf.h projects/ifnet/sys/sys/param.h projects/ifnet/sys/x86/acpica/acpi_wakeup.c projects/ifnet/usr.sbin/acpi/acpidb/Makefile projects/ifnet/usr.sbin/acpi/acpidb/acpidb.c projects/ifnet/usr.sbin/acpi/iasl/Makefile Directory Properties: projects/ifnet/ (props changed) projects/ifnet/cddl/ (props changed) projects/ifnet/cddl/contrib/opensolaris/ (props changed) projects/ifnet/etc/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/share/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/sys/contrib/dev/acpica/ (props changed) projects/ifnet/sys/contrib/dev/acpica/common/ (props changed) projects/ifnet/sys/contrib/dev/acpica/compiler/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/events/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/executer/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/parser/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/resources/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/tables/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/ifnet/sys/contrib/dev/acpica/include/ (props changed) projects/ifnet/sys/contrib/dev/acpica/os_specific/ (props changed) Modified: projects/ifnet/Makefile.inc1 ============================================================================== --- projects/ifnet/Makefile.inc1 Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/Makefile.inc1 Thu Feb 19 01:29:24 2015 (r278980) @@ -343,16 +343,15 @@ WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="$ SIZE="${XSIZE}" .if ${XCC:M/*} -XFLAGS= --sysroot=${WORLDTMP} .if defined(CROSS_BINUTILS_PREFIX) # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a # directory, but the compiler will look in the right place for it's # tools so we don't need to tell it where to look. .if exists(${CROSS_BINUTILS_PREFIX}) -XFLAGS+= -B${CROSS_BINUTILS_PREFIX} +BFLAGS+= -B${CROSS_BINUTILS_PREFIX} .endif .else -XFLAGS+= -B${WORLDTMP}/usr/bin +BFLAGS+= -B${WORLDTMP}/usr/bin .endif .if ${TARGET} == "arm" .if ${TARGET_ARCH:M*hf*} != "" @@ -369,6 +368,8 @@ DEPFLAGS+= -I${WORLDTMP}/usr/include/c++ TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XCFLAGS+= -target ${TARGET_TRIPLE} +XCFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} +XCXXFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} .endif .endif @@ -1246,11 +1247,6 @@ _m4= lib/libohash \ usr.bin/m4 .endif -.if ${BOOTSTRAPPING} < 1000013 -_yacc= lib/liby \ - usr.bin/yacc -.endif - .if ${BOOTSTRAPPING} < 1000014 _crunch= usr.sbin/crunch .endif @@ -1272,6 +1268,11 @@ _lex= usr.bin/lex _awk= usr.bin/awk .endif +.if ${BOOTSTRAPPING} < 1001506 +_yacc= lib/liby \ + usr.bin/yacc +.endif + .if ${MK_BSNMP} != "no" _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif Modified: projects/ifnet/UPDATING ============================================================================== --- projects/ifnet/UPDATING Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/UPDATING Thu Feb 19 01:29:24 2015 (r278980) @@ -33,8 +33,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 20150217: If you are running a -CURRENT kernel since r273872 (Oct 30th, 2014), - but before r278927, the RNG was not seeded properly. Immediately - upgrade the kernel to r278927 or later and regenerate any keys (e.g. + but before r278950, the RNG was not seeded properly. Immediately + upgrade the kernel to r278950 or later and regenerate any keys (e.g. ssh keys or openssl keys) that were generated w/ a kernel from that range. This does not effect programs that directly used /dev/random or /dev/urandom. All userland uses of arc4random(3) are effected. Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Thu Feb 19 01:29:24 2015 (r278980) @@ -36,7 +36,6 @@ #include <string.h> #include <errno.h> #include <libelf.h> -#include <gelf.h> /* * In Solaris 10 GA, the only mechanism for communicating helper information @@ -62,9 +61,7 @@ static const char *olddevname = "/device static const char *modname; /* Name of this load object */ static int gen; /* DOF helper generation */ -#ifdef illumos extern dof_hdr_t __SUNW_dof; /* DOF defined in the .SUNW_dof section */ -#endif static boolean_t dof_init_debug = B_FALSE; /* From DTRACE_DOF_INIT_DEBUG */ static void @@ -99,11 +96,7 @@ static void dtrace_dof_init(void) __attr static void dtrace_dof_init(void) { -#ifdef illumos dof_hdr_t *dof = &__SUNW_dof; -#else - dof_hdr_t *dof = NULL; -#endif #ifdef _LP64 Elf64_Ehdr *elf; #else @@ -118,17 +111,6 @@ dtrace_dof_init(void) #endif int fd; const char *p; -#ifndef illumos - Elf *e; - Elf_Scn *scn = NULL; - Elf_Data *dofdata = NULL; - dof_hdr_t *dof_next = NULL; - GElf_Shdr shdr; - int efd; - char *s; - size_t shstridx; - uint64_t aligned_filesz; -#endif if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL) return; @@ -152,42 +134,6 @@ dtrace_dof_init(void) modname = lmp->l_name; else modname++; -#ifndef illumos - elf_version(EV_CURRENT); - if ((efd = open(lmp->l_name, O_RDONLY, 0)) < 0) { - dprintf(1, "couldn't open file for reading\n"); - return; - } - if ((e = elf_begin(efd, ELF_C_READ, NULL)) == NULL) { - dprintf(1, "elf_begin failed\n"); - close(efd); - return; - } - elf_getshdrstrndx(e, &shstridx); - dof = NULL; - while ((scn = elf_nextscn(e, scn)) != NULL) { - gelf_getshdr(scn, &shdr); - if (shdr.sh_type == SHT_SUNW_dof) { - s = elf_strptr(e, shstridx, shdr.sh_name); - if (s != NULL && strcmp(s, ".SUNW_dof") == 0) { - dofdata = elf_getdata(scn, NULL); - dof = dofdata->d_buf; - break; - } - } - } - if (dof == NULL) { - dprintf(1, "SUNW_dof section not found\n"); - elf_end(e); - close(efd); - return; - } - - while ((char *) dof < (char *) dofdata->d_buf + dofdata->d_size) { - aligned_filesz = (shdr.sh_addralign == 0 ? dof->dofh_filesz : - roundup2(dof->dofh_filesz, shdr.sh_addralign)); - dof_next = (void *) ((char *) dof + aligned_filesz); -#endif if (dof->dofh_ident[DOF_ID_MAG0] != DOF_MAG_MAG0 || dof->dofh_ident[DOF_ID_MAG1] != DOF_MAG_MAG1 || @@ -237,21 +183,12 @@ dtrace_dof_init(void) dprintf(1, "DTrace ioctl failed for DOF at %p", dof); else { dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof); -#ifndef illumos +#ifdef __FreeBSD__ gen = dh.gen; #endif } (void) close(fd); - -#ifndef illumos - /* End of while loop */ - dof = dof_next; - } - - elf_end(e); - (void) close(efd); -#endif } #ifdef illumos Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Thu Feb 19 01:29:24 2015 (r278980) @@ -275,6 +275,9 @@ struct dtrace_hdl { int dt_cpp_argc; /* count of initialized cpp(1) arguments */ int dt_cpp_args; /* size of dt_cpp_argv[] array */ char *dt_ld_path; /* pathname of ld(1) to invoke if needed */ +#ifdef __FreeBSD__ + char *dt_objcopy_path; /* pathname of objcopy(1) to invoke if needed */ +#endif dt_list_t dt_lib_path; /* linked-list forming library search path */ uint_t dt_lazyload; /* boolean: set via -xlazyload */ uint_t dt_droptags; /* boolean: set via -xdroptags */ Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Feb 19 01:29:24 2015 (r278980) @@ -281,7 +281,11 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_ sym->st_value = 0; sym->st_size = dof->dofh_filesz; sym->st_info = ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT); +#ifdef illumos sym->st_other = 0; +#else + sym->st_other = ELF32_ST_VISIBILITY(STV_HIDDEN); +#endif sym->st_shndx = ESHDR_DOF; sym++; @@ -471,7 +475,11 @@ prepare_elf64(dtrace_hdl_t *dtp, const d sym->st_value = 0; sym->st_size = dof->dofh_filesz; sym->st_info = GELF_ST_INFO(STB_GLOBAL, STT_OBJECT); +#ifdef illumos sym->st_other = 0; +#else + sym->st_other = ELF64_ST_VISIBILITY(STV_HIDDEN); +#endif sym->st_shndx = ESHDR_DOF; sym++; @@ -711,11 +719,7 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_ shp = &elf_file.shdr[ESHDR_DOF]; shp->sh_name = 11; /* DTRACE_SHSTRTAB64[11] = ".SUNW_dof" */ -#ifdef illumos shp->sh_flags = SHF_ALLOC; -#else - shp->sh_flags = SHF_WRITE | SHF_ALLOC; -#endif shp->sh_type = SHT_SUNW_dof; shp->sh_offset = off; shp->sh_size = dof->dofh_filesz; @@ -1874,7 +1878,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d #endif (void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o", - use_32 ? "32":""); + use_32 ? "32" : ""); len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile, drti) + 1; @@ -1885,26 +1889,61 @@ dtrace_program_link(dtrace_hdl_t *dtp, d drti); #endif if ((status = system(cmd)) == -1) { - ret = dt_link_error(dtp, NULL, -1, NULL, + ret = dt_link_error(dtp, NULL, fd, NULL, "failed to run %s: %s", dtp->dt_ld_path, strerror(errno)); goto done; } if (WIFSIGNALED(status)) { - ret = dt_link_error(dtp, NULL, -1, NULL, + ret = dt_link_error(dtp, NULL, fd, NULL, "failed to link %s: %s failed due to signal %d", file, dtp->dt_ld_path, WTERMSIG(status)); goto done; } if (WEXITSTATUS(status) != 0) { - ret = dt_link_error(dtp, NULL, -1, NULL, + ret = dt_link_error(dtp, NULL, fd, NULL, "failed to link %s: %s exited with status %d\n", file, dtp->dt_ld_path, WEXITSTATUS(status)); goto done; } (void) close(fd); /* release temporary file */ + +#ifdef __FreeBSD__ + /* + * Now that we've linked drti.o, reduce the global __SUNW_dof + * symbol to a local symbol. This is needed to so that multiple + * generated object files (for different providers, for + * instance) can be linked together. This is accomplished using + * the -Blocal flag with Sun's linker, but GNU ld doesn't appear + * to have an equivalent option. + */ + asprintf(&cmd, "%s --localize-hidden %s", dtp->dt_objcopy_path, + file); + if ((status = system(cmd)) == -1) { + ret = dt_link_error(dtp, NULL, -1, NULL, + "failed to run %s: %s", dtp->dt_objcopy_path, + strerror(errno)); + free(cmd); + goto done; + } + free(cmd); + + if (WIFSIGNALED(status)) { + ret = dt_link_error(dtp, NULL, -1, NULL, + "failed to link %s: %s failed due to signal %d", + file, dtp->dt_objcopy_path, WTERMSIG(status)); + goto done; + } + + if (WEXITSTATUS(status) != 0) { + ret = dt_link_error(dtp, NULL, -1, NULL, + "failed to link %s: %s exited with status %d\n", + file, dtp->dt_objcopy_path, WEXITSTATUS(status)); + goto done; + } +#endif } else { (void) close(fd); } Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Thu Feb 19 01:29:24 2015 (r278980) @@ -785,6 +785,7 @@ const char *_dtrace_defld = "/usr/ccs/bi #else const char *_dtrace_defcpp = "cpp"; /* default cpp(1) to invoke */ const char *_dtrace_defld = "ld"; /* default ld(1) to invoke */ +const char *_dtrace_defobjcopy = "objcopy"; /* default objcopy(1) to invoke */ #endif const char *_dtrace_libdir = "/usr/lib/dtrace"; /* default library directory */ @@ -1185,6 +1186,9 @@ alloc: dtp->dt_cpp_argc = 1; dtp->dt_cpp_args = 1; dtp->dt_ld_path = strdup(_dtrace_defld); +#ifdef __FreeBSD__ + dtp->dt_objcopy_path = strdup(_dtrace_defobjcopy); +#endif dtp->dt_provmod = provmod; dtp->dt_vector = vector; dtp->dt_varg = arg; @@ -1193,6 +1197,9 @@ alloc: if (dtp->dt_mods == NULL || dtp->dt_provs == NULL || dtp->dt_procs == NULL || dtp->dt_ld_path == NULL || +#ifdef __FreeBSD__ + dtp->dt_objcopy_path == NULL || +#endif dtp->dt_cpp_path == NULL || dtp->dt_cpp_argv == NULL) return (set_open_errno(dtp, errp, EDT_NOMEM)); @@ -1673,6 +1680,9 @@ dtrace_close(dtrace_hdl_t *dtp) free(dtp->dt_cpp_argv); free(dtp->dt_cpp_path); free(dtp->dt_ld_path); +#ifdef __FreeBSD__ + free(dtp->dt_objcopy_path); +#endif free(dtp->dt_mods); free(dtp->dt_provs); Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c Thu Feb 19 01:29:24 2015 (r278980) @@ -280,6 +280,28 @@ dt_opt_ld_path(dtrace_hdl_t *dtp, const return (0); } +#ifdef __FreeBSD__ +static int +dt_opt_objcopy_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option) +{ + char *objcopy; + + if (arg == NULL) + return (dt_set_errno(dtp, EDT_BADOPTVAL)); + + if (dtp->dt_pcb != NULL) + return (dt_set_errno(dtp, EDT_BADOPTCTX)); + + if ((objcopy = strdup(arg)) == NULL) + return (dt_set_errno(dtp, EDT_NOMEM)); + + free(dtp->dt_objcopy_path); + dtp->dt_objcopy_path = objcopy; + + return (0); +} +#endif + /*ARGSUSED*/ static int dt_opt_libdir(dtrace_hdl_t *dtp, const char *arg, uintptr_t option) @@ -960,6 +982,9 @@ static const dt_option_t _dtrace_ctoptio { "linkmode", dt_opt_linkmode }, { "linktype", dt_opt_linktype }, { "nolibs", dt_opt_cflags, DTRACE_C_NOLIBS }, +#ifdef __FreeBSD__ + { "objcopypath", dt_opt_objcopy_path }, +#endif { "pgmax", dt_opt_pgmax }, { "pspec", dt_opt_cflags, DTRACE_C_PSPEC }, { "setenv", dt_opt_setenv, 1 }, Modified: projects/ifnet/etc/network.subr ============================================================================== --- projects/ifnet/etc/network.subr Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/etc/network.subr Thu Feb 19 01:29:24 2015 (r278980) @@ -754,7 +754,7 @@ ipv6_down() IFS="$_ifs" for _inet6 in $inetList ; do # get rid of extraneous line - case $_inet in + case $_inet6 in inet6\ *) ;; *) continue ;; esac Modified: projects/ifnet/lib/libc/rpc/clnt_dg.c ============================================================================== --- projects/ifnet/lib/libc/rpc/clnt_dg.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/lib/libc/rpc/clnt_dg.c Thu Feb 19 01:29:24 2015 (r278980) @@ -327,7 +327,7 @@ clnt_dg_call(cl, proc, xargs, argsp, xre struct sockaddr *sa; sigset_t mask; sigset_t newmask; - socklen_t inlen, salen; + socklen_t salen; ssize_t recvlen = 0; int kin_len, n, rpc_lock_value; u_int32_t xid; @@ -520,7 +520,6 @@ get_reply: goto call_again_same_xid; } } - inlen = (socklen_t)recvlen; /* * now decode and validate the response Modified: projects/ifnet/lib/libc/rpc/rpc_soc.c ============================================================================== --- projects/ifnet/lib/libc/rpc/rpc_soc.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/lib/libc/rpc/rpc_soc.c Thu Feb 19 01:29:24 2015 (r278980) @@ -462,12 +462,10 @@ clntunix_create(raddr, prog, vers, sockp u_int recvsz; { struct netbuf *svcaddr; - struct netconfig *nconf; CLIENT *cl; int len; cl = NULL; - nconf = NULL; svcaddr = NULL; if ((raddr->sun_len == 0) || ((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) || Modified: projects/ifnet/lib/libc/stdio/xprintf_float.c ============================================================================== --- projects/ifnet/lib/libc/stdio/xprintf_float.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/lib/libc/stdio/xprintf_float.c Thu Feb 19 01:29:24 2015 (r278980) @@ -168,7 +168,6 @@ __printf_render_float(struct __printf_io int realsz; /* field size expanded by dprec, sign, etc */ int dprec; /* a copy of prec if [diouxX], 0 otherwise */ char ox[2]; /* space for 0x; ox[1] is either x, X, or \0 */ - int prsize; /* max size of printed field */ int ret; /* return value accumulator */ char *decimal_point; /* locale specific decimal point */ int n2; /* XXX: for PRINTANDPAD */ @@ -344,8 +343,6 @@ here: if (ox[1]) realsz += 2; - prsize = pi->width > realsz ? pi->width : realsz; - /* right-adjusting blank padding */ if (pi->pad != '0' && pi->left == 0) ret += __printf_pad(io, pi->width - realsz, 0); Modified: projects/ifnet/sbin/camcontrol/camcontrol.c ============================================================================== --- projects/ifnet/sbin/camcontrol/camcontrol.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sbin/camcontrol/camcontrol.c Thu Feb 19 01:29:24 2015 (r278980) @@ -7404,7 +7404,7 @@ getdevid(struct cam_devitem *item) retry: ccb->ccb_h.func_code = XPT_DEV_ADVINFO; ccb->ccb_h.flags = CAM_DIR_IN; - ccb->cdai.flags = 0; + ccb->cdai.flags = CDAI_FLAG_NONE; ccb->cdai.buftype = CDAI_TYPE_SCSI_DEVID; ccb->cdai.bufsiz = item->device_id_len; if (item->device_id_len != 0) Modified: projects/ifnet/share/mk/bsd.dep.mk ============================================================================== --- projects/ifnet/share/mk/bsd.dep.mk Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/share/mk/bsd.dep.mk Thu Feb 19 01:29:24 2015 (r278980) @@ -121,10 +121,7 @@ ${_YC:R}.o: ${_YC} .endfor # DTrace probe definitions -# libelf is currently needed for drti.o .if ${SRCS:M*.d} -LDADD+= -lelf -DPADD+= ${LIBELF} CFLAGS+= -I${.OBJDIR} .endif .for _DSRC in ${SRCS:M*.d:N*/*} Modified: projects/ifnet/share/mk/bsd.libnames.mk ============================================================================== --- projects/ifnet/share/mk/bsd.libnames.mk Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/share/mk/bsd.libnames.mk Thu Feb 19 01:29:24 2015 (r278980) @@ -131,6 +131,7 @@ LIBVMMAPI?= ${DESTDIR}${LIBDIR}/libvmmap LIBWIND?= ${DESTDIR}${LIBDIR}/libwind.a LIBWRAP?= ${DESTDIR}${LIBDIR}/libwrap.a LIBXPG4?= ${DESTDIR}${LIBDIR}/libxpg4.a +LIBXO?= ${DESTDIR}${LIBDIR}/libxo.a LIBY?= ${DESTDIR}${LIBDIR}/liby.a LIBYPCLNT?= ${DESTDIR}${LIBDIR}/libypclnt.a LIBZ?= ${DESTDIR}${LIBDIR}/libz.a Modified: projects/ifnet/sys/amd64/amd64/ptrace_machdep.c ============================================================================== --- projects/ifnet/sys/amd64/amd64/ptrace_machdep.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/amd64/amd64/ptrace_machdep.c Thu Feb 19 01:29:24 2015 (r278980) @@ -88,7 +88,8 @@ cpu_ptrace_xstate(struct thread *td, int break; case PT_SETXSTATE: - if (data > cpu_max_ext_state_size) { + if (data < sizeof(struct savefpu) || + data > cpu_max_ext_state_size) { error = EINVAL; break; } Modified: projects/ifnet/sys/cam/cam_ccb.h ============================================================================== --- projects/ifnet/sys/cam/cam_ccb.h Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/cam/cam_ccb.h Thu Feb 19 01:29:24 2015 (r278980) @@ -1140,6 +1140,7 @@ struct ccb_eng_exec { /* This structure struct ccb_dev_advinfo { struct ccb_hdr ccb_h; uint32_t flags; +#define CDAI_FLAG_NONE 0x0 /* No flags set */ #define CDAI_FLAG_STORE 0x1 /* If set, action becomes store */ uint32_t buftype; /* IN: Type of data being requested */ /* NB: buftype is interpreted on a per-transport basis */ Modified: projects/ifnet/sys/cam/scsi/scsi_da.c ============================================================================== --- projects/ifnet/sys/cam/scsi/scsi_da.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/cam/scsi/scsi_da.c Thu Feb 19 01:29:24 2015 (r278980) @@ -3787,7 +3787,7 @@ dasetgeom(struct cam_periph *periph, uin xpt_setup_ccb(&cdai.ccb_h, periph->path, CAM_PRIORITY_NORMAL); cdai.ccb_h.func_code = XPT_DEV_ADVINFO; cdai.buftype = CDAI_TYPE_RCAPLONG; - cdai.flags |= CDAI_FLAG_STORE; + cdai.flags = CDAI_FLAG_STORE; cdai.bufsiz = rcap_len; cdai.buf = (uint8_t *)rcaplong; xpt_action((union ccb *)&cdai); Modified: projects/ifnet/sys/cam/scsi/scsi_enc_ses.c ============================================================================== --- projects/ifnet/sys/cam/scsi/scsi_enc_ses.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/cam/scsi/scsi_enc_ses.c Thu Feb 19 01:29:24 2015 (r278980) @@ -1007,7 +1007,7 @@ ses_setphyspath_callback(enc_softc_t *en xpt_setup_ccb(&cdai.ccb_h, path, CAM_PRIORITY_NORMAL); cdai.ccb_h.func_code = XPT_DEV_ADVINFO; cdai.buftype = CDAI_TYPE_PHYS_PATH; - cdai.flags = 0; + cdai.flags = CDAI_FLAG_NONE; cdai.bufsiz = MAXPATHLEN; cdai.buf = old_physpath; xpt_action((union ccb *)&cdai); @@ -1019,7 +1019,7 @@ ses_setphyspath_callback(enc_softc_t *en xpt_setup_ccb(&cdai.ccb_h, path, CAM_PRIORITY_NORMAL); cdai.ccb_h.func_code = XPT_DEV_ADVINFO; cdai.buftype = CDAI_TYPE_PHYS_PATH; - cdai.flags |= CDAI_FLAG_STORE; + cdai.flags = CDAI_FLAG_STORE; cdai.bufsiz = sbuf_len(args->physpath); cdai.buf = sbuf_data(args->physpath); xpt_action((union ccb *)&cdai); Copied: projects/ifnet/sys/conf/config.mk (from r278979, head/sys/conf/config.mk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/conf/config.mk Thu Feb 19 01:29:24 2015 (r278980, copy of r278979, head/sys/conf/config.mk) @@ -0,0 +1,54 @@ +# $FreeBSD$ +# +# Common code to marry kernel config(8) goo and module building goo. +# + +# Generate options files that otherwise would be built +# in substantially similar ways through the tree. Move +# the code here when they all produce identical results +# (or should) +.if !defined(KERNBUILDDIR) +opt_bpf.h: + echo "#define DEV_BPF 1" > ${.TARGET} +.if ${MK_INET_SUPPORT} != "no" +opt_inet.h: + @echo "#define INET 1" > ${.TARGET} + @echo "#define TCP_OFFLOAD 1" >> ${.TARGET} +.endif +.if ${MK_INET6_SUPPORT} != "no" +opt_inet6.h: + @echo "#define INET6 1" > ${.TARGET} +.endif +.if ${MK_EISA} != "no" +opt_eisa.h: + @echo "#define DEV_EISA 1" > ${.TARGET} +.endif +opt_mrouting.h: + echo "#define MROUTING 1" > ${.TARGET} +opt_natm.h: + echo "#define NATM 1" > ${.TARGET} +opt_scsi.h: + echo "#define SCSI_DELAY 15000" > ${.TARGET} +opt_wlan.h: + echo "#define IEEE80211_DEBUG 1" > ${.TARGET} + echo "#define IEEE80211_AMPDU_AGE 1" >> ${.TARGET} + echo "#define IEEE80211_SUPPORT_MESH 1" >> ${.TARGET} +KERN_OPTS.i386=NEW_PCIB DEV_PCI +KERN_OPTS.pc98=NEW_PCIB DEV_PCI +KERN_OPTS.amd64=NEW_PCIB DEV_PCI +KERN_OPTS.powerpc=NEW_PCIB DEV_PCI +KERN_OPTS=MROUTING NATM IEEE80211_DEBUG \ + IEEE80211_AMPDU_AGE IEEE80211_SUPPORT_MESH DEV_BPF \ + ${KERN_OPTS.${MACHINE}} ${KERN_OPTS_EXTRA} +.if ${MK_INET_SUPPORT} != "no" +KERN_OPTS+= INET TCP_OFFLOAD +.endif +.if ${MK_INET6_SUPPORT} != "no" +KERN_OPTS+= INET6 +.endif +.if ${MK_EISA} != "no" +KERN_OPTS+= DEV_EISA +.endif +.else +KERN_OPTS!=cat ${KERNBUILDDIR}/opt*.h | awk '{print $$2;}' | sort -u +.endif Modified: projects/ifnet/sys/conf/files ============================================================================== --- projects/ifnet/sys/conf/files Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/conf/files Thu Feb 19 01:29:24 2015 (r278980) @@ -271,6 +271,7 @@ contrib/dev/acpica/components/debugger/d contrib/dev/acpica/components/debugger/dbutils.c optional acpi acpi_debug contrib/dev/acpica/components/debugger/dbxface.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmbuffer.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmcstyle.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmdeferred.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmnames.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmopcode.c optional acpi acpi_debug Modified: projects/ifnet/sys/conf/kmod.mk ============================================================================== --- projects/ifnet/sys/conf/kmod.mk Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/conf/kmod.mk Thu Feb 19 01:29:24 2015 (r278980) @@ -70,6 +70,7 @@ OBJCOPY?= objcopy # do this after bsd.own.mk. .include "kern.opts.mk" .include <bsd.compiler.mk> +.include "config.mk" .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S @@ -163,6 +164,11 @@ OBJS+= ${_firmw:C/\:.*$/.fwo/} .endfor .endif +# Conditionally include SRCS based on kernel config options. +.for _o in ${KERN_OPTS} +SRCS+=${SRCS.${_o}} +.endfor + OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .if !defined(PROG) @@ -316,34 +322,6 @@ unload: ${KMODUNLOAD} -v ${PROG} .endif -# Generate options files that otherwise would be built -# in substantially similar ways through the tree. Move -# the code here when they all produce identical results -# (or should) -.if !defined(KERNBUILDDIR) -opt_bpf.h: - echo "#define DEV_BPF 1" > ${.TARGET} -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} - @echo "#define TCP_OFFLOAD 1" >> ${.TARGET} -.endif -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -opt_mrouting.h: - echo "#define MROUTING 1" > ${.TARGET} -opt_natm.h: - echo "#define NATM 1" > ${.TARGET} -opt_scsi.h: - echo "#define SCSI_DELAY 15000" > ${.TARGET} -opt_wlan.h: - echo "#define IEEE80211_DEBUG 1" > ${.TARGET} - echo "#define IEEE80211_AMPDU_AGE 1" >> ${.TARGET} - echo "#define IEEE80211_SUPPORT_MESH 1" >> ${.TARGET} -.endif - .if defined(KERNBUILDDIR) .PATH: ${KERNBUILDDIR} CFLAGS+= -I${KERNBUILDDIR} Modified: projects/ifnet/sys/contrib/dev/acpica/changes.txt ============================================================================== --- projects/ifnet/sys/contrib/dev/acpica/changes.txt Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/contrib/dev/acpica/changes.txt Thu Feb 19 01:29:24 2015 (r278980) @@ -1,4 +1,223 @@ ---------------------------------------- +04 February 2015. Summary of changes for version 20150204: + +This release is available at https://acpica.org/downloads + +ACPICA kernel-resident subsystem: + +Updated all ACPICA copyrights and signons to 2014. Added the 2014 +copyright to all module headers and signons, including the standard Linux +header. This affects virtually every file in the ACPICA core subsystem, +iASL compiler, all ACPICA utilities, and the test suites. + +Events: Introduce ACPI_GPE_DISPATCH_RAW_HANDLER to fix GPE storm issues. +A raw gpe handling mechanism was created to allow better handling of GPE +storms that aren't easily managed by the normal handler. The raw handler +allows disabling/renabling of the the GPE so that interrupt storms can be +avoided in cases where events cannot be timely serviced. In this scenario, +handlers should use the AcpiSetGpe() API to disable/enable the GPE. This API +will leave the reference counts undisturbed, thereby preventing unintentional +clearing of the GPE when the intent in only to temporarily disable it. Raw +handlers allow enabling and disabling of a GPE by removing GPE register +locking. As such, raw handlers much provide their own locks while using +GPE API's to protect access to GPE data structures. +Lv Zheng + +Events: Always modify GPE registers under the GPE lock. +Applies GPE lock around AcpiFinishGpe() to protect access to GPE register +values. Reported as bug by joe.liu@apple.com. + +Unix makefiles: Separate option to disable optimizations and _FORTIFY_SOURCE. +This change removes the _FORTIFY_SOURCE flag from the NOOPT disable option and +creates a separate flag (NOFORTIFY) for this purpose. Some toolchains may +define _FORTIFY_SOURCE which leads redefined errors when building ACPICA. This +allows disabling the option without also having to disable optimazations. +David Box + + Current Release: + Non-Debug Version: 101.7K Code, 27.9K Data, 129.6K Total + Debug Version: 199.2K Code, 82.4K Data, 281.6K Total + +---------------------------------------- +07 November 2014. Summary of changes for version 20141107: + +This release is available at https://acpica.org/downloads + +This release introduces and implements language extensions to ASL that +provide support for symbolic ("C-style") operators and expressions. These +language extensions are known collectively as ASL+. + + +1) iASL Compiler/Disassembler and Tools: + +Disassembler: Fixed a problem with disassembly of the UartSerialBus +macro. Changed "StopBitsNone" to the correct "StopBitsZero". David E. +Box. + +Disassembler: Fixed the Unicode macro support to add escape sequences. +All non-printable ASCII values are emitted as escape sequences, as well +as the standard escapes for quote and backslash. Ensures that the +disassembled macro can be correctly recompiled. + +iASL: Added Printf/Fprintf macros for formatted output. These macros are +translated to existing AML Concatenate and Store operations. Printf +writes to the ASL Debug object. Fprintf allows the specification of an +ASL name as the target. Only a single format specifier is required, %o, +since the AML interpreter dynamically converts objects to the required +type. David E. Box. + + (old) Store (Concatenate (Concatenate (Concatenate (Concatenate + (Concatenate (Concatenate (Concatenate ("", Arg0), + ": Unexpected value for "), Arg1), ", "), Arg2), + " at line "), Arg3), Debug) + + (new) Printf ("%o: Unexpected value for %o, %o at line %o", + Arg0, Arg1, Arg2, Arg3) + + (old) Store (Concatenate (Concatenate (Concatenate (Concatenate + ("", Arg1), ": "), Arg0), " Successful"), STR1) + + (new) Fprintf (STR1, "%o: %o Successful", Arg1, Arg0) + +iASL: Added debug options (-bp, -bt) to dynamically prune levels of the +ASL parse tree before the AML code is generated. This allows blocks of +ASL code to be removed in order to help locate and identify problem +devices and/or code. David E. Box. + +AcpiExec: Added support (-fi) for an optional namespace object +initialization file. This file specifies initial values for namespace +objects as necessary for debugging and testing different ASL code paths +that may be taken as a result of BIOS options. + + +2) Overview of symbolic operator support for ASL (ASL+) +------------------------------------------------------- + +As an extension to the ASL language, iASL implements support for symbolic +(C-style) operators for math and logical expressions. This can greatly +simplify ASL code as well as improve both readability and +maintainability. These language extensions can exist concurrently with +all legacy ASL code and expressions. + +The symbolic extensions are 100% compatible with existing AML +interpreters, since no new AML opcodes are created. To implement the +extensions, the iASL compiler transforms the symbolic expressions into +the legacy ASL/AML equivalents at compile time. + +Full symbolic expressions are supported, along with the standard C +precedence and associativity rules. + +Full disassembler support for the symbolic expressions is provided, and +creates an automatic migration path for existing ASL code to ASL+ code +via the disassembly process. By default, the disassembler now emits ASL+ +code with symbolic expressions. An option (-dl) is provided to force the +disassembler to emit legacy ASL code if desired. + +Below is the complete list of the currently supported symbolic operators +with examples. See the iASL User Guide for additional information. + + +ASL+ Syntax Legacy ASL Equivalent +----------- --------------------- + + // Math operators + +Z = X + Y Add (X, Y, Z) +Z = X - Y Subtract (X, Y, Z) +Z = X * Y Multiply (X, Y, Z) +Z = X / Y Divide (X, Y, , Z) +Z = X % Y Mod (X, Y, Z) +Z = X << Y ShiftLeft (X, Y, Z) +Z = X >> Y ShiftRight (X, Y, Z) +Z = X & Y And (X, Y, Z) +Z = X | Y Or (X, Y, Z) +Z = X ^ Y Xor (X, Y, Z) +Z = ~X Not (X, Z) +X++ Increment (X) +X-- Decrement (X) + + // Logical operators + +(X == Y) LEqual (X, Y) +(X != Y) LNotEqual (X, Y) +(X < Y) LLess (X, Y) +(X > Y) LGreater (X, Y) +(X <= Y) LLessEqual (X, Y) +(X >= Y) LGreaterEqual (X, Y) +(X && Y) LAnd (X, Y) +(X || Y) LOr (X, Y) +(!X) LNot (X) + + // Assignment and compound assignment operations + +X = Y Store (Y, X) +X += Y Add (X, Y, X) +X -= Y Subtract (X, Y, X) +X *= Y Multiply (X, Y, X) +X /= Y Divide (X, Y, , X) +X %= Y Mod (X, Y, X) +X <<= Y ShiftLeft (X, Y, X) +X >>= Y ShiftRight (X, Y, X) +X &= Y And (X, Y, X) +X |= Y Or (X, Y, X) +X ^= Y Xor (X, Y, X) + + +3) ASL+ Examples: +----------------- + +Legacy ASL: + If (LOr (LOr (LEqual (And (R510, 0x03FB), 0x02E0), LEqual ( + And (R520, 0x03FB), 0x02E0)), LOr (LEqual (And (R530, +0x03FB), + 0x02E0), LEqual (And (R540, 0x03FB), 0x02E0)))) + { + And (MEMB, 0xFFFFFFF0, SRMB) + Store (MEMB, Local2) + Store (PDBM, Local1) + And (PDBM, 0xFFFFFFFFFFFFFFF9, PDBM) + Store (SRMB, MEMB) + Or (PDBM, 0x02, PDBM) + } + +ASL+ version: + If (((R510 & 0x03FB) == 0x02E0) || + ((R520 & 0x03FB) == 0x02E0) || + ((R530 & 0x03FB) == 0x02E0) || + ((R540 & 0x03FB) == 0x02E0)) + { + SRMB = (MEMB & 0xFFFFFFF0) + Local2 = MEMB + Local1 = PDBM + PDBM &= 0xFFFFFFFFFFFFFFF9 + MEMB = SRMB + PDBM |= 0x02 + } + +Legacy ASL: + Store (0x1234, Local1) + Multiply (Add (Add (Local1, TEST), 0x20), Local2, Local3) + Multiply (Local2, Add (Add (Local1, TEST), 0x20), Local3) + Add (Local1, Add (TEST, Multiply (0x20, Local2)), Local3) + Store (Index (PKG1, 0x03), Local6) + Store (Add (Local3, Local2), Debug) + Add (Local1, 0x0F, Local2) + Add (Local1, Multiply (Local2, Local3), Local2) + Multiply (Add (Add (Local1, TEST), 0x20), ToBCD (Local1), Local3) + +ASL+ version: + Local1 = 0x1234 + Local3 = (((Local1 + TEST) + 0x20) * Local2) + Local3 = (Local2 * ((Local1 + TEST) + 0x20)) + Local3 = (Local1 + (TEST + (0x20 * Local2))) + Local6 = Index (PKG1, 0x03) + Debug = (Local3 + Local2) + Local2 = (Local1 + 0x0F) + Local2 = (Local1 + (Local2 * Local3)) + Local3 = (((Local1 + TEST) + 0x20) * ToBCD (Local1)) + + +---------------------------------------- 26 September 2014. Summary of changes for version 20140926: 1) ACPICA kernel-resident subsystem: Modified: projects/ifnet/sys/contrib/dev/acpica/common/acgetline.c ============================================================================== --- projects/ifnet/sys/contrib/dev/acpica/common/acgetline.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/contrib/dev/acpica/common/acgetline.c Thu Feb 19 01:29:24 2015 (r278980) @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2014, Intel Corp. + * Copyright (C) 2000 - 2015, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: projects/ifnet/sys/contrib/dev/acpica/common/adfile.c ============================================================================== --- projects/ifnet/sys/contrib/dev/acpica/common/adfile.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/contrib/dev/acpica/common/adfile.c Thu Feb 19 01:29:24 2015 (r278980) @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2014, Intel Corp. + * Copyright (C) 2000 - 2015, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: projects/ifnet/sys/contrib/dev/acpica/common/adisasm.c ============================================================================== --- projects/ifnet/sys/contrib/dev/acpica/common/adisasm.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/contrib/dev/acpica/common/adisasm.c Thu Feb 19 01:29:24 2015 (r278980) @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2014, Intel Corp. + * Copyright (C) 2000 - 2015, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -357,8 +357,12 @@ AdAmlDisassemble ( AcpiDmDumpDataTable (Table); fprintf (stderr, "Acpi Data Table [%4.4s] decoded\n", Table->Signature); - fprintf (stderr, "Formatted output: %s - %u bytes\n", - DisasmFilename, CmGetFileSize (File)); + + if (File) + { + fprintf (stderr, "Formatted output: %s - %u bytes\n", + DisasmFilename, CmGetFileSize (File)); + } } else { @@ -376,8 +380,11 @@ AdAmlDisassemble ( { AcpiOsPrintf ("/**** Before second load\n"); - NsSetupNamespaceListing (File); - NsDisplayNamespace (); + if (File) + { + NsSetupNamespaceListing (File); + NsDisplayNamespace (); + } AcpiOsPrintf ("*****/\n"); } @@ -457,8 +464,11 @@ AdAmlDisassemble ( if (AslCompilerdebug) { AcpiOsPrintf ("/**** After second load and resource conversion\n"); - NsSetupNamespaceListing (File); - NsDisplayNamespace (); + if (File) + { + NsSetupNamespaceListing (File); + NsDisplayNamespace (); + } AcpiOsPrintf ("*****/\n"); AcpiDmDumpTree (AcpiGbl_ParseOpRoot); @@ -487,8 +497,11 @@ AdAmlDisassemble ( AcpiDmDumpDataTable (Table); fprintf (stderr, "Disassembly completed\n"); - fprintf (stderr, "ASL Output: %s - %u bytes\n", - DisasmFilename, CmGetFileSize (File)); + if (File) + { + fprintf (stderr, "ASL Output: %s - %u bytes\n", + DisasmFilename, CmGetFileSize (File)); + } if (Gbl_MapfileFlag) { @@ -507,7 +520,7 @@ Cleanup: ACPI_FREE (Table); } - if (OutToFile && File) + if (File) { if (AslCompilerdebug) /* Display final namespace, with transforms */ { @@ -544,12 +557,26 @@ AdDisassemblerHeader ( { time_t Timer; + time (&Timer); /* Header and input table info */ AcpiOsPrintf ("/*\n"); - AcpiOsPrintf (ACPI_COMMON_HEADER ("AML Disassembler", " * ")); + AcpiOsPrintf (ACPI_COMMON_HEADER (AML_DISASSEMBLER_NAME, " * ")); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502190129.t1J1TP4w030449>