svn commit: r279023 - in projects/clang360-import: . cddl/contrib/opensolaris/lib/libdtrace/common etc lib/libc/rpc lib/libc/stdio lib/libc/sys release sbin/camcontrol share/mk sys/amd64/amd64 sys/...

Dimitry Andric dim at FreeBSD.org
Thu Feb 19 21:10:09 UTC 2015 

Author: dim
Date: Thu Feb 19 21:10:01 2015
New Revision: 279023
URL: https://svnweb.freebsd.org/changeset/base/279023

Log:
  Merging ^/head r278916 through r279022.

Added:
  projects/clang360-import/sys/conf/config.mk
     - copied unchanged from r279022, head/sys/conf/config.mk
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslprintf.c
     - copied unchanged from r279022, head/sys/contrib/dev/acpica/compiler/aslprintf.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslprune.c
     - copied unchanged from r279022, head/sys/contrib/dev/acpica/compiler/aslprune.c
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c
     - copied unchanged from r279022, head/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c
  projects/clang360-import/sys/dev/ofw/ofw_cpu.h
     - copied unchanged from r279022, head/sys/dev/ofw/ofw_cpu.h
Deleted:
  projects/clang360-import/sys/dev/cxgb/sys/mbufq.h
  projects/clang360-import/sys/dev/xen/netfront/mbufq.h
