svn commit: r259160 - in user/hrs/releng: . bin/sh bin/test cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libdtrace/c...

Hiroki Sato hrs at FreeBSD.org
Tue Dec 10 09:14:19 UTC 2013 

Author: hrs
Date: Tue Dec 10 09:14:11 2013
New Revision: 259160
URL: http://svnweb.freebsd.org/changeset/base/259160

Log:
  Catch up with head.

Added:
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/API/SBPlatform.h
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/include/lldb/API/SBPlatform.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Host/Debug.h
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/include/lldb/Host/Debug.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Target/RegisterCheckpoint.h
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/include/lldb/Target/RegisterCheckpoint.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Utility/Iterable.h
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/include/lldb/Utility/Iterable.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/API/SBPlatform.cpp
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/source/API/SBPlatform.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.cpp
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.h
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.h
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.cpp
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.h
     - copied unchanged from r259159, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.h
  user/hrs/releng/sys/dev/fb/fb_if.m
     - copied unchanged from r259159, head/sys/dev/fb/fb_if.m
  user/hrs/releng/sys/dev/fb/fbd.c
     - copied unchanged from r259159, head/sys/dev/fb/fbd.c
  user/hrs/releng/sys/dev/vt/
     - copied from r259159, head/sys/dev/vt/
  user/hrs/releng/sys/kern/subr_terminal.c
     - copied unchanged from r259159, head/sys/kern/subr_terminal.c
  user/hrs/releng/sys/opencrypto/cryptodeflate.c
     - copied unchanged from r259159, head/sys/opencrypto/cryptodeflate.c
  user/hrs/releng/sys/sys/ktr_class.h
     - copied unchanged from r259159, head/sys/sys/ktr_class.h
  user/hrs/releng/sys/sys/terminal.h
     - copied unchanged from r259159, head/sys/sys/terminal.h
  user/hrs/releng/tools/regression/capsicum/libcapsicum/
     - copied from r259159, head/tools/regression/capsicum/libcapsicum/
  user/hrs/releng/tools/regression/usr.bin/sed/regress.icase4.out
     - copied unchanged from r259159, head/tools/regression/usr.bin/sed/regress.icase4.out
  user/hrs/releng/tools/regression/usr.sbin/etcupdate/tzsetup.sh
     - copied unchanged from r259159, head/tools/regression/usr.sbin/etcupdate/tzsetup.sh
  user/hrs/releng/tools/tools/vt/
     - copied from r259159, head/tools/tools/vt/
Deleted:
  user/hrs/releng/sys/opencrypto/deflate.c