Modified:
  projects/clang360-import/Makefile.inc1
  projects/clang360-import/UPDATING
  projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
  projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
  projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c
  projects/clang360-import/etc/network.subr
  projects/clang360-import/lib/libc/rpc/clnt_dg.c
  projects/clang360-import/lib/libc/rpc/rpc_soc.c
  projects/clang360-import/lib/libc/stdio/xprintf_float.c
  projects/clang360-import/lib/libc/sys/mmap.2
  projects/clang360-import/release/Makefile
  projects/clang360-import/release/Makefile.vm
  projects/clang360-import/sbin/camcontrol/camcontrol.c
  projects/clang360-import/share/mk/bsd.dep.mk
  projects/clang360-import/share/mk/bsd.libnames.mk
  projects/clang360-import/share/mk/bsd.own.mk
  projects/clang360-import/share/mk/bsd.sys.mk
  projects/clang360-import/sys/amd64/amd64/ptrace_machdep.c
  projects/clang360-import/sys/arm/arm/db_trace.c
  projects/clang360-import/sys/arm/arm/unwind.c
  projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
  projects/clang360-import/sys/arm/include/stack.h
  projects/clang360-import/sys/cam/cam_ccb.h
  projects/clang360-import/sys/cam/scsi/scsi_da.c
  projects/clang360-import/sys/cam/scsi/scsi_enc_ses.c
  projects/clang360-import/sys/cddl/dev/dtrace/arm/dtrace_isa.c
  projects/clang360-import/sys/conf/NOTES
  projects/clang360-import/sys/conf/files
  projects/clang360-import/sys/conf/files.arm
  projects/clang360-import/sys/conf/kmod.mk
  projects/clang360-import/sys/contrib/dev/acpica/changes.txt   (contents, props changed)
  projects/clang360-import/sys/contrib/dev/acpica/common/acgetline.c
  projects/clang360-import/sys/contrib/dev/acpica/common/adfile.c
  projects/clang360-import/sys/contrib/dev/acpica/common/adisasm.c
  projects/clang360-import/sys/contrib/dev/acpica/common/adwalk.c
  projects/clang360-import/sys/contrib/dev/acpica/common/ahids.c
  projects/clang360-import/sys/contrib/dev/acpica/common/ahpredef.c
  projects/clang360-import/sys/contrib/dev/acpica/common/ahuuids.c
  projects/clang360-import/sys/contrib/dev/acpica/common/cmfsize.c
  projects/clang360-import/sys/contrib/dev/acpica/common/dmextern.c
  projects/clang360-import/sys/contrib/dev/acpica/common/dmrestag.c
  projects/clang360-import/sys/contrib/dev/acpica/common/dmtable.c
  projects/clang360-import/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/clang360-import/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/clang360-import/sys/contrib/dev/acpica/common/getopt.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslanalyze.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslascii.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslbtypes.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslcodegen.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslfileio.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslfold.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslglobal.h
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslhex.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asllength.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asllisting.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asllistsup.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslload.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asllookup.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmapenter.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmapoutput.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmaputils.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmessages.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmethod.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslnamesp.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asloffset.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslopcodes.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asloperands.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslopt.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asloptions.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslparser.y
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslpredef.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslprepkg.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslresource.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype1.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype1i.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype2.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype2d.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype2e.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype2q.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype2w.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrules.y
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslstubs.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslsupport.l
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslsupport.y
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asltokens.y
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asltransform.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asltree.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asltypes.y
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/asluuid.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslwalks.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/aslxref.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/dtcompile.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/dtcompiler.h
  projects/clang360-import/sys/contrib/dev/acpica/compiler/dtexpress.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/dtfield.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/dtio.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/dtparser.l
  projects/clang360-import/sys/contrib/dev/acpica/compiler/dtparser.y
  projects/clang360-import/sys/contrib/dev/acpica/compiler/dtsubtable.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/dttable.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/dttemplate.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/clang360-import/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/preprocess.h
  projects/clang360-import/sys/contrib/dev/acpica/compiler/prexpress.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/prmacros.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/prparser.l
  projects/clang360-import/sys/contrib/dev/acpica/compiler/prparser.y
  projects/clang360-import/sys/contrib/dev/acpica/compiler/prscan.c
  projects/clang360-import/sys/contrib/dev/acpica/compiler/prutils.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbconvert.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbexec.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbfileio.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbhistry.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbinput.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbnames.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbstats.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbtest.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbutils.c
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbxface.c
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmnames.c
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmobject.c
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmutils.c
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dswscope.c
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dswstate.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evevent.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evglock.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evgpe.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evgpeblk.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evgpeinit.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evgpeutil.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evhandler.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evmisc.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evregion.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evrgnini.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evsci.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evxface.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evxfevnt.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evxfgpe.c
  projects/clang360-import/sys/contrib/dev/acpica/components/events/evxfregn.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exconfig.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exconvrt.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/excreate.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exdebug.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exdump.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exfield.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exfldio.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exmisc.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exmutex.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exnames.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exoparg1.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exoparg2.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exoparg3.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exoparg6.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exprep.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exregion.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exresnte.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exresolv.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exresop.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exstore.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exstoren.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exstorob.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exsystem.c
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/exutils.c
  projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwacpi.c
  projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwesleep.c
  projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwpci.c
  projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwregs.c
  projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwsleep.c
  projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwtimer.c
  projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwvalid.c
  projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwxface.c
  projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsalloc.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsarguments.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsconvert.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsdump.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nseval.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsinit.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsload.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsnames.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsobject.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsparse.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nspredef.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsrepair.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nssearch.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsutils.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nswalk.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsxfname.c
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsxfobj.c
  projects/clang360-import/sys/contrib/dev/acpica/components/parser/psargs.c
  projects/clang360-import/sys/contrib/dev/acpica/components/parser/psloop.c
  projects/clang360-import/sys/contrib/dev/acpica/components/parser/psobject.c
  projects/clang360-import/sys/contrib/dev/acpica/components/parser/psopcode.c
  projects/clang360-import/sys/contrib/dev/acpica/components/parser/psopinfo.c
  projects/clang360-import/sys/contrib/dev/acpica/components/parser/psparse.c
  projects/clang360-import/sys/contrib/dev/acpica/components/parser/psscope.c
  projects/clang360-import/sys/contrib/dev/acpica/components/parser/pstree.c
  projects/clang360-import/sys/contrib/dev/acpica/components/parser/psutils.c
  projects/clang360-import/sys/contrib/dev/acpica/components/parser/pswalk.c
  projects/clang360-import/sys/contrib/dev/acpica/components/parser/psxface.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsaddr.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rscalc.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rscreate.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsdump.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsinfo.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsio.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsirq.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rslist.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsmemory.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsmisc.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsserial.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsutils.c
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsxface.c
  projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbdata.c
  projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbfadt.c
  projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbfind.c
  projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbinstal.c
  projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbprint.c
  projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbutils.c
  projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbxface.c
  projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbxfload.c
  projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbxfroot.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utaddress.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utalloc.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utbuffer.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utcache.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utcopy.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utdebug.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utdecode.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utdelete.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/uterror.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/uteval.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utexcep.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utfileio.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utglobal.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/uthex.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utids.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utinit.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utlock.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utmath.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utmisc.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utmutex.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utobject.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utosi.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utownerid.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utpredef.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utprint.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utresrc.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utstate.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utstring.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/uttrack.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utuuid.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utxface.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utxferror.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utxfinit.c
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
  projects/clang360-import/sys/contrib/dev/acpica/include/acapps.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acbuffer.h
  projects/clang360-import/sys/contrib/dev/acpica/include/accommon.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acconfig.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acdebug.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acdisasm.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acdispat.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acevents.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acexcep.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acglobal.h
  projects/clang360-import/sys/contrib/dev/acpica/include/achware.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acinterp.h
  projects/clang360-import/sys/contrib/dev/acpica/include/aclocal.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acmacros.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acnames.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acnamesp.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acobject.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acopcode.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acoutput.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acparser.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acpi.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acpiosxf.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acpixf.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acpredef.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acresrc.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acrestyp.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acstruct.h
  projects/clang360-import/sys/contrib/dev/acpica/include/actables.h
  projects/clang360-import/sys/contrib/dev/acpica/include/actbl.h
  projects/clang360-import/sys/contrib/dev/acpica/include/actbl1.h
  projects/clang360-import/sys/contrib/dev/acpica/include/actbl2.h
  projects/clang360-import/sys/contrib/dev/acpica/include/actbl3.h
  projects/clang360-import/sys/contrib/dev/acpica/include/actypes.h
  projects/clang360-import/sys/contrib/dev/acpica/include/acutils.h
  projects/clang360-import/sys/contrib/dev/acpica/include/amlcode.h
  projects/clang360-import/sys/contrib/dev/acpica/include/amlresrc.h
  projects/clang360-import/sys/contrib/dev/acpica/include/platform/acenv.h
  projects/clang360-import/sys/contrib/dev/acpica/include/platform/acenvex.h
  projects/clang360-import/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  projects/clang360-import/sys/contrib/dev/acpica/include/platform/acgcc.h
  projects/clang360-import/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
  projects/clang360-import/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  projects/clang360-import/sys/dev/cardbus/cardbus.c
  projects/clang360-import/sys/dev/cxgb/cxgb_adapter.h
  projects/clang360-import/sys/dev/cxgb/cxgb_sge.c
  projects/clang360-import/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  projects/clang360-import/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h
  projects/clang360-import/sys/dev/iicbus/lm75.c
  projects/clang360-import/sys/dev/mpr/mpr_sas.c
  projects/clang360-import/sys/dev/mps/mps_sas.c
  projects/clang360-import/sys/dev/ofw/ofw_cpu.c
  projects/clang360-import/sys/dev/pccbb/pccbb.c
  projects/clang360-import/sys/dev/random/fortuna.c
  projects/clang360-import/sys/dev/random/yarrow.c
  projects/clang360-import/sys/dev/sfxge/common/efx_ev.c
  projects/clang360-import/sys/dev/sfxge/common/efx_mcdi.h
  projects/clang360-import/sys/dev/sfxge/common/efx_regs_mcdi.h
  projects/clang360-import/sys/dev/sfxge/common/siena_nic.c
  projects/clang360-import/sys/dev/sfxge/common/siena_nvram.c
  projects/clang360-import/sys/dev/sfxge/common/siena_phy.c
  projects/clang360-import/sys/dev/sfxge/sfxge.h
  projects/clang360-import/sys/dev/sfxge/sfxge_ev.c
  projects/clang360-import/sys/dev/sfxge/sfxge_rx.c
  projects/clang360-import/sys/dev/sfxge/sfxge_tx.c
  projects/clang360-import/sys/dev/sfxge/sfxge_tx.h
  projects/clang360-import/sys/dev/spibus/spi.h
  projects/clang360-import/sys/dev/spibus/spibus.c
  projects/clang360-import/sys/dev/spibus/spibusvar.h
  projects/clang360-import/sys/dev/xen/netfront/netfront.c
  projects/clang360-import/sys/i386/i386/ptrace_machdep.c
  projects/clang360-import/sys/kern/kern_ctf.c
  projects/clang360-import/sys/kern/kern_descrip.c
  projects/clang360-import/sys/kern/sys_generic.c
  projects/clang360-import/sys/kern/sysv_shm.c
  projects/clang360-import/sys/kern/tty.c
  projects/clang360-import/sys/kern/uipc_mbuf.c
  projects/clang360-import/sys/kern/uipc_syscalls.c
  projects/clang360-import/sys/kern/vfs_syscalls.c
  projects/clang360-import/sys/modules/Makefile
  projects/clang360-import/sys/modules/dpt/Makefile
  projects/clang360-import/sys/modules/ed/Makefile
  projects/clang360-import/sys/modules/ep/Makefile
  projects/clang360-import/sys/modules/if_gif/Makefile
  projects/clang360-import/sys/modules/if_gre/Makefile
  projects/clang360-import/sys/modules/si/Makefile
  projects/clang360-import/sys/modules/vx/Makefile
  projects/clang360-import/sys/netinet/igmp.c
  projects/clang360-import/sys/netinet/in_mcast.c
  projects/clang360-import/sys/netinet/in_var.h
  projects/clang360-import/sys/netinet6/in6_mcast.c
  projects/clang360-import/sys/netinet6/in6_var.h
  projects/clang360-import/sys/netinet6/mld6.c
  projects/clang360-import/sys/netinet6/mld6_var.h
  projects/clang360-import/sys/netpfil/pf/pf_norm.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/cma.c
  projects/clang360-import/sys/ofed/include/linux/file.h
  projects/clang360-import/sys/ofed/include/net/ip.h
  projects/clang360-import/sys/powerpc/powermac/atibl.c
  projects/clang360-import/sys/powerpc/powermac/nvbl.c
  projects/clang360-import/sys/sys/cpu.h
  projects/clang360-import/sys/sys/file.h
  projects/clang360-import/sys/sys/filedesc.h
  projects/clang360-import/sys/sys/mbuf.h
  projects/clang360-import/sys/sys/param.h
  projects/clang360-import/sys/x86/acpica/acpi_wakeup.c
  projects/clang360-import/usr.bin/du/du.c
  projects/clang360-import/usr.bin/ministat/ministat.c
  projects/clang360-import/usr.bin/netstat/inet.c
  projects/clang360-import/usr.sbin/Makefile
  projects/clang360-import/usr.sbin/acpi/acpidb/Makefile
  projects/clang360-import/usr.sbin/acpi/acpidb/acpidb.c
  projects/clang360-import/usr.sbin/acpi/iasl/Makefile
  projects/clang360-import/usr.sbin/syslogd/syslogd.c