Modified:
  user/hrs/releng/ObsoleteFiles.inc
  user/hrs/releng/bin/sh/eval.c
  user/hrs/releng/bin/test/test.c
  user/hrs/releng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
  user/hrs/releng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
  user/hrs/releng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
  user/hrs/releng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  user/hrs/releng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  user/hrs/releng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  user/hrs/releng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  user/hrs/releng/contrib/gcc/ChangeLog.gcc43
  user/hrs/releng/contrib/gcc/c-common.c
  user/hrs/releng/contrib/gcc/c-common.h
  user/hrs/releng/contrib/gcc/c-opts.c
  user/hrs/releng/contrib/gcc/c-typeck.c
  user/hrs/releng/contrib/gcc/c.opt
  user/hrs/releng/contrib/gcc/config/i386/emmintrin.h
  user/hrs/releng/contrib/gcc/config/i386/i386.c
  user/hrs/releng/contrib/gcc/config/rs6000/altivec.h
  user/hrs/releng/contrib/gcc/config/rs6000/rs6000-c.c
  user/hrs/releng/contrib/gcc/config/rs6000/rs6000.c
  user/hrs/releng/contrib/gcc/cp/ChangeLog.gcc43
  user/hrs/releng/contrib/gcc/cp/call.c
  user/hrs/releng/contrib/gcc/cp/decl.c
  user/hrs/releng/contrib/gcc/cp/decl2.c
  user/hrs/releng/contrib/gcc/cp/typeck.c
  user/hrs/releng/contrib/gcc/doc/invoke.texi
  user/hrs/releng/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp
  user/hrs/releng/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
  user/hrs/releng/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/API/SBDebugger.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/API/SBError.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/API/SBModule.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointList.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Core/Address.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Core/Debugger.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Core/Module.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/DataFormatters/CXXFormatterFunctions.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatCache.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatClasses.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatManager.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatNavigator.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategory.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Expression/ClangFunction.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Expression/ClangUserExpression.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Host/File.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Host/FileSpec.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Host/Host.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Host/OptionParser.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Interpreter/PythonDataObjects.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Symbol/TypeList.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Target/ABI.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Target/LanguageRuntime.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Target/Platform.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Target/Process.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Target/RegisterContext.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Target/SystemRuntime.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Target/Target.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Target/Thread.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Target/ThreadList.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallFunction.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallUserExpression.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/Utility/PythonPointer.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/lldb-enumerations.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/lldb-forward.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/lldb-private-enumerations.h
  user/hrs/releng/contrib/llvm/tools/lldb/include/lldb/lldb-python.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/API/SBDebugger.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/API/SBExpressionOptions.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/API/SBFileSpec.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/API/SBModule.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/API/SBProcess.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/API/SBStream.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/API/SBTarget.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/API/SBThread.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Breakpoint/Breakpoint.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointList.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Commands/CommandObjectMemory.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlatform.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlugin.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Commands/CommandObjectProcess.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Commands/CommandObjectTarget.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Commands/CommandObjectThread.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpoint.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Core/Address.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Core/ConnectionFileDescriptor.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Core/Debugger.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Core/Mangled.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Core/Module.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Core/StreamFile.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Core/ValueObjectSyntheticFilter.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/DataFormatters/FormatClasses.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/DataFormatters/FormatManager.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/DataFormatters/LibCxx.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/DataFormatters/LibStdcpp.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/DataFormatters/NSDictionary.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/DataFormatters/NSSet.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategory.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategoryMap.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Expression/ClangFunction.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Expression/ClangUserExpression.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Expression/Materializer.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Host/common/File.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Host/common/Host.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Host/common/OptionParser.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Interpreter/Args.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Interpreter/CommandInterpreter.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Interpreter/PythonDataObjects.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreterPython.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_x86_64.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Target/Platform.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Target/Process.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Target/RegisterContext.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Target/StackFrameList.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Target/SystemRuntime.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Target/Target.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Target/Thread.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallUserExpression.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepInRange.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Utility/StringExtractor.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.h
  user/hrs/releng/contrib/llvm/tools/lldb/source/lldb.cpp
  user/hrs/releng/contrib/llvm/tools/lldb/tools/lldb-platform/lldb-platform.cpp
  user/hrs/releng/contrib/nvi/cl/cl_term.c
  user/hrs/releng/contrib/nvi/common/key.c
  user/hrs/releng/contrib/nvi/common/key.h
  user/hrs/releng/etc/devd/usb.conf
  user/hrs/releng/etc/gettytab
  user/hrs/releng/etc/mtree/BSD.include.dist
  user/hrs/releng/etc/pf.os
  user/hrs/releng/etc/rc
  user/hrs/releng/etc/rc.d/jail
  user/hrs/releng/etc/services
  user/hrs/releng/games/fortune/fortune/fortune.c
  user/hrs/releng/include/Makefile
  user/hrs/releng/include/rpcsvc/bootparam_prot.x
  user/hrs/releng/include/rpcsvc/key_prot.x
  user/hrs/releng/include/rpcsvc/klm_prot.x
  user/hrs/releng/include/rpcsvc/mount.x
  user/hrs/releng/include/rpcsvc/nfs_prot.x
  user/hrs/releng/include/rpcsvc/nis.x
  user/hrs/releng/include/rpcsvc/nis_callback.x
  user/hrs/releng/include/rpcsvc/nis_object.x
  user/hrs/releng/include/rpcsvc/nis_tags.h
  user/hrs/releng/include/rpcsvc/rex.x
  user/hrs/releng/include/rpcsvc/rnusers.x
  user/hrs/releng/include/rpcsvc/rstat.x
  user/hrs/releng/include/rpcsvc/sm_inter.x
  user/hrs/releng/include/rpcsvc/spray.x
  user/hrs/releng/include/rpcsvc/yp.x
  user/hrs/releng/include/rpcsvc/yppasswd.x
  user/hrs/releng/lib/clang/liblldbAPI/Makefile
  user/hrs/releng/lib/clang/liblldbPluginProcessFreeBSD/Makefile
  user/hrs/releng/lib/clang/liblldbPluginProcessUtility/Makefile
  user/hrs/releng/lib/libc/stdlib/atexit.c
  user/hrs/releng/lib/libc/sys/wait.2
  user/hrs/releng/lib/libc/xdr/xdr.c
  user/hrs/releng/lib/libc/xdr/xdr_array.c
  user/hrs/releng/lib/libc/xdr/xdr_float.c
  user/hrs/releng/lib/libc/xdr/xdr_mem.c
  user/hrs/releng/lib/libc/xdr/xdr_rec.c
  user/hrs/releng/lib/libc/xdr/xdr_reference.c
  user/hrs/releng/lib/libc/xdr/xdr_sizeof.c
  user/hrs/releng/lib/libc/xdr/xdr_stdio.c
  user/hrs/releng/lib/libcapsicum/Makefile
  user/hrs/releng/lib/libcasper/Makefile
  user/hrs/releng/lib/libcasper/libcasper.c
  user/hrs/releng/libexec/rtld-elf/rtld.c
  user/hrs/releng/libexec/rtld-elf/rtld.h
  user/hrs/releng/libexec/rtld-elf/xmalloc.c
  user/hrs/releng/release/Makefile
  user/hrs/releng/release/doc/en_US.ISO8859-1/relnotes/article.xml
  user/hrs/releng/release/release.conf.sample
  user/hrs/releng/release/scripts/pkg-stage.sh
  user/hrs/releng/sbin/casperd/casperd.8
  user/hrs/releng/sbin/casperd/casperd.c
  user/hrs/releng/sbin/mdconfig/mdconfig.8
  user/hrs/releng/sbin/mdconfig/mdconfig.c
  user/hrs/releng/sbin/mount_nfs/mount_nfs.8
  user/hrs/releng/sbin/route/route.c
  user/hrs/releng/share/man/man4/run.4
  user/hrs/releng/share/man/man5/src.conf.5
  user/hrs/releng/share/man/man7/development.7
  user/hrs/releng/share/man/man7/release.7
  user/hrs/releng/share/mk/bsd.sys.mk
  user/hrs/releng/sys/amd64/amd64/machdep.c
  user/hrs/releng/sys/amd64/include/apicvar.h
  user/hrs/releng/sys/amd64/include/vmm.h   (contents, props changed)
  user/hrs/releng/sys/amd64/vmm/intel/vmx.c
  user/hrs/releng/sys/amd64/vmm/io/vlapic.c
  user/hrs/releng/sys/amd64/vmm/io/vlapic.h
  user/hrs/releng/sys/amd64/vmm/vmm.c
  user/hrs/releng/sys/amd64/vmm/vmm_lapic.c
  user/hrs/releng/sys/amd64/vmm/vmm_lapic.h
  user/hrs/releng/sys/arm/at91/at91_machdep.c
  user/hrs/releng/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
  user/hrs/releng/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
  user/hrs/releng/sys/arm/rockchip/rk30xx_gpio.c
  user/hrs/releng/sys/arm/ti/am335x/am335x_dmtimer.c
  user/hrs/releng/sys/arm/ti/am335x/am335x_scm_padconf.c
  user/hrs/releng/sys/arm/ti/ti_gpio.c
  user/hrs/releng/sys/arm/ti/ti_i2c.c
  user/hrs/releng/sys/boot/fdt/dts/rk3188.dtsi
  user/hrs/releng/sys/cam/ctl/ctl_backend_block.c
  user/hrs/releng/sys/cam/scsi/scsi_all.c
  user/hrs/releng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  user/hrs/releng/sys/conf/files
  user/hrs/releng/sys/conf/files.amd64
  user/hrs/releng/sys/conf/files.arm
  user/hrs/releng/sys/conf/files.i386
  user/hrs/releng/sys/conf/files.powerpc
  user/hrs/releng/sys/conf/files.sparc64
  user/hrs/releng/sys/conf/kern.mk
  user/hrs/releng/sys/conf/kmod.mk
  user/hrs/releng/sys/conf/options
  user/hrs/releng/sys/dev/cxgbe/adapter.h
  user/hrs/releng/sys/dev/cxgbe/common/common.h
  user/hrs/releng/sys/dev/cxgbe/common/t4_hw.c
  user/hrs/releng/sys/dev/cxgbe/t4_ioctl.h
  user/hrs/releng/sys/dev/cxgbe/t4_main.c
  user/hrs/releng/sys/dev/cxgbe/t4_sge.c
  user/hrs/releng/sys/dev/drm2/drm_fb_helper.c
  user/hrs/releng/sys/dev/drm2/drm_os_freebsd.h
  user/hrs/releng/sys/dev/drm2/drm_pci.c
  user/hrs/releng/sys/dev/drm2/i915/i915_drv.c
  user/hrs/releng/sys/dev/drm2/i915/intel_fb.c
  user/hrs/releng/sys/dev/drm2/radeon/atombios_dp.c
  user/hrs/releng/sys/dev/drm2/radeon/radeon.h
  user/hrs/releng/sys/dev/drm2/radeon/radeon_agp.c
  user/hrs/releng/sys/dev/drm2/radeon/radeon_drv.c
  user/hrs/releng/sys/dev/drm2/radeon/radeon_fb.c
  user/hrs/releng/sys/dev/drm2/radeon/radeon_pm.c
  user/hrs/releng/sys/dev/gpio/gpioiic.c
  user/hrs/releng/sys/dev/gpio/gpioled.c
  user/hrs/releng/sys/dev/iicbus/ds1631.c
  user/hrs/releng/sys/dev/iicbus/ds1775.c
  user/hrs/releng/sys/dev/iicbus/max6690.c
  user/hrs/releng/sys/dev/iwn/if_iwn.c
  user/hrs/releng/sys/dev/iwn/if_iwn_chip_cfg.h
  user/hrs/releng/sys/dev/iwn/if_iwnreg.h
  user/hrs/releng/sys/dev/iwn/if_iwnvar.h
  user/hrs/releng/sys/dev/md/md.c
  user/hrs/releng/sys/dev/oce/oce_if.c
  user/hrs/releng/sys/dev/oce/oce_if.h
  user/hrs/releng/sys/dev/oce/oce_mbox.c
  user/hrs/releng/sys/dev/oce/oce_sysctl.c
  user/hrs/releng/sys/dev/usb/controller/usb_controller.c
  user/hrs/releng/sys/dev/usb/controller/xhci.c
  user/hrs/releng/sys/dev/usb/usb_bus.h
  user/hrs/releng/sys/dev/usb/usb_busdma.c
  user/hrs/releng/sys/dev/usb/usb_controller.h
  user/hrs/releng/sys/dev/usb/usbdevs
  user/hrs/releng/sys/dev/usb/wlan/if_rsu.c
  user/hrs/releng/sys/dev/usb/wlan/if_rum.c
  user/hrs/releng/sys/dev/usb/wlan/if_run.c
  user/hrs/releng/sys/dev/usb/wlan/if_runreg.h
  user/hrs/releng/sys/dev/usb/wlan/if_runvar.h
  user/hrs/releng/sys/dev/usb/wlan/if_ural.c
  user/hrs/releng/sys/dev/usb/wlan/if_urtw.c
  user/hrs/releng/sys/fs/ext2fs/ext2_dinode.h
  user/hrs/releng/sys/fs/nfsclient/nfs_clbio.c
  user/hrs/releng/sys/fs/nfsclient/nfs_clvfsops.c
  user/hrs/releng/sys/fs/nfsclient/nfs_clvnops.c
  user/hrs/releng/sys/fs/nfsclient/nfsnode.h
  user/hrs/releng/sys/i386/conf/GENERIC
  user/hrs/releng/sys/i386/conf/NOTES
  user/hrs/releng/sys/i386/i386/machdep.c
  user/hrs/releng/sys/i386/include/apicvar.h
  user/hrs/releng/sys/kern/kern_mib.c
  user/hrs/releng/sys/kern/kern_shutdown.c
  user/hrs/releng/sys/kern/makesyscalls.sh
  user/hrs/releng/sys/kern/sched_ule.c
  user/hrs/releng/sys/modules/Makefile
  user/hrs/releng/sys/modules/crypto/Makefile
  user/hrs/releng/sys/modules/drm2/i915kms/Makefile
  user/hrs/releng/sys/modules/drm2/radeonkms/Makefile
  user/hrs/releng/sys/modules/iwnfw/iwn6000g2b/Makefile
  user/hrs/releng/sys/modules/usb/Makefile
  user/hrs/releng/sys/nfsclient/nfsargs.h
  user/hrs/releng/sys/pc98/pc98/machdep.c
  user/hrs/releng/sys/powerpc/fpu/fpu_emu.c
  user/hrs/releng/sys/powerpc/include/fdt.h
  user/hrs/releng/sys/powerpc/include/pmap.h
  user/hrs/releng/sys/powerpc/powermac/platform_powermac.c
  user/hrs/releng/sys/powerpc/powerpc/platform.c
  user/hrs/releng/sys/powerpc/pseries/platform_chrp.c
  user/hrs/releng/sys/powerpc/wii/platform_wii.c
  user/hrs/releng/sys/security/audit/audit_bsm_klib.c
  user/hrs/releng/sys/sparc64/sparc64/machdep.c
  user/hrs/releng/sys/sys/consio.h
  user/hrs/releng/sys/sys/eventhandler.h
  user/hrs/releng/sys/sys/fbio.h
  user/hrs/releng/sys/sys/ktr.h
  user/hrs/releng/sys/sys/lock.h
  user/hrs/releng/sys/sys/mdioctl.h
  user/hrs/releng/sys/sys/tty.h
  user/hrs/releng/sys/teken/teken.c
  user/hrs/releng/sys/teken/teken.h
  user/hrs/releng/sys/teken/teken_subr.h
  user/hrs/releng/sys/vm/vm_page.c
  user/hrs/releng/sys/vm/vm_radix.c
  user/hrs/releng/sys/vm/vm_radix.h
  user/hrs/releng/sys/x86/acpica/madt.c
  user/hrs/releng/sys/x86/include/apicreg.h
  user/hrs/releng/sys/x86/include/mptable.h
  user/hrs/releng/sys/x86/x86/local_apic.c
  user/hrs/releng/sys/x86/x86/mptable.c
  user/hrs/releng/tools/build/options/WITHOUT_PKGBOOTSTRAP
  user/hrs/releng/tools/regression/usr.bin/sed/regress.sh
  user/hrs/releng/tools/regression/usr.sbin/etcupdate/preworld.sh
  user/hrs/releng/tools/regression/usr.sbin/etcupdate/tests.sh
  user/hrs/releng/tools/test/dtrace/Makefile
  user/hrs/releng/tools/tools/cxgbetool/cxgbetool.c
  user/hrs/releng/usr.bin/bc/bc.1
  user/hrs/releng/usr.bin/bc/bc.y
  user/hrs/releng/usr.bin/calendar/calcpp.c
  user/hrs/releng/usr.bin/script/script.1
  user/hrs/releng/usr.bin/script/script.c
  user/hrs/releng/usr.bin/sed/compile.c
  user/hrs/releng/usr.bin/sed/sed.1
  user/hrs/releng/usr.bin/yacc/Makefile
  user/hrs/releng/usr.sbin/bhyve/bhyverun.c
  user/hrs/releng/usr.sbin/bhyve/mptbl.c
  user/hrs/releng/usr.sbin/bhyveload/bhyveload.8
  user/hrs/releng/usr.sbin/bsdconfig/console/console
  user/hrs/releng/usr.sbin/bsdconfig/console/font
  user/hrs/releng/usr.sbin/bsdconfig/console/keymap
  user/hrs/releng/usr.sbin/bsdconfig/console/repeat
  user/hrs/releng/usr.sbin/bsdconfig/console/saver
  user/hrs/releng/usr.sbin/bsdconfig/console/screenmap
  user/hrs/releng/usr.sbin/bsdconfig/console/ttys
  user/hrs/releng/usr.sbin/bsdconfig/diskmgmt/diskmgmt
  user/hrs/releng/usr.sbin/bsdconfig/docsinstall/docsinstall
  user/hrs/releng/usr.sbin/bsdconfig/dot/dot
  user/hrs/releng/usr.sbin/bsdconfig/includes/includes
  user/hrs/releng/usr.sbin/bsdconfig/mouse/disable
  user/hrs/releng/usr.sbin/bsdconfig/mouse/enable
  user/hrs/releng/usr.sbin/bsdconfig/mouse/flags
  user/hrs/releng/usr.sbin/bsdconfig/mouse/mouse
  user/hrs/releng/usr.sbin/bsdconfig/mouse/port
  user/hrs/releng/usr.sbin/bsdconfig/mouse/type
  user/hrs/releng/usr.sbin/bsdconfig/networking/defaultrouter
  user/hrs/releng/usr.sbin/bsdconfig/networking/devices
  user/hrs/releng/usr.sbin/bsdconfig/networking/hostname
  user/hrs/releng/usr.sbin/bsdconfig/networking/nameservers
  user/hrs/releng/usr.sbin/bsdconfig/networking/networking
  user/hrs/releng/usr.sbin/bsdconfig/networking/share/device.subr
  user/hrs/releng/usr.sbin/bsdconfig/networking/share/hostname.subr
  user/hrs/releng/usr.sbin/bsdconfig/networking/share/ipaddr.subr
  user/hrs/releng/usr.sbin/bsdconfig/networking/share/media.subr
  user/hrs/releng/usr.sbin/bsdconfig/networking/share/netmask.subr
  user/hrs/releng/usr.sbin/bsdconfig/networking/share/resolv.subr
  user/hrs/releng/usr.sbin/bsdconfig/networking/share/routing.subr
  user/hrs/releng/usr.sbin/bsdconfig/networking/share/services.subr
  user/hrs/releng/usr.sbin/bsdconfig/packages/packages
  user/hrs/releng/usr.sbin/bsdconfig/password/password
  user/hrs/releng/usr.sbin/bsdconfig/security/kern_securelevel
  user/hrs/releng/usr.sbin/bsdconfig/security/security
  user/hrs/releng/usr.sbin/bsdconfig/share/common.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/device.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/dialog.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/keymap.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/media/cdrom.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/media/common.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/media/dos.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/media/floppy.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/media/ftp.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/media/nfs.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/media/tcpip.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/media/ufs.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/media/usb.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/mustberoot.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/packages/categories.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/packages/index.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/packages/packages.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/strings.subr
  user/hrs/releng/usr.sbin/bsdconfig/share/sysrc.subr
  user/hrs/releng/usr.sbin/bsdconfig/startup/misc
  user/hrs/releng/usr.sbin/bsdconfig/startup/rcadd
  user/hrs/releng/usr.sbin/bsdconfig/startup/rcconf
  user/hrs/releng/usr.sbin/bsdconfig/startup/rcdelete
  user/hrs/releng/usr.sbin/bsdconfig/startup/rcedit
  user/hrs/releng/usr.sbin/bsdconfig/startup/rcvar
  user/hrs/releng/usr.sbin/bsdconfig/startup/share/rcconf.subr
  user/hrs/releng/usr.sbin/bsdconfig/startup/share/rcedit.subr
  user/hrs/releng/usr.sbin/bsdconfig/startup/share/rcvar.subr
  user/hrs/releng/usr.sbin/bsdconfig/startup/startup
  user/hrs/releng/usr.sbin/bsdconfig/timezone/share/zones.subr
  user/hrs/releng/usr.sbin/bsdconfig/timezone/timezone
  user/hrs/releng/usr.sbin/bsdconfig/ttys/ttys
  user/hrs/releng/usr.sbin/bsdconfig/usermgmt/groupadd
  user/hrs/releng/usr.sbin/bsdconfig/usermgmt/groupdel
  user/hrs/releng/usr.sbin/bsdconfig/usermgmt/groupedit
  user/hrs/releng/usr.sbin/bsdconfig/usermgmt/groupinput
  user/hrs/releng/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
  user/hrs/releng/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
  user/hrs/releng/usr.sbin/bsdconfig/usermgmt/useradd
  user/hrs/releng/usr.sbin/bsdconfig/usermgmt/userdel
  user/hrs/releng/usr.sbin/bsdconfig/usermgmt/useredit
  user/hrs/releng/usr.sbin/bsdconfig/usermgmt/userinput
  user/hrs/releng/usr.sbin/bsdconfig/usermgmt/usermgmt
  user/hrs/releng/usr.sbin/bsdinstall/bsdinstall
  user/hrs/releng/usr.sbin/bsdinstall/scripts/services
  user/hrs/releng/usr.sbin/bsdinstall/scripts/zfsboot
  user/hrs/releng/usr.sbin/etcupdate/etcupdate.8
  user/hrs/releng/usr.sbin/etcupdate/etcupdate.sh
  user/hrs/releng/usr.sbin/mfiutil/mfi_show.c
  user/hrs/releng/usr.sbin/mtest/mtest.8