Directory Properties:
  projects/clang360-import/   (props changed)
  projects/clang360-import/cddl/   (props changed)
  projects/clang360-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang360-import/etc/   (props changed)
  projects/clang360-import/lib/libc/   (props changed)
  projects/clang360-import/sbin/   (props changed)
  projects/clang360-import/share/   (props changed)
  projects/clang360-import/sys/   (props changed)
  projects/clang360-import/sys/conf/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/common/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/compiler/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/components/debugger/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/components/events/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/components/executer/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/components/hardware/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/components/namespace/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/components/parser/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/components/resources/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/components/tables/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/components/utilities/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/include/   (props changed)
  projects/clang360-import/sys/contrib/dev/acpica/os_specific/   (props changed)

Modified: projects/clang360-import/Makefile.inc1
==============================================================================
--- projects/clang360-import/Makefile.inc1	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/Makefile.inc1	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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
 
@@ -912,25 +913,25 @@ packageworld:
 .for dist in base ${EXTRA_DISTRIBUTIONS}
 .if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \
-	    --exclude usr/lib/debug \
-	    @${DESTDIR}/${DISTDIR}/${dist}.meta
+	    tar cvf - --exclude usr/lib/debug \
+	    @${DESTDIR}/${DISTDIR}/${dist}.meta | \
+	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz
 .else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \
-	    --exclude usr/lib/debug .
+	    tar cvf - --exclude usr/lib/debug . | \
+	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz
 .endif
 .endfor
 
 .for dist in ${DEBUG_DISTRIBUTIONS}
 . if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \
-	    @${DESTDIR}/${DISTDIR}/${dist}.debug.meta
+	    tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \
+	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz
 . else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
-	    tar cvJLf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \
-	    usr/lib/debug
+	    tar cvLf - usr/lib/debug | \
+	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz
 . endif
 .endfor
 
@@ -1138,19 +1139,21 @@ distributekernel distributekernel.debug:
 packagekernel:
 .if defined(NO_ROOT)
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \
-	    @${DESTDIR}/${DISTDIR}/kernel.meta
+	    tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \
+	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \
-	    @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
+	    tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
+	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz
 .endfor
 .else
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz .
+	    tar cvf - . | \
+	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .
+	    tar cvf - . | \
+	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz
 .endfor
 .endif
 
@@ -1244,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
@@ -1270,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/clang360-import/UPDATING
==============================================================================
--- projects/clang360-import/UPDATING	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/UPDATING	Thu Feb 19 21:10:01 2015	(r279023)
@@ -34,6 +34,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 2015mmdd:
 	Clang and llvm have been upgraded to 3.6.0 release.
 
+20150217:
+	If you are running a -CURRENT kernel since r273872 (Oct 30th, 2014),
+	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 affected.
+
 20150210:
 	The autofs(4) ABI was changed in order to restore binary compatibility
 	with 10.1-RELEASE.  The automountd(8) daemon needs to be rebuilt to work

Modified: projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/etc/network.subr
==============================================================================
--- projects/clang360-import/etc/network.subr	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/etc/network.subr	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/lib/libc/rpc/clnt_dg.c
==============================================================================
--- projects/clang360-import/lib/libc/rpc/clnt_dg.c	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/lib/libc/rpc/clnt_dg.c	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/lib/libc/rpc/rpc_soc.c
==============================================================================
--- projects/clang360-import/lib/libc/rpc/rpc_soc.c	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/lib/libc/rpc/rpc_soc.c	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/lib/libc/stdio/xprintf_float.c
==============================================================================
--- projects/clang360-import/lib/libc/stdio/xprintf_float.c	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/lib/libc/stdio/xprintf_float.c	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/lib/libc/sys/mmap.2
==============================================================================
--- projects/clang360-import/lib/libc/sys/mmap.2	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/lib/libc/sys/mmap.2	Thu Feb 19 21:10:01 2015	(r279023)
@@ -28,7 +28,7 @@
 .\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
 .\" $FreeBSD$
 .\"