Directory Properties:
  user/hrs/releng/   (props changed)
  user/hrs/releng/cddl/   (props changed)
  user/hrs/releng/cddl/contrib/opensolaris/   (props changed)
  user/hrs/releng/contrib/gcc/   (props changed)
  user/hrs/releng/contrib/llvm/   (props changed)
  user/hrs/releng/contrib/llvm/tools/clang/   (props changed)
  user/hrs/releng/contrib/llvm/tools/lldb/   (props changed)
  user/hrs/releng/contrib/nvi/   (props changed)
  user/hrs/releng/etc/   (props changed)
  user/hrs/releng/include/   (props changed)
  user/hrs/releng/lib/libc/   (props changed)
  user/hrs/releng/sbin/   (props changed)
  user/hrs/releng/share/man/man4/   (props changed)
  user/hrs/releng/sys/   (props changed)
  user/hrs/releng/sys/amd64/vmm/   (props changed)
  user/hrs/releng/sys/boot/   (props changed)
  user/hrs/releng/sys/cddl/contrib/opensolaris/   (props changed)
  user/hrs/releng/sys/conf/   (props changed)
  user/hrs/releng/usr.bin/calendar/   (props changed)
  user/hrs/releng/usr.sbin/bhyve/   (props changed)
  user/hrs/releng/usr.sbin/bhyveload/   (props changed)

Modified: user/hrs/releng/ObsoleteFiles.inc
==============================================================================
--- user/hrs/releng/ObsoleteFiles.inc	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/ObsoleteFiles.inc	Tue Dec 10 09:14:11 2013	(r259160)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131202: libcapsicum and libcasper moved to /lib/
+OLD_LIBS+=usr/lib/libcapsicum.so.0
+OLD_LIBS+=usr/lib/libcasper.so.0
 # 20131109: extattr(2) mlinks fixed
 OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz
 OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz

Modified: user/hrs/releng/bin/sh/eval.c
==============================================================================
--- user/hrs/releng/bin/sh/eval.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/bin/sh/eval.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -750,6 +750,45 @@ isdeclarationcmd(struct narg *arg)
 		(have_command || !isfunc("local"))));
 }
 
+static void
+xtracecommand(struct arglist *varlist, struct arglist *arglist)
+{
+	struct strlist *sp;
+	char sep = 0;
+	const char *p, *ps4;
+
+	ps4 = expandstr(ps4val());
+	out2str(ps4 != NULL ? ps4 : ps4val());
+	for (sp = varlist->list ; sp ; sp = sp->next) {
+		if (sep != 0)
+			out2c(' ');
+		p = strchr(sp->text, '=');
+		if (p != NULL) {
+			p++;
+			outbin(sp->text, p - sp->text, out2);
+			out2qstr(p);
+		} else
+			out2qstr(sp->text);
+		sep = ' ';
+	}
+	for (sp = arglist->list ; sp ; sp = sp->next) {
+		if (sep != 0)
+			out2c(' ');
+		/* Disambiguate command looking like assignment. */
+		if (sp == arglist->list &&
+				strchr(sp->text, '=') != NULL &&
+				strchr(sp->text, '\'') == NULL) {
+			out2c('\'');
+			out2str(sp->text);
+			out2c('\'');
+		} else
+			out2qstr(sp->text);
+		sep = ' ';
+	}
+	out2c('\n');
+	flushout(&errout);
+}
+
 /*
  * Check if a builtin can safely be executed in the same process,
  * even though it should be in a subshell (command substitution).
@@ -847,40 +886,8 @@ evalcommand(union node *cmd, int flags, 
 	argv -= argc;
 
 	/* Print the command if xflag is set. */