-.Dd September 17, 2014
+.Dd February 18, 2015
 .Dt MMAP 2
 .Os
 .Sh NAME
@@ -160,7 +160,7 @@ is specified,
 must be a multiple of the pagesize.
 If
 .Dv MAP_EXCL
-is not specified, a successfull
+is not specified, a successful
 .Dv MAP_FIXED
 request replaces any previous mappings for the process'
 pages in the range from
@@ -225,7 +225,7 @@ it.
 You can test file fragmentation by observing the KB/t (kilobytes per
 transfer) results from an
 .Dq Li iostat 1
-while reading a large file sequentially, e.g.\& using
+while reading a large file sequentially, e.g.,\& using
 .Dq Li dd if=filename of=/dev/null bs=32k .
 .Pp
 The
@@ -448,17 +448,3 @@ was specified and insufficient memory wa
 .Xr munmap 2 ,
 .Xr getpagesize 3 ,
 .Xr getpagesizes 3
-.Sh BUGS
-The
-.Fa len
-argument
-is limited to the maximum file size or available userland address
-space.
-Files may not be able to be made more than 1TB large on 32 bit systems
-due to file systems restrictions and bugs, but address space is far more
-restrictive.
-Larger files may be possible on 64 bit systems.
-.Pp
-The previous documented limit of 2GB was a documentation bug.
-That limit has not existed since
-.Fx 2.2 .

Modified: projects/clang360-import/release/Makefile
==============================================================================
--- projects/clang360-import/release/Makefile	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/release/Makefile	Thu Feb 19 21:10:01 2015	(r279023)
@@ -33,18 +33,12 @@
 #  		with xz(1) (extremely time consuming)
 #  WITH_CLOUDWARE: if set, build cloud hosting disk images with the release
 #  TARGET/TARGET_ARCH: architecture of built release
-#  XZ_FLAGS: Additional arguments to pass to xz(1)
-#  XZ_THREADS: Number of xz(1) threads to use
-#  NO_XZTHREADS: Disable multi-threaded xz(1) compression
 #
 
 WORLDDIR?=	${.CURDIR}/..
 PORTSDIR?=	/usr/ports
 DOCDIR?=	/usr/doc
 RELNOTES_LANG?= en_US.ISO8859-1
-XZCMD?=		/usr/bin/xz
-XZ_FLAGS?=
-XZ_THREADS?=
 
 .if !defined(TARGET) || empty(TARGET)
 TARGET=		${MACHINE}
@@ -59,15 +53,6 @@ TARGET_ARCH=	${TARGET}
 IMAKE=		${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
 DISTDIR=	dist
 
-.if !defined(NO_XZTHREADS) && empty(XZ_THREADS)
-XZ_THREADS=	0
-.else
-XZ_THREADS=	${XZ_THREADS}
-.endif
-.if !empty(XZ_THREADS)
-XZ_FLAGS+=	-T ${XZ_THREADS}
-.endif
-
 # Define OSRELEASE by using newvars.sh
 .if !defined(OSRELEASE) || empty(OSRELEASE)
 .for _V in TYPE BRANCH REVISION
@@ -158,16 +143,18 @@ kernel.txz:
 src.txz:
 	mkdir -p ${DISTDIR}/usr
 	ln -fs ${WORLDDIR} ${DISTDIR}/usr/src
-	cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/src.txz --exclude .svn --exclude .zfs \
-	    --exclude .git --exclude @ --exclude usr/src/release/dist usr/src
+	cd ${DISTDIR} && tar cLvf - --exclude .svn --exclude .zfs \
+	    --exclude .git --exclude @ --exclude usr/src/release/dist usr/src | \
+	    ${XZ_CMD} > ${.OBJDIR}/src.txz
 
 ports.txz:
 	mkdir -p ${DISTDIR}/usr
 	ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports
-	cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/ports.txz \
+	cd ${DISTDIR} && tar cLvf - \
 	    --exclude .git --exclude .svn \
 	    --exclude usr/ports/distfiles --exclude usr/ports/packages \
-	    --exclude 'usr/ports/INDEX*' --exclude work usr/ports
+	    --exclude 'usr/ports/INDEX*' --exclude work usr/ports | \
+	    ${XZ_CMD} > ${.OBJDIR}/ports.txz
 
 reldoc:
 	cd ${.CURDIR}/doc && ${MAKE} all install clean 'FORMATS=html txt' \
@@ -309,7 +296,7 @@ release-install:
 .for I in ${IMAGES}
 	cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I}
 . if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
-	${XZCMD} ${XZ_FLAGS} -k ${DESTDIR}/${OSRELEASE}-${I}
+	${XZ_CMD} -k ${DESTDIR}/${OSRELEASE}-${I}
 . endif
 .endfor
 	cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256

Modified: projects/clang360-import/release/Makefile.vm
==============================================================================
--- projects/clang360-import/release/Makefile.vm	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/release/Makefile.vm	Thu Feb 19 21:10:01 2015	(r279023)
@@ -101,7 +101,7 @@ vm-install:
 # the DESTDIR.
 .  for FORMAT in ${VMFORMATS}
 	# Don't keep the originals.  There is a copy in ${.OBJDIR} if needed.
-	${XZCMD} ${XZ_FLAGS} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
+	${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
 .  endfor
 . endif
 	cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \

Modified: projects/clang360-import/sbin/camcontrol/camcontrol.c
==============================================================================
--- projects/clang360-import/sbin/camcontrol/camcontrol.c	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/sbin/camcontrol/camcontrol.c	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/share/mk/bsd.dep.mk
==============================================================================
--- projects/clang360-import/share/mk/bsd.dep.mk	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/share/mk/bsd.dep.mk	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/share/mk/bsd.libnames.mk
==============================================================================
--- projects/clang360-import/share/mk/bsd.libnames.mk	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/share/mk/bsd.libnames.mk	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/share/mk/bsd.own.mk
==============================================================================
--- projects/clang360-import/share/mk/bsd.own.mk	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/share/mk/bsd.own.mk	Thu Feb 19 21:10:01 2015	(r279023)
@@ -234,6 +234,15 @@ STRIP?=		-s
 COMPRESS_CMD?=	gzip -cn
 COMPRESS_EXT?=	.gz
 
+# Set XZ_THREADS to 1 to disable multi-threading.
+XZ_THREADS?=	0
+
+.if !empty(XZ_THREADS)
+XZ_CMD?=	xz -T ${XZ_THREADS}
+.else
+XZ_CMD?=	xz
+.endif
+
 # Pointer to the top directory into which tests are installed.  Should not be
 # overriden by Makefiles, but the user may choose to set this in src.conf(5).
 TESTSBASE?= /usr/tests

Modified: projects/clang360-import/share/mk/bsd.sys.mk
==============================================================================
--- projects/clang360-import/share/mk/bsd.sys.mk	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/share/mk/bsd.sys.mk	Thu Feb 19 21:10:01 2015	(r279023)
@@ -128,7 +128,10 @@ CWARNFLAGS+=	-Wno-unknown-pragmas
 CLANG_NO_IAS=	 -no-integrated-as
 .endif
 CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
-		 -mllvm -simplifycfg-dup-ret -mllvm -enable-gvn=false
+		 -mllvm -simplifycfg-dup-ret -mllvm
+.if ${COMPILER_VERSION} > 30400
+CLANG_OPT_SMALL+= -enable-gvn=false
+.endif
 CFLAGS.clang+=	 -Qunused-arguments
 .if ${MACHINE_CPUARCH} == "sparc64"
 # Don't emit .cfi directives, since we must use GNU as on sparc64, for now.

Modified: projects/clang360-import/sys/amd64/amd64/ptrace_machdep.c
==============================================================================
--- projects/clang360-import/sys/amd64/amd64/ptrace_machdep.c	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/sys/amd64/amd64/ptrace_machdep.c	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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/clang360-import/sys/arm/arm/db_trace.c
==============================================================================
--- projects/clang360-import/sys/arm/arm/db_trace.c	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/sys/arm/arm/db_trace.c	Thu Feb 19 21:10:01 2015	(r279023)
@@ -66,7 +66,7 @@ db_stack_trace_cmd(struct unwind_state *
 
 	finished = false;
 	while (!finished) {
-		finished = unwind_stack_one(state);
+		finished = unwind_stack_one(state, 0);
 
 		/* Print the frame details */
 		sym = db_search_symbol(state->start_pc, DB_STGY_ANY, &offset);

Modified: projects/clang360-import/sys/arm/arm/unwind.c
==============================================================================
--- projects/clang360-import/sys/arm/arm/unwind.c	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/sys/arm/arm/unwind.c	Thu Feb 19 21:10:01 2015	(r279023)
@@ -33,9 +33,12 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/linker.h>
 
 #include <machine/stack.h>
 
+#include "linker_if.h"
+
 /*
  * Definitions for the instruction interpreter.
  *
@@ -61,7 +64,7 @@ __FBSDID("$FreeBSD$");
  * These are set in the linker script. Their addresses will be
  * either the start or end of the exception table or index.
  */
-extern int extab_start, extab_end, exidx_start, exidx_end;
+extern int exidx_start, exidx_end;
 
 /*
  * Entry types.
@@ -104,13 +107,47 @@ expand_prel31(uint32_t prel31)
 	return ((int32_t)(prel31 & 0x7fffffffu) << 1) / 2;
 }
 
+struct search_context {
+	uint32_t addr;
+	caddr_t exidx_start;
+	caddr_t exidx_end;
+};
+
+static int
+module_search(linker_file_t lf, void *context)
+{
+	struct search_context *sc = context;
+	linker_symval_t symval;
+	c_linker_sym_t sym;
+
+	if (lf->address <= (caddr_t)sc->addr &&
+	    (lf->address + lf->size) >= (caddr_t)sc->addr) {
+		if ((LINKER_LOOKUP_SYMBOL(lf, "__exidx_start", &sym) == 0 ||
+		    LINKER_LOOKUP_SYMBOL(lf, "exidx_start", &sym) == 0) &&
+		    LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0)
+			sc->exidx_start = symval.value;
+
+		if ((LINKER_LOOKUP_SYMBOL(lf, "__exidx_end", &sym) == 0 ||
+		    LINKER_LOOKUP_SYMBOL(lf, "exidx_end", &sym) == 0) &&
+		    LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0)
+			sc->exidx_end = symval.value;
+
+		if (sc->exidx_start != NULL && sc->exidx_end != NULL)
+			return (1);
+		panic("Invalid module %s, no unwind tables\n", lf->filename);
+	}
+	return (0);
+}
+
 /*
  * Perform a binary search of the index table to find the function
  * with the largest address that doesn't exceed addr.
  */
 static struct unwind_idx *
-find_index(uint32_t addr)
+find_index(uint32_t addr, int search_modules)
 {
+	struct search_context sc;
+	caddr_t idx_start, idx_end;
 	unsigned int min, mid, max;
 	struct unwind_idx *start;
 	struct unwind_idx *item;
@@ -118,9 +155,23 @@ find_index(uint32_t addr)
 	uint32_t func_addr;
 
 	start = (struct unwind_idx *)&exidx_start;
+	idx_start = (caddr_t)&exidx_start;
+	idx_end = (caddr_t)&exidx_end;
+
+	/* This may acquire a lock */
+	if (search_modules) {
+		bzero(&sc, sizeof(sc));
+		sc.addr = addr;
+		if (linker_file_foreach(module_search, &sc) != 0 &&
+		   sc.exidx_start != NULL && sc.exidx_end != NULL) {
+			start = (struct unwind_idx *)sc.exidx_start;
+			idx_start = sc.exidx_start;
+			idx_end = sc.exidx_end;
+		}
+	}
 
 	min = 0;
-	max = (&exidx_end - &exidx_start) / 2;
+	max = (idx_end - idx_start) / sizeof(struct unwind_idx);
 
 	while (min != max) {
 		mid = min + (max - min + 1) / 2;
@@ -332,7 +383,7 @@ unwind_tab(struct unwind_state *state)
 }
 
 int
-unwind_stack_one(struct unwind_state *state)
+unwind_stack_one(struct unwind_state *state, int can_lock)
 {
 	struct unwind_idx *index;
 	int finished;
@@ -344,7 +395,7 @@ unwind_stack_one(struct unwind_state *st
 	state->start_pc = state->registers[PC];
 
 	/* Find the item to run */
-	index = find_index(state->start_pc);
+	index = find_index(state->start_pc, can_lock);
 
 	finished = 0;
 	if (index->insn != EXIDX_CANTUNWIND) {

Modified: projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
==============================================================================
--- projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_gpio.c	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_gpio.c	Thu Feb 19 21:10:01 2015	(r279023)
@@ -1,6 +1,6 @@
 /*-
- * Copyright (c) 2012 Oleksandr Tymoshenko <gonzo at freebsd.org>
- * Copyright (c) 2012 Luiz Otavio O Souza.
+ * Copyright (c) 2012 Oleksandr Tymoshenko <gonzo at FreeBSD.org>
+ * Copyright (c) 2012-2015 Luiz Otavio O Souza <loos at FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -251,16 +251,14 @@ bcm_gpio_set_function(struct bcm_gpio_so
 static void
 bcm_gpio_set_pud(struct bcm_gpio_softc *sc, uint32_t pin, uint32_t state)
 {
-	uint32_t bank, offset;
+	uint32_t bank;
 
 	/* Must be called with lock held. */
 	BCM_GPIO_LOCK_ASSERT(sc);
 
-	bank = pin / 32;
-	offset = pin - 32 * bank;
-
+	bank = BCM_GPIO_BANK(pin);
 	BCM_GPIO_WRITE(sc, BCM_GPIO_GPPUD(0), state);
-	BCM_GPIO_WRITE(sc, BCM_GPIO_GPPUDCLK(bank), (1 << offset));
+	BCM_GPIO_WRITE(sc, BCM_GPIO_GPPUDCLK(bank), BCM_GPIO_MASK(pin));
 	BCM_GPIO_WRITE(sc, BCM_GPIO_GPPUD(0), 0);
 	BCM_GPIO_WRITE(sc, BCM_GPIO_GPPUDCLK(bank), 0);
 }
@@ -438,29 +436,25 @@ static int
 bcm_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value)
 {
 	struct bcm_gpio_softc *sc = device_get_softc(dev);
-	uint32_t bank, offset;
+	uint32_t bank, reg;
 	int i;
 
 	for (i = 0; i < sc->sc_gpio_npins; i++) {
 		if (sc->sc_gpio_pins[i].gp_pin == pin)
 			break;
 	}
-
 	if (i >= sc->sc_gpio_npins)
 		return (EINVAL);
-
 	/* We never write to read-only/reserved pins. */
 	if (bcm_gpio_pin_is_ro(sc, pin))
 		return (EINVAL);
-
-	bank = pin / 32;
-	offset = pin - 32 * bank;
-
 	BCM_GPIO_LOCK(sc);
+	bank = BCM_GPIO_BANK(pin);
 	if (value)
-		BCM_GPIO_WRITE(sc, BCM_GPIO_GPSET(bank), (1 << offset));
+		reg = BCM_GPIO_GPSET(bank);
 	else
-		BCM_GPIO_WRITE(sc, BCM_GPIO_GPCLR(bank), (1 << offset));
+		reg = BCM_GPIO_GPCLR(bank);
+	BCM_GPIO_WRITE(sc, reg, BCM_GPIO_MASK(pin));
 	BCM_GPIO_UNLOCK(sc);
 
 	return (0);
@@ -470,24 +464,20 @@ static int
 bcm_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *val)
 {
 	struct bcm_gpio_softc *sc = device_get_softc(dev);
-	uint32_t bank, offset, reg_data;
+	uint32_t bank, reg_data;
 	int i;
 
 	for (i = 0; i < sc->sc_gpio_npins; i++) {
 		if (sc->sc_gpio_pins[i].gp_pin == pin)
 			break;
 	}
-
 	if (i >= sc->sc_gpio_npins)
 		return (EINVAL);
-
-	bank = pin / 32;
-	offset = pin - 32 * bank;
-
+	bank = BCM_GPIO_BANK(pin);
 	BCM_GPIO_LOCK(sc);
 	reg_data = BCM_GPIO_READ(sc, BCM_GPIO_GPLEV(bank));
 	BCM_GPIO_UNLOCK(sc);
-	*val = (reg_data & (1 << offset)) ? 1 : 0;
+	*val = (reg_data & BCM_GPIO_MASK(pin)) ? 1 : 0;
 
 	return (0);
 }
@@ -496,30 +486,26 @@ static int
 bcm_gpio_pin_toggle(device_t dev, uint32_t pin)
 {
 	struct bcm_gpio_softc *sc = device_get_softc(dev);
-	uint32_t bank, data, offset;
+	uint32_t bank, data, reg;
 	int i;
 
 	for (i = 0; i < sc->sc_gpio_npins; i++) {
 		if (sc->sc_gpio_pins[i].gp_pin == pin)
 			break;
 	}
-
 	if (i >= sc->sc_gpio_npins)
 		return (EINVAL);
-
 	/* We never write to read-only/reserved pins. */
 	if (bcm_gpio_pin_is_ro(sc, pin))
 		return (EINVAL);
-
-	bank = pin / 32;
-	offset = pin - 32 * bank;
-
 	BCM_GPIO_LOCK(sc);
+	bank = BCM_GPIO_BANK(pin);
 	data = BCM_GPIO_READ(sc, BCM_GPIO_GPLEV(bank));
-	if (data & (1 << offset))
-		BCM_GPIO_WRITE(sc, BCM_GPIO_GPCLR(bank), (1 << offset));
+	if (data & BCM_GPIO_MASK(pin))
+		reg = BCM_GPIO_GPCLR(bank);
 	else
-		BCM_GPIO_WRITE(sc, BCM_GPIO_GPSET(bank), (1 << offset));
+		reg = BCM_GPIO_GPSET(bank);
+	BCM_GPIO_WRITE(sc, reg, BCM_GPIO_MASK(pin));
 	BCM_GPIO_UNLOCK(sc);
 
 	return (0);

Modified: projects/clang360-import/sys/arm/include/stack.h
==============================================================================
--- projects/clang360-import/sys/arm/include/stack.h	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/sys/arm/include/stack.h	Thu Feb 19 21:10:01 2015	(r279023)
@@ -55,6 +55,6 @@ struct unwind_state {
 #define	LR	14
 #define	PC	15
 
-int unwind_stack_one(struct unwind_state *);
+int unwind_stack_one(struct unwind_state *, int);
 
 #endif /* !_MACHINE_STACK_H_ */

Modified: projects/clang360-import/sys/cam/cam_ccb.h
==============================================================================
--- projects/clang360-import/sys/cam/cam_ccb.h	Thu Feb 19 20:58:45 2015	(r279022)
+++ projects/clang360-import/sys/cam/cam_ccb.h	Thu Feb 19 21:10:01 2015	(r279023)
@@ -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 */

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

More information about the svn-src-projects mailing list