-	if (xflag) {
-		char sep = 0;
-		const char *p, *ps4;
-		ps4 = expandstr(ps4val());
-		out2str(ps4 != NULL ? ps4 : ps4val());
-		for (sp = varlist.list ; sp ; sp = sp->next) {
-			if (sep != 0)
-				out2c(' ');
-			p = strchr(sp->text, '=');
-			if (p != NULL) {
-				p++;
-				outbin(sp->text, p - sp->text, out2);
-				out2qstr(p);
-			} else
-				out2qstr(sp->text);
-			sep = ' ';
-		}
-		for (sp = arglist.list ; sp ; sp = sp->next) {
-			if (sep != 0)
-				out2c(' ');
-			/* Disambiguate command looking like assignment. */
-			if (sp == arglist.list &&
-					strchr(sp->text, '=') != NULL &&
-					strchr(sp->text, '\'') == NULL) {
-				out2c('\'');
-				out2str(sp->text);
-				out2c('\'');
-			} else
-				out2qstr(sp->text);
-			sep = ' ';
-		}
-		out2c('\n');
-		flushout(&errout);
-	}
+	if (xflag)
+		xtracecommand(&varlist, &arglist);
 
 	/* Now locate the command. */
 	if (argc == 0) {

Modified: user/hrs/releng/bin/test/test.c
==============================================================================
--- user/hrs/releng/bin/test/test.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/bin/test/test.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -172,7 +172,7 @@ static char **t_wp;
 static int parenlevel;
 
 static int	aexpr(enum token);
-static int	binop(void);
+static int	binop(enum token);
 static int	equalf(const char *, const char *);
 static int	filstat(char *, enum token);
 static int	getn(const char *);
@@ -312,21 +312,20 @@ primary(enum token n)
 		}
 	}
 
-	if (TOKEN_TYPE(t_lex(nargc > 0 ? t_wp[1] : NULL)) == BINOP)
-		return binop();
+	nn = t_lex(nargc > 0 ? t_wp[1] : NULL);
+	if (TOKEN_TYPE(nn) == BINOP)
+		return binop(nn);
 
 	return strlen(*t_wp) > 0;
 }
 
 static int
-binop(void)
+binop(enum token n)
 {
 	const char *opnd1, *op, *opnd2;
-	enum token n;
 
 	opnd1 = *t_wp;
-	op = nargc > 0 ? t_wp[1] : NULL;
-	n = t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL);
+	op = nargc > 0 ? (--nargc, *++t_wp) : NULL;
 
 	if ((opnd2 = nargc > 0 ? (--nargc, *++t_wp) : NULL) == NULL)
 		syntax(op, "argument expected");

Modified: user/hrs/releng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
==============================================================================
--- user/hrs/releng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh	Tue Dec 10 09:14:11 2013	(r259160)
@@ -64,7 +64,7 @@ child=$!
 # ksh doing work.  (This actually goes one step further and assumes that we
 # catch some non-static function in ksh.)
 #
-script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null
+script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' > /dev/null
 status=$? 
 
 kill $child

Modified: user/hrs/releng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
==============================================================================
--- user/hrs/releng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh	Tue Dec 10 09:14:11 2013	(r259160)
@@ -62,7 +62,7 @@ child=$!
 #
 # The only thing we can be sure of here is that ksh is doing some work.
 #
-script | tee /dev/fd/2 | grep -w ksh > /dev/null
+script | tee /dev/fd/2 | egrep -w 'ksh(93)?' > /dev/null
 status=$? 
 
 kill $child

Modified: user/hrs/releng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
==============================================================================
--- user/hrs/releng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh	Tue Dec 10 09:14:11 2013	(r259160)
@@ -63,7 +63,7 @@ child=$!
 # This test is essentially the same as that in the ufunc test; see that
 # test for the rationale.
 #
-script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null
+script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' > /dev/null
 status=$? 
 
 kill $child

Modified: user/hrs/releng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
==============================================================================
--- user/hrs/releng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Tue Dec 10 09:14:11 2013	(r259160)
@@ -259,7 +259,7 @@ configuration.
 .El
 .Pp
 This features allows ZFS to maintain more information about how free space
-is organized within the pool. If this feature is 
+is organized within the pool. If this feature is
 .Sy enabled ,
 ZFS will
 set this feature to

Modified: user/hrs/releng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- user/hrs/releng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -1702,6 +1702,12 @@ show_import(nvlist_t *config)
 		    "resilvered.\n"));
 		break;
 
+	case ZPOOL_STATUS_NON_NATIVE_ASHIFT:
+		(void) printf(gettext("status: One or more devices were "
+		    "configured to use a non-native block size.\n"
+		    "\tExpect reduced performance.\n"));
+		break;
+
 	default:
 		/*
 		 * No other status can be seen when importing pools.

Modified: user/hrs/releng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- user/hrs/releng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -1709,8 +1709,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		 */
 		return (0);
 	}
-	/* XXX Should get a temp file name here. */
-	snprintf(tfile, sizeof(tfile), "%s.tmp", file);
 #endif
 
 	/*
@@ -1785,9 +1783,11 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		    "failed to open %s: %s", file, strerror(errno)));
 	}
 #else
-	if ((fd = open(tfile, O_RDWR | O_CREAT | O_TRUNC, 0666)) == -1)
+	snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file);
+	if ((fd = mkstemp(tfile)) == -1)
 		return (dt_link_error(dtp, NULL, -1, NULL,
-		    "failed to open %s: %s", tfile, strerror(errno)));
+		    "failed to create temporary file %s: %s",
+		    tfile, strerror(errno)));
 #endif
 
 	/*
@@ -1830,13 +1830,15 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		status = dump_elf32(dtp, dof, fd);
 
 	if (status != 0 || lseek(fd, 0, SEEK_SET) != 0) {
-#else
-	/* We don't write the ELF header, just the DOF section */
-	if (dt_write(dtp, fd, dof, dof->dofh_filesz) < dof->dofh_filesz) {
-#endif
 		return (dt_link_error(dtp, NULL, -1, NULL,
 		    "failed to write %s: %s", file, strerror(errno)));
 	}
+#else
+	/* We don't write the ELF header, just the DOF section */
+	if (dt_write(dtp, fd, dof, dof->dofh_filesz) < dof->dofh_filesz)
+		return (dt_link_error(dtp, NULL, -1, NULL,
+		    "failed to write %s: %s", tfile, strerror(errno)));
+#endif
 
 	if (!dtp->dt_lazyload) {
 #if defined(sun)

Modified: user/hrs/releng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- user/hrs/releng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -487,22 +487,16 @@ static const dt_ident_t _dtrace_globals[
 	DT_VERS_1_0, &dt_idops_func, "void(...)" },
 { "typeref", DT_IDENT_FUNC, 0, DIF_SUBR_TYPEREF, DT_ATTR_STABCMN, DT_VERS_1_1,
 	&dt_idops_func, "uintptr_t *(void *, size_t, string, size_t)" },
-#if defined(sun)
 { "uaddr", DT_IDENT_ACTFUNC, 0, DT_ACT_UADDR, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
-#endif
 { "ucaller", DT_IDENT_SCALAR, 0, DIF_VAR_UCALLER, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_type, "uint64_t" },
-#if defined(sun)
 { "ufunc", DT_IDENT_ACTFUNC, 0, DT_ACT_USYM, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
-#endif
 { "uid", DT_IDENT_SCALAR, 0, DIF_VAR_UID, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_type, "uid_t" },
-#if defined(sun)
 { "umod", DT_IDENT_ACTFUNC, 0, DT_ACT_UMOD, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
-#endif
 { "uregs", DT_IDENT_ARRAY, 0, DIF_VAR_UREGS, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_regs, NULL },
 { "ustack", DT_IDENT_ACTFUNC, 0, DT_ACT_USTACK, DT_ATTR_STABCMN, DT_VERS_1_0,
@@ -510,10 +504,8 @@ static const dt_ident_t _dtrace_globals[
 { "ustackdepth", DT_IDENT_SCALAR, 0, DIF_VAR_USTACKDEPTH,
 	DT_ATTR_STABCMN, DT_VERS_1_2,
 	&dt_idops_type, "uint32_t" },
-#if defined(sun)
 { "usym", DT_IDENT_ACTFUNC, 0, DT_ACT_USYM, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
-#endif
 { "vtimestamp", DT_IDENT_SCALAR, 0, DIF_VAR_VTIMESTAMP,
 	DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_type, "uint64_t" },

Modified: user/hrs/releng/contrib/gcc/ChangeLog.gcc43
==============================================================================
--- user/hrs/releng/contrib/gcc/ChangeLog.gcc43	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/ChangeLog.gcc43	Tue Dec 10 09:14:11 2013	(r259160)
@@ -45,18 +45,40 @@
 	* flags.h (force_align_functions_log): Delete.
 	* toplev.c (force_align_functions_log): Delete.
 
+2007-06-28  Geoffrey Keating  <geoffk at apple.com> (r126088)
+
+	* doc/invoke.texi (C++ Dialect Options): Document
+	fvisibility-ms-compat.
+	* c.opt (fvisibility-ms-compat): New.
+
 2007-06-05  Joerg Wunsch  <j.gnu at uriah.heep.sax.de> (r125346)
 
 	PR preprocessor/23479
 	* doc/extend.texi: Document the 0b-prefixed binary integer
 	constant extension.
 	
-2007-05-31  Eric Christopher  <echristo at apple.com>
+2007-05-31  Eric Christopher  <echristo at apple.com> (r125246)
 
 	* expr.c (convert_move): Assert that we don't have a BLKmode
 	operand.
 	(store_expr): Handle BLKmode moves by calling emit_block_move.
 
+2007-05-31  Daniel Berlin  <dberlin at dberlin.org> (r125239)
+
+	* c-typeck.c (build_indirect_ref): Include type in error message.
+	(build_binary_op): Pass types to binary_op_error.
+	* c-common.c (binary_op_error): Take two type arguments, print out
+	types with error.
+	* c-common.h (binary_op_error): Update prototype.
+
+2007-05-27  Eric Christopher  <echristo at apple.com> (r125116)
+
+	* config/rs6000/rs6000.c (rs6000_emit_prologue): Update
+	sp_offset depending on stack size. Save r12 depending
+	on registers we're saving later.
+	(rs6000_emit_epilogue): Update sp_offset depending only
+	on stack size.
+
 2007-05-24  Richard Sandiford  <rsandifo at nildram.co.uk> (r125037)
 
 	* postreload-gcse.c (reg_changed_after_insn_p): New function.
@@ -381,6 +403,36 @@
 
 	* config.gcc: Support core2 processor.
 
+2007-01-11  Joseph Myers  <joseph at codesourcery.com> (r120688)
+
+	* c-common.c (vector_types_convertible_p): Treat opaque types as
+	always convertible if they have the same size, but not otherwise.
+
+2007-01-08  Mark Shinwell  <shinwell at codesourcery.com> (r120572)
+
+	* c.opt: Add -flax-vector-conversions.
+	* c-typeck.c (convert_for_assignment): Pass flag to
+	vector_types_convertible_p to allow emission of note.
+	(digest_init): Likewise.
+	* c-opts.c: Handle -flax-vector-conversions.
+	* c-common.c (flag_lax_vector_conversions): New.
+	(vector_types_convertible_p): Unless -flax-vector conversions
+	has been passed, disallow conversions between vectors with
+	differing numbers of subparts and/or element types.  If such
+	a conversion is disallowed, possibly emit a note on the first
+	occasion only to inform the user of -flax-vector-conversions.
+	The new last argument specifies this.
+	* c-common.h (flag_lax_vector_conversions): New.
+	(vector_types_convertible_p): Add extra argument.
+	* config/i386/i386.c (ix86_init_mmx_sse_builtins): Use
+	char_type_node for V*QI type vectors.
+	* config/rs6000/rs6000-c.c (altivec_overloaded_builtins):
+	Update to satisfy new typechecking rules.
+	* config/rs6000/altivec.h (vec_cmple): Use vec_cmpge, for both
+	C and C++ variants.
+	* doc/invoke.texi (C Dialect Options): Document
+	-flax-vector-conversions.
+
 2007-01-05  Manuel Lopez-Ibanez  <manu at gcc.gnu.org> (r120505)
 
 	PR c/19978

Modified: user/hrs/releng/contrib/gcc/c-common.c
==============================================================================
--- user/hrs/releng/contrib/gcc/c-common.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/c-common.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -254,6 +254,10 @@ int flag_short_double;
 
 int flag_short_wchar;
 
+/* Nonzero means allow implicit conversions between vectors with
+   differing numbers of subparts and/or differing element types.  */
+int flag_lax_vector_conversions;
+
 /* Nonzero means allow Microsoft extensions without warnings or errors.  */
 int flag_ms_extensions;
 
@@ -1095,18 +1099,45 @@ constant_fits_type_p (tree c, tree type)
   return !TREE_OVERFLOW (c);
 }
 
-/* Nonzero if vector types T1 and T2 can be converted to each other
-   without an explicit cast.  */
-int
-vector_types_convertible_p (tree t1, tree t2)
+
+/* True if vector types T1 and T2 can be converted to each other
+   without an explicit cast.  If EMIT_LAX_NOTE is true, and T1 and T2
+   can only be converted with -flax-vector-conversions yet that is not
+   in effect, emit a note telling the user about that option if such
+   a note has not previously been emitted.  */
+bool
+vector_types_convertible_p (tree t1, tree t2, bool emit_lax_note)
 {
-  return targetm.vector_opaque_p (t1)
-	 || targetm.vector_opaque_p (t2)
-	 || (tree_int_cst_equal (TYPE_SIZE (t1), TYPE_SIZE (t2))
-	     && (TREE_CODE (TREE_TYPE (t1)) != REAL_TYPE ||
-		 TYPE_PRECISION (t1) == TYPE_PRECISION (t2))
-	     && INTEGRAL_TYPE_P (TREE_TYPE (t1))
-		== INTEGRAL_TYPE_P (TREE_TYPE (t2)));
+  static bool emitted_lax_note = false;
+  bool convertible_lax;
+
+  if ((targetm.vector_opaque_p (t1) || targetm.vector_opaque_p (t2))
+      && tree_int_cst_equal (TYPE_SIZE (t1), TYPE_SIZE (t2)))
+    return true;
+
+  convertible_lax =
+    (tree_int_cst_equal (TYPE_SIZE (t1), TYPE_SIZE (t2))
+     && (TREE_CODE (TREE_TYPE (t1)) != REAL_TYPE ||
+	 TYPE_PRECISION (t1) == TYPE_PRECISION (t2))
+     && (INTEGRAL_TYPE_P (TREE_TYPE (t1))
+	 == INTEGRAL_TYPE_P (TREE_TYPE (t2))));
+
+  if (!convertible_lax || flag_lax_vector_conversions)
+    return convertible_lax;
+
+  if (TYPE_VECTOR_SUBPARTS (t1) == TYPE_VECTOR_SUBPARTS (t2)
+      && comptypes (TREE_TYPE (t1), TREE_TYPE (t2)))
+    return true;
+
+  if (emit_lax_note && !emitted_lax_note)
+    {
+      emitted_lax_note = true;
+      inform ("use -flax-vector-conversions to permit "
+              "conversions between vectors with differing "
+              "element types or numbers of subparts");
+    }
+
+  return false;
 }
 
 /* Convert EXPR to TYPE, warning about conversion problems with constants.
@@ -1988,10 +2019,10 @@ min_precision (tree value, int unsignedp
 }
 

 /* Print an error message for invalid operands to arith operation
-   CODE.  */
+   CODE with TYPE0 for operand 0, and TYPE1 for operand 1.  */
 
 void
-binary_op_error (enum tree_code code)
+binary_op_error (enum tree_code code, tree type0, tree type1)
 {
   const char *opname;
 
@@ -2042,7 +2073,8 @@ binary_op_error (enum tree_code code)
     default:
       gcc_unreachable ();
     }
-  error ("invalid operands to binary %s", opname);
+  error ("invalid operands to binary %s (have %qT and %qT)", opname,
+	 type0, type1);
 }
 

 /* Subroutine of build_binary_op, used for comparison operations.

Modified: user/hrs/releng/contrib/gcc/c-common.h
==============================================================================
--- user/hrs/releng/contrib/gcc/c-common.h	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/c-common.h	Tue Dec 10 09:14:11 2013	(r259160)
@@ -389,6 +389,10 @@ extern int flag_short_double;
 
 extern int flag_short_wchar;
 
+/* Nonzero means allow implicit conversions between vectors with
+   differing numbers of subparts and/or differing element types.  */
+extern int flag_lax_vector_conversions;
+
 /* Nonzero means allow Microsoft extensions without warnings or errors.  */
 extern int flag_ms_extensions;
 
@@ -650,7 +654,7 @@ extern tree c_sizeof_or_alignof_type (tr
 extern tree c_alignof_expr (tree);
 /* Print an error message for invalid operands to arith operation CODE.
    NOP_EXPR is used as a special case (see truthvalue_conversion).  */
-extern void binary_op_error (enum tree_code);
+extern void binary_op_error (enum tree_code, tree, tree);
 extern tree fix_string_type (tree);
 struct varray_head_tag;
 extern void constant_expression_warning (tree);
@@ -791,7 +795,7 @@ extern tree finish_label_address_expr (t
 extern tree lookup_label (tree);
 extern tree lookup_name (tree);
 
-extern int vector_types_convertible_p (tree t1, tree t2);
+extern bool vector_types_convertible_p (tree t1, tree t2, bool emit_lax_note);
 
 extern rtx c_expand_expr (tree, rtx, enum machine_mode, int, rtx *);
 

Modified: user/hrs/releng/contrib/gcc/c-opts.c
==============================================================================
--- user/hrs/releng/contrib/gcc/c-opts.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/c-opts.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -710,6 +710,10 @@ c_common_handle_option (size_t scode, co
       flag_implicit_templates = value;
       break;
 
+    case OPT_flax_vector_conversions:
+      flag_lax_vector_conversions = value;
+      break;
+
     case OPT_fms_extensions:
       flag_ms_extensions = value;
       break;

Modified: user/hrs/releng/contrib/gcc/c-typeck.c
==============================================================================
--- user/hrs/releng/contrib/gcc/c-typeck.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/c-typeck.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -1923,7 +1923,7 @@ build_indirect_ref (tree ptr, const char
 	}
     }
   else if (TREE_CODE (pointer) != ERROR_MARK)
-    error ("invalid type argument of %qs", errorstring);
+    error ("invalid type argument of %qs (have %qT)", errorstring, type);
   return error_mark_node;
 }
 
@@ -3893,7 +3893,7 @@ convert_for_assignment (tree type, tree 
     }
   /* Some types can interconvert without explicit casts.  */
   else if (codel == VECTOR_TYPE && coder == VECTOR_TYPE
-	   && vector_types_convertible_p (type, TREE_TYPE (rhs)))
+	   && vector_types_convertible_p (type, TREE_TYPE (rhs), true))
     return convert (type, rhs);
   /* Arithmetic types all interconvert, and enum is treated like int.  */
   else if ((codel == INTEGER_TYPE || codel == REAL_TYPE
@@ -4629,7 +4629,7 @@ digest_init (tree type, tree init, bool 
      below and handle as a constructor.  */
   if (code == VECTOR_TYPE
       && TREE_CODE (TREE_TYPE (inside_init)) == VECTOR_TYPE
-      && vector_types_convertible_p (TREE_TYPE (inside_init), type)
+      && vector_types_convertible_p (TREE_TYPE (inside_init), type, true)
       && TREE_CONSTANT (inside_init))
     {
       if (TREE_CODE (inside_init) == VECTOR_CST
@@ -8135,7 +8135,7 @@ build_binary_op (enum tree_code code, tr
 	  || !same_scalar_type_ignoring_signedness (TREE_TYPE (type0),
 						    TREE_TYPE (type1))))
     {
-      binary_op_error (code);
+      binary_op_error (code, type0, type1);
       return error_mark_node;
     }
 
@@ -8431,7 +8431,7 @@ build_binary_op (enum tree_code code, tr
 
   if (!result_type)
     {
-      binary_op_error (code);
+      binary_op_error (code, TREE_TYPE (op0), TREE_TYPE (op1));
       return error_mark_node;
     }
 

Modified: user/hrs/releng/contrib/gcc/c.opt
==============================================================================
--- user/hrs/releng/contrib/gcc/c.opt	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/c.opt	Tue Dec 10 09:14:11 2013	(r259160)
@@ -584,6 +584,10 @@ Inject friend functions into enclosing n
 flabels-ok
 C++ ObjC++
 
+flax-vector-conversions
+C ObjC C++ ObjC++
+Allow implicit conversions between vectors with differing numbers of subparts and/or differing element types.
+
 fms-extensions
 C ObjC C++ ObjC++
 Don't warn about uses of Microsoft extensions
@@ -737,6 +741,10 @@ fvisibility-inlines-hidden
 C++ ObjC++
 Marks all inlined methods as having hidden visibility
 
+fvisibility-ms-compat
+C++ ObjC++ Var(flag_visibility_ms_compat)
+Changes visibility to match Microsoft Visual Studio by default
+
 fvtable-gc
 C++ ObjC++
 Discard unused virtual functions

Modified: user/hrs/releng/contrib/gcc/config/i386/emmintrin.h
==============================================================================
--- user/hrs/releng/contrib/gcc/config/i386/emmintrin.h	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/config/i386/emmintrin.h	Tue Dec 10 09:14:11 2013	(r259160)
@@ -1126,9 +1126,9 @@ _mm_slli_epi64 (__m128i __A, int __B)
 #define _mm_slli_epi16(__A, __B) \
   ((__m128i)__builtin_ia32_psllwi128 ((__v8hi)(__A), __B))
 #define _mm_slli_epi32(__A, __B) \
-  ((__m128i)__builtin_ia32_pslldi128 ((__v8hi)(__A), __B))
+  ((__m128i)__builtin_ia32_pslldi128 ((__v4si)(__A), __B))
 #define _mm_slli_epi64(__A, __B) \
-  ((__m128i)__builtin_ia32_psllqi128 ((__v8hi)(__A), __B))
+  ((__m128i)__builtin_ia32_psllqi128 ((__v2di)(__A), __B))
 #endif
 
 #if 0
@@ -1147,7 +1147,7 @@ _mm_srai_epi32 (__m128i __A, int __B)
 #define _mm_srai_epi16(__A, __B) \
   ((__m128i)__builtin_ia32_psrawi128 ((__v8hi)(__A), __B))
 #define _mm_srai_epi32(__A, __B) \
-  ((__m128i)__builtin_ia32_psradi128 ((__v8hi)(__A), __B))
+  ((__m128i)__builtin_ia32_psradi128 ((__v4si)(__A), __B))
 #endif
 
 #if 0

Modified: user/hrs/releng/contrib/gcc/config/i386/i386.c
==============================================================================
--- user/hrs/releng/contrib/gcc/config/i386/i386.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/config/i386/i386.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -15408,7 +15408,7 @@ ix86_init_mmx_sse_builtins (void)
   const struct builtin_description * d;
   size_t i;
 
-  tree V16QI_type_node = build_vector_type_for_mode (intQI_type_node, V16QImode);
+  tree V16QI_type_node = build_vector_type_for_mode (char_type_node, V16QImode);
   tree V2SI_type_node = build_vector_type_for_mode (intSI_type_node, V2SImode);
   tree V2SF_type_node = build_vector_type_for_mode (float_type_node, V2SFmode);
   tree V2DI_type_node
@@ -15417,7 +15417,7 @@ ix86_init_mmx_sse_builtins (void)
   tree V4SF_type_node = build_vector_type_for_mode (float_type_node, V4SFmode);
   tree V4SI_type_node = build_vector_type_for_mode (intSI_type_node, V4SImode);
   tree V4HI_type_node = build_vector_type_for_mode (intHI_type_node, V4HImode);
-  tree V8QI_type_node = build_vector_type_for_mode (intQI_type_node, V8QImode);
+  tree V8QI_type_node = build_vector_type_for_mode (char_type_node, V8QImode);
   tree V8HI_type_node = build_vector_type_for_mode (intHI_type_node, V8HImode);
 
   tree pchar_type_node = build_pointer_type (char_type_node);

Modified: user/hrs/releng/contrib/gcc/config/rs6000/altivec.h
==============================================================================
--- user/hrs/releng/contrib/gcc/config/rs6000/altivec.h	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/config/rs6000/altivec.h	Tue Dec 10 09:14:11 2013	(r259160)
@@ -332,7 +332,7 @@ NAME (T a1, U a2) \
 __altivec_binary_pred(vec_cmplt,
   __builtin_vec_cmpgt (a2, a1))
 __altivec_binary_pred(vec_cmple,
-  __builtin_altivec_cmpge (a2, a1))
+  __builtin_vec_cmpge (a2, a1))
 
 __altivec_scalar_pred(vec_all_in,
   __builtin_altivec_vcmpbfp_p (__CR6_EQ, a1, a2))
@@ -402,7 +402,7 @@ __altivec_scalar_pred(vec_any_nle,
 #undef __altivec_binary_pred
 #else
 #define vec_cmplt(a1, a2) __builtin_vec_cmpgt ((a2), (a1))
-#define vec_cmple(a1, a2) __builtin_altivec_vcmpgefp ((a2), (a1))
+#define vec_cmple(a1, a2) __builtin_vec_cmpge ((a2), (a1))
 
 #define vec_all_in(a1, a2) __builtin_altivec_vcmpbfp_p (__CR6_EQ, (a1), (a2))
 #define vec_any_out(a1, a2) __builtin_altivec_vcmpbfp_p (__CR6_EQ_REV, (a1), (a2))

Modified: user/hrs/releng/contrib/gcc/config/rs6000/rs6000-c.c
==============================================================================
--- user/hrs/releng/contrib/gcc/config/rs6000/rs6000-c.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/config/rs6000/rs6000-c.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -222,17 +222,17 @@ const struct altivec_builtin_types altiv
   { ALTIVEC_BUILTIN_VEC_UNPACKH, ALTIVEC_BUILTIN_VUPKHSB,
     RS6000_BTI_V8HI, RS6000_BTI_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKH, ALTIVEC_BUILTIN_VUPKHSB,
-    RS6000_BTI_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
+    RS6000_BTI_bool_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKH, ALTIVEC_BUILTIN_VUPKHSH,
     RS6000_BTI_V4SI, RS6000_BTI_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKH, ALTIVEC_BUILTIN_VUPKHSH,
-    RS6000_BTI_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKH, ALTIVEC_BUILTIN_VUPKHPX,
     RS6000_BTI_unsigned_V4SI, RS6000_BTI_pixel_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKHSH, ALTIVEC_BUILTIN_VUPKHSH,
     RS6000_BTI_V4SI, RS6000_BTI_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKHSH, ALTIVEC_BUILTIN_VUPKHSH,
-    RS6000_BTI_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKHPX, ALTIVEC_BUILTIN_VUPKHPX,
     RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKHPX, ALTIVEC_BUILTIN_VUPKHPX,
@@ -240,17 +240,17 @@ const struct altivec_builtin_types altiv
   { ALTIVEC_BUILTIN_VEC_VUPKHSB, ALTIVEC_BUILTIN_VUPKHSB,
     RS6000_BTI_V8HI, RS6000_BTI_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKHSB, ALTIVEC_BUILTIN_VUPKHSB,
-    RS6000_BTI_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
+    RS6000_BTI_bool_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKL, ALTIVEC_BUILTIN_VUPKLSB,
     RS6000_BTI_V8HI, RS6000_BTI_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKL, ALTIVEC_BUILTIN_VUPKLSB,
-    RS6000_BTI_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
+    RS6000_BTI_bool_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKL, ALTIVEC_BUILTIN_VUPKLPX,
     RS6000_BTI_unsigned_V4SI, RS6000_BTI_pixel_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKL, ALTIVEC_BUILTIN_VUPKLSH,
     RS6000_BTI_V4SI, RS6000_BTI_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKL, ALTIVEC_BUILTIN_VUPKLSH,
-    RS6000_BTI_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKLPX, ALTIVEC_BUILTIN_VUPKLPX,
     RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKLPX, ALTIVEC_BUILTIN_VUPKLPX,
@@ -258,11 +258,11 @@ const struct altivec_builtin_types altiv
   { ALTIVEC_BUILTIN_VEC_VUPKLSH, ALTIVEC_BUILTIN_VUPKLSH,
     RS6000_BTI_V4SI, RS6000_BTI_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKLSH, ALTIVEC_BUILTIN_VUPKLSH,
-    RS6000_BTI_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKLSB, ALTIVEC_BUILTIN_VUPKLSB,
     RS6000_BTI_V8HI, RS6000_BTI_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKLSB, ALTIVEC_BUILTIN_VUPKLSB,
-    RS6000_BTI_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
+    RS6000_BTI_bool_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
 
   /* Binary AltiVec builtins.  */
   { ALTIVEC_BUILTIN_VEC_ADD, ALTIVEC_BUILTIN_VADDUBM,
@@ -576,31 +576,23 @@ const struct altivec_builtin_types altiv
   { ALTIVEC_BUILTIN_VEC_CMPEQ, ALTIVEC_BUILTIN_VCMPEQFP,
     RS6000_BTI_bool_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPEQFP, ALTIVEC_BUILTIN_VCMPEQFP,
-    RS6000_BTI_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
-  { ALTIVEC_BUILTIN_VEC_VCMPEQUW, ALTIVEC_BUILTIN_VCMPEQUW,
-    RS6000_BTI_V4SI, RS6000_BTI_V4SI, RS6000_BTI_V4SI, 0 },
-  { ALTIVEC_BUILTIN_VEC_VCMPEQUW, ALTIVEC_BUILTIN_VCMPEQUW,
-    RS6000_BTI_V4SI, RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V4SI, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
+
   { ALTIVEC_BUILTIN_VEC_VCMPEQUW, ALTIVEC_BUILTIN_VCMPEQUW,
     RS6000_BTI_bool_V4SI, RS6000_BTI_V4SI, RS6000_BTI_V4SI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPEQUW, ALTIVEC_BUILTIN_VCMPEQUW,
     RS6000_BTI_bool_V4SI, RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V4SI, 0 },
-  { ALTIVEC_BUILTIN_VEC_VCMPEQUH, ALTIVEC_BUILTIN_VCMPEQUH,
-    RS6000_BTI_V8HI, RS6000_BTI_V8HI, RS6000_BTI_V8HI, 0 },
-  { ALTIVEC_BUILTIN_VEC_VCMPEQUH, ALTIVEC_BUILTIN_VCMPEQUH,
-    RS6000_BTI_V8HI, RS6000_BTI_unsigned_V8HI, RS6000_BTI_unsigned_V8HI, 0 },
+
   { ALTIVEC_BUILTIN_VEC_VCMPEQUH, ALTIVEC_BUILTIN_VCMPEQUH,
     RS6000_BTI_bool_V8HI, RS6000_BTI_V8HI, RS6000_BTI_V8HI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPEQUH, ALTIVEC_BUILTIN_VCMPEQUH,
     RS6000_BTI_bool_V8HI, RS6000_BTI_unsigned_V8HI, RS6000_BTI_unsigned_V8HI, 0 },
-  { ALTIVEC_BUILTIN_VEC_VCMPEQUB, ALTIVEC_BUILTIN_VCMPEQUB,
-    RS6000_BTI_V16QI, RS6000_BTI_V16QI, RS6000_BTI_V16QI, 0 },
-  { ALTIVEC_BUILTIN_VEC_VCMPEQUB, ALTIVEC_BUILTIN_VCMPEQUB,
-    RS6000_BTI_V16QI, RS6000_BTI_unsigned_V16QI, RS6000_BTI_unsigned_V16QI, 0 },
+
   { ALTIVEC_BUILTIN_VEC_VCMPEQUB, ALTIVEC_BUILTIN_VCMPEQUB,
     RS6000_BTI_bool_V16QI, RS6000_BTI_V16QI, RS6000_BTI_V16QI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPEQUB, ALTIVEC_BUILTIN_VCMPEQUB,
     RS6000_BTI_bool_V16QI, RS6000_BTI_unsigned_V16QI, RS6000_BTI_unsigned_V16QI, 0 },
+
   { ALTIVEC_BUILTIN_VEC_CMPGE, ALTIVEC_BUILTIN_VCMPGEFP,
     RS6000_BTI_bool_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
   { ALTIVEC_BUILTIN_VEC_CMPGT, ALTIVEC_BUILTIN_VCMPGTUB,
@@ -618,29 +610,29 @@ const struct altivec_builtin_types altiv
   { ALTIVEC_BUILTIN_VEC_CMPGT, ALTIVEC_BUILTIN_VCMPGTFP,
     RS6000_BTI_bool_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTFP, ALTIVEC_BUILTIN_VCMPGTFP,
-    RS6000_BTI_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTSW, ALTIVEC_BUILTIN_VCMPGTSW,
-    RS6000_BTI_V4SI, RS6000_BTI_V4SI, RS6000_BTI_V4SI, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_V4SI, RS6000_BTI_V4SI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTSW, ALTIVEC_BUILTIN_VCMPGTSW,
     RS6000_BTI_bool_V4SI, RS6000_BTI_V4SI, RS6000_BTI_V4SI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTUW, ALTIVEC_BUILTIN_VCMPGTUW,
-    RS6000_BTI_V4SI, RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V4SI, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V4SI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTUW, ALTIVEC_BUILTIN_VCMPGTUW,
     RS6000_BTI_bool_V4SI, RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V4SI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTSH, ALTIVEC_BUILTIN_VCMPGTSH,
-    RS6000_BTI_V8HI, RS6000_BTI_V8HI, RS6000_BTI_V8HI, 0 },
+    RS6000_BTI_bool_V8HI, RS6000_BTI_V8HI, RS6000_BTI_V8HI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTSH, ALTIVEC_BUILTIN_VCMPGTSH,
     RS6000_BTI_bool_V8HI, RS6000_BTI_V8HI, RS6000_BTI_V8HI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTUH, ALTIVEC_BUILTIN_VCMPGTUH,
-    RS6000_BTI_V8HI, RS6000_BTI_unsigned_V8HI, RS6000_BTI_unsigned_V8HI, 0 },
+    RS6000_BTI_bool_V8HI, RS6000_BTI_unsigned_V8HI, RS6000_BTI_unsigned_V8HI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTUH, ALTIVEC_BUILTIN_VCMPGTUH,
     RS6000_BTI_bool_V8HI, RS6000_BTI_unsigned_V8HI, RS6000_BTI_unsigned_V8HI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTSB, ALTIVEC_BUILTIN_VCMPGTSB,
-    RS6000_BTI_V16QI, RS6000_BTI_V16QI, RS6000_BTI_V16QI, 0 },
+    RS6000_BTI_bool_V16QI, RS6000_BTI_V16QI, RS6000_BTI_V16QI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTSB, ALTIVEC_BUILTIN_VCMPGTSB,
     RS6000_BTI_bool_V16QI, RS6000_BTI_V16QI, RS6000_BTI_V16QI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTUB, ALTIVEC_BUILTIN_VCMPGTUB,
-    RS6000_BTI_V16QI, RS6000_BTI_unsigned_V16QI, RS6000_BTI_unsigned_V16QI, 0 },
+    RS6000_BTI_bool_V16QI, RS6000_BTI_unsigned_V16QI, RS6000_BTI_unsigned_V16QI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTUB, ALTIVEC_BUILTIN_VCMPGTUB,
     RS6000_BTI_bool_V16QI, RS6000_BTI_unsigned_V16QI, RS6000_BTI_unsigned_V16QI, 0 },
   { ALTIVEC_BUILTIN_VEC_CMPLE, ALTIVEC_BUILTIN_VCMPGEFP,

Modified: user/hrs/releng/contrib/gcc/config/rs6000/rs6000.c
==============================================================================
--- user/hrs/releng/contrib/gcc/config/rs6000/rs6000.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/config/rs6000/rs6000.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -14704,8 +14704,17 @@ rs6000_emit_prologue (void)
   if (!WORLD_SAVE_P (info) && info->push_p
       && !(DEFAULT_ABI == ABI_V4 || current_function_calls_eh_return))
     {
-      rs6000_emit_allocate_stack (info->total_size, FALSE);
+      if (info->total_size < 32767)
       sp_offset = info->total_size;
+      else
+	frame_reg_rtx = frame_ptr_rtx;
+      rs6000_emit_allocate_stack (info->total_size,
+				  (frame_reg_rtx != sp_reg_rtx
+				   && ((info->altivec_size != 0)
+				       || (info->vrsave_mask != 0)
+				       )));
+      if (frame_reg_rtx != sp_reg_rtx)
+	rs6000_emit_stack_tie ();
     }
 
   /* Set frame pointer, if needed.  */
@@ -15046,8 +15055,7 @@ rs6000_emit_epilogue (int sibcall)
     }
 
   /* Set sp_offset based on the stack push from the prologue.  */
-  if ((DEFAULT_ABI == ABI_V4 || current_function_calls_eh_return)
-      && info->total_size < 32767)
+  if (info->total_size < 32767)
     sp_offset = info->total_size;
 
   /* Restore AltiVec registers if needed.  */

Modified: user/hrs/releng/contrib/gcc/cp/ChangeLog.gcc43
==============================================================================
--- user/hrs/releng/contrib/gcc/cp/ChangeLog.gcc43	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/cp/ChangeLog.gcc43	Tue Dec 10 09:14:11 2013	(r259160)
@@ -7,6 +7,13 @@
 	* typeck.c (cxx_alignof_expr): When alignof is used on a plain
 	FUNCTION_DECL, return its alignment.
 
+2007-06-28  Geoffrey Keating  <geoffk at apple.com> (r126088)
+
+	* decl2.c (determine_visibility): Implement
+	flag_visibility_ms_compat effect on type info.
+	* decl.c (cxx_init_decl_processing): Implement
+	global effect of flag_visibility_ms_compat.
+
 2007-06-28  Geoffrey Keating  <geoffk at apple.com> (r126080)
 
 	* decl2.c (start_objects): Mark constructor-runnning function
@@ -18,6 +25,10 @@
 	* decl2.c (determine_visibility): Remove duplicate code for
 	handling type info.
 
+2007-05-31  Daniel Berlin  <dberlin at dberlin.org> (r125239)
+
+	* typeck.c (build_binary_op): Include types in error.
+
 2007-05-05  Geoffrey Keating  <geoffk at apple.com> (r124467)
 
 	PR 31775
@@ -29,14 +40,23 @@
 
 	* decl.c (compute_array_index_type): New warning flag warn_vla.
 
-2007-01-07  Manuel Lopez-Ibanez  <manu at gcc.gnu.org>
+2007-01-08  Mark Shinwell  <shinwell at codesourcery.com> (r120572)
+
+	* call.c (standard_conversion): Pass flag to
+	vector_types_convertible_p to disallow emission of note.
+	* typeck.c (convert_for_assignment): Pass flag to
+	vector_types_convertible_p to allow emission of note.
+	(ptr_reasonably_similar): Pass flag to vector_types_convertible_p
+	to disallow emission of note.
+
+2007-01-07  Manuel Lopez-Ibanez  <manu at gcc.gnu.org> (r120558)
 
 	PR c++/28986
 	* typeck.c (build_binary_op): Call overflow_warning if
 	TREE_OVERFLOW_P is true for the result and not for any of the
 	operands.
 	
-2007-01-05  Manuel Lopez-Ibanez  <manu at gcc.gnu.org>
+2007-01-05  Manuel Lopez-Ibanez  <manu at gcc.gnu.org> (r120505)
 
 	PR c/19978
 	* semantics.c (finish_unary_op_expr): Warn only if result

Modified: user/hrs/releng/contrib/gcc/cp/call.c
==============================================================================
--- user/hrs/releng/contrib/gcc/cp/call.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/cp/call.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -838,7 +838,7 @@ standard_conversion (tree to, tree from,
 	conv->rank = cr_promotion;
     }
   else if (fcode == VECTOR_TYPE && tcode == VECTOR_TYPE
-	   && vector_types_convertible_p (from, to))
+	   && vector_types_convertible_p (from, to, false))
     return build_conv (ck_std, to, conv);
   else if (!(flags & LOOKUP_CONSTRUCTOR_CALLABLE)
 	   && IS_AGGR_TYPE (to) && IS_AGGR_TYPE (from)

Modified: user/hrs/releng/contrib/gcc/cp/decl.c
==============================================================================
--- user/hrs/releng/contrib/gcc/cp/decl.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/cp/decl.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -3157,6 +3157,9 @@ cxx_init_decl_processing (void)
     }
   if (flag_inline_functions)
     flag_inline_trees = 2;
+  
+  if (flag_visibility_ms_compat)
+   default_visibility = VISIBILITY_HIDDEN;
 
   /* Initially, C.  */
   current_lang_name = lang_name_c;

Modified: user/hrs/releng/contrib/gcc/cp/decl2.c
==============================================================================
--- user/hrs/releng/contrib/gcc/cp/decl2.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/cp/decl2.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -1726,6 +1726,19 @@ determine_visibility (tree decl)
 	     but have no TEMPLATE_INFO, so don't try to check it.  */
 	  use_template = 0;
 	}
+      else if (TREE_CODE (decl) == VAR_DECL && DECL_TINFO_P (decl)
+	       && flag_visibility_ms_compat)
+	{
+	  /* Under -fvisibility-ms-compat, types are visible by default,
+	     even though their contents aren't.  */
+	  tree underlying_type = TREE_TYPE (DECL_NAME (decl));
+	  int underlying_vis = type_visibility (underlying_type);
+	  if (underlying_vis == VISIBILITY_ANON
+	      || CLASSTYPE_VISIBILITY_SPECIFIED (underlying_type))
+	    constrain_visibility (decl, underlying_vis);
+	  else
+	    DECL_VISIBILITY (decl) = VISIBILITY_DEFAULT;
+	}
       else if (TREE_CODE (decl) == VAR_DECL && DECL_TINFO_P (decl))
 	{
 	  /* tinfo visibility is based on the type it's for.  */

Modified: user/hrs/releng/contrib/gcc/cp/typeck.c
==============================================================================
--- user/hrs/releng/contrib/gcc/cp/typeck.c	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/cp/typeck.c	Tue Dec 10 09:14:11 2013	(r259160)
@@ -3476,7 +3476,7 @@ build_binary_op (enum tree_code code, tr
 	      || !same_scalar_type_ignoring_signedness (TREE_TYPE (type0),
 							TREE_TYPE (type1)))
 	    {
-	      binary_op_error (code);
+	      binary_op_error (code, type0, type1);
 	      return error_mark_node;
 	    }
 	  arithmetic_types_p = 1;
@@ -6229,7 +6229,7 @@ convert_for_assignment (tree type, tree 
   coder = TREE_CODE (rhstype);
 
   if (TREE_CODE (type) == VECTOR_TYPE && coder == VECTOR_TYPE
-      && vector_types_convertible_p (type, rhstype))
+      && vector_types_convertible_p (type, rhstype, true))
     return convert (type, rhs);
 
   if (rhs == error_mark_node || rhstype == error_mark_node)
@@ -6799,7 +6799,7 @@ ptr_reasonably_similar (tree to, tree fr
 	continue;
 
       if (TREE_CODE (to) == VECTOR_TYPE
-	  && vector_types_convertible_p (to, from))
+	  && vector_types_convertible_p (to, from, false))
 	return 1;
 
       if (TREE_CODE (to) == INTEGER_TYPE

Modified: user/hrs/releng/contrib/gcc/doc/invoke.texi
==============================================================================
--- user/hrs/releng/contrib/gcc/doc/invoke.texi	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/gcc/doc/invoke.texi	Tue Dec 10 09:14:11 2013	(r259160)
@@ -167,7 +167,7 @@ in the following sections.
 -fno-asm  -fno-builtin  -fno-builtin- at var{function} @gol
 -fhosted  -ffreestanding -fopenmp -fms-extensions @gol
 -trigraphs  -no-integrated-cpp  -traditional  -traditional-cpp @gol
--fallow-single-precision  -fcond-mismatch @gol
+-fallow-single-precision  -fcond-mismatch -flax-vector-conversions @gol
 -fsigned-bitfields  -fsigned-char @gol
 -funsigned-bitfields  -funsigned-char}
 
@@ -186,6 +186,7 @@ in the following sections.
 -frepo  -fno-rtti  -fstats  -ftemplate-depth- at var{n} @gol
 -fno-threadsafe-statics -fuse-cxa-atexit  -fno-weak  -nostdinc++ @gol
 -fno-default-inline  -fvisibility-inlines-hidden @gol
+-fvisibility-ms-compat @gol
 -Wabi  -Wctor-dtor-privacy @gol
 -Wnon-virtual-dtor  -Wreorder @gol
 -Weffc++  -Wno-deprecated  -Wstrict-null-sentinel @gol
@@ -1337,6 +1338,12 @@ Allow conditional expressions with misma
 third arguments.  The value of such an expression is void.  This option
 is not supported for C++.
 
+ at item -flax-vector-conversions
+ at opindex flax-vector-conversions
+Allow implicit conversions between vectors with differing numbers of
+elements and/or incompatible element types.  This option should not be
+used for new code.
+
 @item -funsigned-char
 @opindex funsigned-char
 Let the type @code{char} be unsigned, like @code{unsigned char}.
@@ -1620,6 +1627,40 @@ Explicitly instantiated inline methods a
 as their linkage might otherwise cross a shared library boundary.
 @xref{Template Instantiation}.
 
+ at item -fvisibility-ms-compat
+ at opindex fvisibility-ms-compat
+This flag attempts to use visibility settings to make GCC's C++
+linkage model compatible with that of Microsoft Visual Studio.
+
+The flag makes these changes to GCC's linkage model:
+
+ at enumerate
+ at item
+It sets the default visibility to @code{hidden}, like
+ at option{-fvisibility=hidden}.
+
+ at item
+Types, but not their members, are not hidden by default.
+
+ at item
+The One Definition Rule is relaxed for types without explicit
+visibility specifications which are defined in more than one different
+shared object: those declarations are permitted if they would have
+been permitted when this option was not used.
+ at end enumerate
+
+In new code it is better to use @option{-fvisibility=hidden} and
+export those classes which are intended to be externally visible.
+Unfortunately it is possible for code to rely, perhaps accidentally,
+on the Visual Studio behaviour.
+
+Among the consequences of these changes are that static data members
+of the same type with the same name but defined in different shared
+objects will be different, so changing one will not change the other;
+and that pointers to function members defined in different shared
+objects may not compare equal.  When this flag is given, it is a
+violation of the ODR to define types with the same name differently.
+
 @item -fno-weak
 @opindex fno-weak
 Do not use weak symbol support, even if it is provided by the linker.

Modified: user/hrs/releng/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp
==============================================================================
--- user/hrs/releng/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp	Tue Dec 10 09:03:38 2013	(r259159)
+++ user/hrs/releng/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp	Tue Dec 10 09:14:11 2013	(r259160)
@@ -454,10 +454,9 @@ void CodeGenVTables::EmitThunk(GlobalDec
   } else {

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

More information about the svn-src-user mailing list