Date: Sun, 8 Dec 2013 19:20:52 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r259105 - in projects/sendfile: . bin/sh bin/test cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libdtrace... Message-ID: <201312081920.rB8JKqQS009938@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Sun Dec 8 19:20:50 2013 New Revision: 259105 URL: http://svnweb.freebsd.org/changeset/base/259105 Log: Merge head up to r259104. Added: projects/sendfile/contrib/gcclibs/libiberty/ChangeLog.gcc43 - copied unchanged from r259104, head/contrib/gcclibs/libiberty/ChangeLog.gcc43 projects/sendfile/contrib/llvm/tools/lldb/include/lldb/API/SBPlatform.h - copied unchanged from r259104, head/contrib/llvm/tools/lldb/include/lldb/API/SBPlatform.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Host/Debug.h - copied unchanged from r259104, head/contrib/llvm/tools/lldb/include/lldb/Host/Debug.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Target/RegisterCheckpoint.h - copied unchanged from r259104, head/contrib/llvm/tools/lldb/include/lldb/Target/RegisterCheckpoint.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Utility/Iterable.h - copied unchanged from r259104, head/contrib/llvm/tools/lldb/include/lldb/Utility/Iterable.h projects/sendfile/contrib/llvm/tools/lldb/source/API/SBPlatform.cpp - copied unchanged from r259104, head/contrib/llvm/tools/lldb/source/API/SBPlatform.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp - copied unchanged from r259104, head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h - copied unchanged from r259104, head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.cpp - copied unchanged from r259104, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.h - copied unchanged from r259104, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp - copied unchanged from r259104, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.h - copied unchanged from r259104, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.cpp - copied unchanged from r259104, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.h - copied unchanged from r259104, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.h projects/sendfile/etc/casper/ - copied from r259104, head/etc/casper/ projects/sendfile/lib/libcapsicum/ - copied from r259104, head/lib/libcapsicum/ projects/sendfile/lib/libcasper/ - copied from r259104, head/lib/libcasper/ projects/sendfile/libexec/casper/ - copied from r259104, head/libexec/casper/ projects/sendfile/sbin/casperd/ - copied from r259104, head/sbin/casperd/ projects/sendfile/sys/dev/fb/fb_if.m - copied unchanged from r259104, head/sys/dev/fb/fb_if.m projects/sendfile/sys/dev/fb/fbd.c - copied unchanged from r259104, head/sys/dev/fb/fbd.c projects/sendfile/sys/dev/nand/nfc_at91.c - copied unchanged from r259104, head/sys/dev/nand/nfc_at91.c projects/sendfile/sys/dev/vt/ - copied from r259104, head/sys/dev/vt/ projects/sendfile/sys/kern/subr_terminal.c - copied unchanged from r259104, head/sys/kern/subr_terminal.c projects/sendfile/sys/sys/ktr_class.h - copied unchanged from r259104, head/sys/sys/ktr_class.h projects/sendfile/sys/sys/terminal.h - copied unchanged from r259104, head/sys/sys/terminal.h projects/sendfile/tools/build/options/WITHOUT_CASPER - copied unchanged from r259104, head/tools/build/options/WITHOUT_CASPER projects/sendfile/tools/regression/capsicum/libcapsicum/ - copied from r259104, head/tools/regression/capsicum/libcapsicum/ projects/sendfile/tools/tools/vt/ - copied from r259104, head/tools/tools/vt/ Modified: projects/sendfile/Makefile.inc1 projects/sendfile/ObsoleteFiles.inc projects/sendfile/bin/sh/eval.c projects/sendfile/bin/test/test.c projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/sendfile/contrib/gcc/ChangeLog.gcc43 projects/sendfile/contrib/gcc/c-common.c projects/sendfile/contrib/gcc/c-common.h projects/sendfile/contrib/gcc/c-opts.c projects/sendfile/contrib/gcc/c-typeck.c projects/sendfile/contrib/gcc/c.opt projects/sendfile/contrib/gcc/config/i386/i386.c projects/sendfile/contrib/gcc/config/rs6000/altivec.h projects/sendfile/contrib/gcc/config/rs6000/rs6000-c.c projects/sendfile/contrib/gcc/config/rs6000/rs6000.c projects/sendfile/contrib/gcc/cp/ChangeLog.gcc43 projects/sendfile/contrib/gcc/cp/call.c projects/sendfile/contrib/gcc/cp/decl.c projects/sendfile/contrib/gcc/cp/decl2.c projects/sendfile/contrib/gcc/cp/mangle.c projects/sendfile/contrib/gcc/cp/typeck.c projects/sendfile/contrib/gcc/doc/invoke.texi projects/sendfile/contrib/gcclibs/libcpp/ChangeLog.gcc43 projects/sendfile/contrib/gcclibs/libcpp/expr.c projects/sendfile/contrib/gcclibs/libcpp/lex.c projects/sendfile/contrib/gcclibs/libcpp/macro.c projects/sendfile/contrib/gcclibs/libcpp/pch.c projects/sendfile/contrib/gcclibs/libiberty/choose-temp.c projects/sendfile/contrib/gcclibs/libiberty/cp-demangle.c projects/sendfile/contrib/gcclibs/libiberty/cp-demangle.h projects/sendfile/contrib/gcclibs/libiberty/floatformat.c projects/sendfile/contrib/gcclibs/libiberty/functions.texi projects/sendfile/contrib/gcclibs/libiberty/pex-unix.c projects/sendfile/contrib/gcclibs/libiberty/strsignal.c projects/sendfile/contrib/gcclibs/libiberty/testsuite/demangle-expected projects/sendfile/contrib/gcclibs/libiberty/testsuite/test-demangle.c projects/sendfile/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp projects/sendfile/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/sendfile/contrib/llvm/tools/clang/lib/Driver/ToolChains.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/API/SBDebugger.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/API/SBError.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/API/SBModule.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointList.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Core/Address.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Core/Debugger.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Core/Module.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/DataFormatters/CXXFormatterFunctions.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatCache.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatClasses.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatManager.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatNavigator.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategory.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Expression/ClangFunction.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Expression/ClangUserExpression.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Host/File.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Host/FileSpec.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Host/Host.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Host/OptionParser.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Interpreter/PythonDataObjects.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Symbol/TypeList.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Target/ABI.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Target/LanguageRuntime.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Target/Platform.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Target/Process.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Target/RegisterContext.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Target/SystemRuntime.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Target/Target.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Target/Thread.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Target/ThreadList.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallFunction.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallUserExpression.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Utility/PythonPointer.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/lldb-enumerations.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/lldb-forward.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/lldb-private-enumerations.h projects/sendfile/contrib/llvm/tools/lldb/include/lldb/lldb-python.h projects/sendfile/contrib/llvm/tools/lldb/source/API/SBDebugger.cpp projects/sendfile/contrib/llvm/tools/lldb/source/API/SBExpressionOptions.cpp projects/sendfile/contrib/llvm/tools/lldb/source/API/SBFileSpec.cpp projects/sendfile/contrib/llvm/tools/lldb/source/API/SBModule.cpp projects/sendfile/contrib/llvm/tools/lldb/source/API/SBProcess.cpp projects/sendfile/contrib/llvm/tools/lldb/source/API/SBStream.cpp projects/sendfile/contrib/llvm/tools/lldb/source/API/SBTarget.cpp projects/sendfile/contrib/llvm/tools/lldb/source/API/SBThread.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Breakpoint/Breakpoint.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointList.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Commands/CommandObjectMemory.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlatform.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlugin.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Commands/CommandObjectProcess.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Commands/CommandObjectTarget.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Commands/CommandObjectThread.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpoint.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Core/Address.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Core/ConnectionFileDescriptor.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Core/Debugger.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Core/Mangled.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Core/Module.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Core/StreamFile.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Core/ValueObjectSyntheticFilter.cpp projects/sendfile/contrib/llvm/tools/lldb/source/DataFormatters/CXXFormatterFunctions.cpp projects/sendfile/contrib/llvm/tools/lldb/source/DataFormatters/FormatClasses.cpp projects/sendfile/contrib/llvm/tools/lldb/source/DataFormatters/FormatManager.cpp projects/sendfile/contrib/llvm/tools/lldb/source/DataFormatters/LibCxx.cpp projects/sendfile/contrib/llvm/tools/lldb/source/DataFormatters/LibStdcpp.cpp projects/sendfile/contrib/llvm/tools/lldb/source/DataFormatters/NSDictionary.cpp projects/sendfile/contrib/llvm/tools/lldb/source/DataFormatters/NSSet.cpp projects/sendfile/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategory.cpp projects/sendfile/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategoryMap.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Expression/ClangFunction.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Expression/ClangUserExpression.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Expression/Materializer.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Host/common/File.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Host/common/Host.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Host/common/OptionParser.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Interpreter/Args.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Interpreter/CommandInterpreter.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Interpreter/PythonDataObjects.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreterPython.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_x86_64.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Target/Platform.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Target/Process.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Target/RegisterContext.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Target/StackFrameList.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Target/SystemRuntime.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Target/Target.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Target/Thread.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallUserExpression.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepInRange.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Utility/StringExtractor.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp projects/sendfile/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.h projects/sendfile/contrib/llvm/tools/lldb/source/lldb.cpp projects/sendfile/contrib/llvm/tools/lldb/tools/lldb-platform/lldb-platform.cpp projects/sendfile/contrib/mdocml/lib.in projects/sendfile/contrib/nvi/cl/cl_term.c projects/sendfile/contrib/nvi/common/key.c projects/sendfile/contrib/nvi/common/key.h projects/sendfile/etc/Makefile projects/sendfile/etc/devd/usb.conf projects/sendfile/etc/gettytab projects/sendfile/etc/mtree/BSD.include.dist projects/sendfile/etc/mtree/BSD.root.dist projects/sendfile/etc/pf.os projects/sendfile/etc/rc projects/sendfile/etc/rc.d/jail projects/sendfile/etc/services projects/sendfile/games/fortune/fortune/fortune.c projects/sendfile/include/Makefile projects/sendfile/lib/Makefile projects/sendfile/lib/clang/liblldbAPI/Makefile projects/sendfile/lib/clang/liblldbPluginProcessFreeBSD/Makefile projects/sendfile/lib/clang/liblldbPluginProcessUtility/Makefile projects/sendfile/lib/libc/stdlib/atexit.c projects/sendfile/lib/libc/sys/wait.2 projects/sendfile/libexec/Makefile projects/sendfile/libexec/rtld-elf/rtld.c projects/sendfile/libexec/rtld-elf/rtld.h projects/sendfile/libexec/rtld-elf/xmalloc.c projects/sendfile/release/Makefile projects/sendfile/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/sendfile/release/release.conf.sample projects/sendfile/release/release.sh projects/sendfile/release/scripts/pkg-stage.sh projects/sendfile/sbin/Makefile projects/sendfile/sbin/mdconfig/mdconfig.8 projects/sendfile/sbin/mdconfig/mdconfig.c projects/sendfile/sbin/mount_nfs/mount_nfs.8 projects/sendfile/sbin/route/route.c projects/sendfile/share/man/man4/run.4 projects/sendfile/share/man/man5/src.conf.5 projects/sendfile/share/man/man7/development.7 projects/sendfile/share/man/man7/release.7 projects/sendfile/share/mk/bsd.libnames.mk projects/sendfile/share/mk/bsd.own.mk projects/sendfile/share/mk/bsd.sys.mk projects/sendfile/sys/amd64/amd64/machdep.c projects/sendfile/sys/amd64/include/vmm.h (contents, props changed) projects/sendfile/sys/amd64/vmm/intel/vmx.c projects/sendfile/sys/amd64/vmm/io/vlapic.c projects/sendfile/sys/amd64/vmm/io/vlapic.h projects/sendfile/sys/amd64/vmm/vmm.c projects/sendfile/sys/amd64/vmm/vmm_lapic.c projects/sendfile/sys/amd64/vmm/vmm_lapic.h projects/sendfile/sys/arm/arm/locore.S projects/sendfile/sys/arm/at91/at91_machdep.c projects/sendfile/sys/arm/at91/at91_pioreg.h projects/sendfile/sys/arm/at91/files.at91 projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/sendfile/sys/arm/ti/am335x/am335x_dmtimer.c projects/sendfile/sys/arm/ti/ti_gpio.c projects/sendfile/sys/cam/ctl/ctl_backend_block.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/sendfile/sys/conf/files projects/sendfile/sys/conf/files.amd64 projects/sendfile/sys/conf/files.arm projects/sendfile/sys/conf/files.i386 projects/sendfile/sys/conf/files.powerpc projects/sendfile/sys/conf/files.sparc64 projects/sendfile/sys/conf/kern.mk projects/sendfile/sys/conf/kmod.mk projects/sendfile/sys/conf/options projects/sendfile/sys/dev/bge/if_bge.c projects/sendfile/sys/dev/bge/if_bgereg.h projects/sendfile/sys/dev/cxgbe/adapter.h projects/sendfile/sys/dev/cxgbe/common/common.h projects/sendfile/sys/dev/cxgbe/common/t4_hw.c projects/sendfile/sys/dev/cxgbe/t4_ioctl.h projects/sendfile/sys/dev/cxgbe/t4_main.c projects/sendfile/sys/dev/cxgbe/t4_sge.c projects/sendfile/sys/dev/drm2/drm_fb_helper.c projects/sendfile/sys/dev/drm2/drm_os_freebsd.h projects/sendfile/sys/dev/drm2/drm_pci.c projects/sendfile/sys/dev/drm2/i915/i915_drv.c projects/sendfile/sys/dev/drm2/i915/i915_reg.h projects/sendfile/sys/dev/drm2/i915/intel_fb.c projects/sendfile/sys/dev/drm2/radeon/atombios_dp.c projects/sendfile/sys/dev/drm2/radeon/radeon.h projects/sendfile/sys/dev/drm2/radeon/radeon_agp.c projects/sendfile/sys/dev/drm2/radeon/radeon_drv.c projects/sendfile/sys/dev/drm2/radeon/radeon_fb.c projects/sendfile/sys/dev/drm2/radeon/radeon_pm.c projects/sendfile/sys/dev/gpio/gpioiic.c projects/sendfile/sys/dev/gpio/gpioled.c projects/sendfile/sys/dev/iicbus/ds1631.c projects/sendfile/sys/dev/iicbus/ds1775.c projects/sendfile/sys/dev/iicbus/max6690.c projects/sendfile/sys/dev/iwn/if_iwn.c projects/sendfile/sys/dev/iwn/if_iwn_chip_cfg.h projects/sendfile/sys/dev/iwn/if_iwnreg.h projects/sendfile/sys/dev/iwn/if_iwnvar.h projects/sendfile/sys/dev/md/md.c projects/sendfile/sys/dev/oce/oce_if.c projects/sendfile/sys/dev/oce/oce_if.h projects/sendfile/sys/dev/oce/oce_mbox.c projects/sendfile/sys/dev/oce/oce_sysctl.c projects/sendfile/sys/dev/ofw/ofw_fdt.c projects/sendfile/sys/dev/uart/uart_cpu_powerpc.c projects/sendfile/sys/dev/usb/controller/usb_controller.c projects/sendfile/sys/dev/usb/controller/xhci.c projects/sendfile/sys/dev/usb/usb_bus.h projects/sendfile/sys/dev/usb/usb_busdma.c projects/sendfile/sys/dev/usb/usb_controller.h projects/sendfile/sys/dev/usb/usbdevs projects/sendfile/sys/dev/usb/wlan/if_rsu.c projects/sendfile/sys/dev/usb/wlan/if_rum.c projects/sendfile/sys/dev/usb/wlan/if_run.c projects/sendfile/sys/dev/usb/wlan/if_runreg.h projects/sendfile/sys/dev/usb/wlan/if_runvar.h projects/sendfile/sys/dev/usb/wlan/if_ural.c projects/sendfile/sys/dev/usb/wlan/if_urtw.c projects/sendfile/sys/fs/ext2fs/ext2_dinode.h projects/sendfile/sys/fs/nfsclient/nfs_clbio.c projects/sendfile/sys/fs/nfsclient/nfs_clvfsops.c projects/sendfile/sys/fs/nfsclient/nfs_clvnops.c projects/sendfile/sys/fs/nfsclient/nfsnode.h projects/sendfile/sys/i386/conf/GENERIC projects/sendfile/sys/i386/conf/NOTES projects/sendfile/sys/i386/i386/machdep.c projects/sendfile/sys/kern/kern_mib.c projects/sendfile/sys/kern/kern_shutdown.c projects/sendfile/sys/kern/makesyscalls.sh projects/sendfile/sys/kern/sched_ule.c projects/sendfile/sys/modules/Makefile projects/sendfile/sys/modules/drm2/i915kms/Makefile projects/sendfile/sys/modules/drm2/radeonkms/Makefile projects/sendfile/sys/netinet/tcp_input.c projects/sendfile/sys/nfsclient/nfsargs.h projects/sendfile/sys/pc98/pc98/machdep.c projects/sendfile/sys/powerpc/aim/trap_subr32.S projects/sendfile/sys/powerpc/aim/trap_subr64.S projects/sendfile/sys/powerpc/booke/platform_bare.c projects/sendfile/sys/powerpc/fpu/fpu_emu.c projects/sendfile/sys/powerpc/include/fdt.h projects/sendfile/sys/powerpc/include/ofw_machdep.h projects/sendfile/sys/powerpc/include/pmap.h projects/sendfile/sys/powerpc/mpc85xx/platform_mpc85xx.c projects/sendfile/sys/powerpc/ofw/ofw_machdep.c projects/sendfile/sys/powerpc/powermac/platform_powermac.c projects/sendfile/sys/powerpc/powerpc/copyinout.c projects/sendfile/sys/powerpc/powerpc/platform.c projects/sendfile/sys/powerpc/powerpc/platform_if.m projects/sendfile/sys/powerpc/ps3/platform_ps3.c projects/sendfile/sys/powerpc/pseries/platform_chrp.c projects/sendfile/sys/powerpc/wii/platform_wii.c projects/sendfile/sys/security/audit/audit_bsm_klib.c projects/sendfile/sys/sparc64/sparc64/machdep.c projects/sendfile/sys/sys/consio.h projects/sendfile/sys/sys/eventhandler.h projects/sendfile/sys/sys/fbio.h projects/sendfile/sys/sys/ktr.h projects/sendfile/sys/sys/lock.h projects/sendfile/sys/sys/mdioctl.h projects/sendfile/sys/sys/tty.h projects/sendfile/sys/teken/teken.c projects/sendfile/sys/teken/teken.h projects/sendfile/sys/teken/teken_subr.h projects/sendfile/sys/x86/include/mptable.h projects/sendfile/tools/build/options/WITHOUT_PKGBOOTSTRAP projects/sendfile/tools/test/dtrace/Makefile projects/sendfile/tools/tools/cxgbetool/cxgbetool.c projects/sendfile/usr.bin/bc/bc.1 projects/sendfile/usr.bin/bc/bc.y projects/sendfile/usr.bin/script/script.1 projects/sendfile/usr.bin/script/script.c projects/sendfile/usr.bin/yacc/Makefile projects/sendfile/usr.sbin/bhyve/bhyverun.c projects/sendfile/usr.sbin/bhyve/mptbl.c projects/sendfile/usr.sbin/bhyveload/bhyveload.8 projects/sendfile/usr.sbin/bsdconfig/console/console projects/sendfile/usr.sbin/bsdconfig/console/font projects/sendfile/usr.sbin/bsdconfig/console/keymap projects/sendfile/usr.sbin/bsdconfig/console/repeat projects/sendfile/usr.sbin/bsdconfig/console/saver projects/sendfile/usr.sbin/bsdconfig/console/screenmap projects/sendfile/usr.sbin/bsdconfig/console/ttys projects/sendfile/usr.sbin/bsdconfig/diskmgmt/diskmgmt projects/sendfile/usr.sbin/bsdconfig/docsinstall/docsinstall projects/sendfile/usr.sbin/bsdconfig/dot/dot projects/sendfile/usr.sbin/bsdconfig/includes/includes projects/sendfile/usr.sbin/bsdconfig/mouse/disable projects/sendfile/usr.sbin/bsdconfig/mouse/enable projects/sendfile/usr.sbin/bsdconfig/mouse/flags projects/sendfile/usr.sbin/bsdconfig/mouse/mouse projects/sendfile/usr.sbin/bsdconfig/mouse/port projects/sendfile/usr.sbin/bsdconfig/mouse/type projects/sendfile/usr.sbin/bsdconfig/networking/defaultrouter projects/sendfile/usr.sbin/bsdconfig/networking/devices projects/sendfile/usr.sbin/bsdconfig/networking/hostname projects/sendfile/usr.sbin/bsdconfig/networking/nameservers projects/sendfile/usr.sbin/bsdconfig/networking/networking projects/sendfile/usr.sbin/bsdconfig/networking/share/device.subr projects/sendfile/usr.sbin/bsdconfig/networking/share/hostname.subr projects/sendfile/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/sendfile/usr.sbin/bsdconfig/networking/share/media.subr projects/sendfile/usr.sbin/bsdconfig/networking/share/netmask.subr projects/sendfile/usr.sbin/bsdconfig/networking/share/resolv.subr projects/sendfile/usr.sbin/bsdconfig/networking/share/routing.subr projects/sendfile/usr.sbin/bsdconfig/networking/share/services.subr projects/sendfile/usr.sbin/bsdconfig/packages/packages projects/sendfile/usr.sbin/bsdconfig/password/password projects/sendfile/usr.sbin/bsdconfig/security/kern_securelevel projects/sendfile/usr.sbin/bsdconfig/security/security projects/sendfile/usr.sbin/bsdconfig/share/common.subr projects/sendfile/usr.sbin/bsdconfig/share/device.subr projects/sendfile/usr.sbin/bsdconfig/share/dialog.subr projects/sendfile/usr.sbin/bsdconfig/share/keymap.subr projects/sendfile/usr.sbin/bsdconfig/share/media/cdrom.subr projects/sendfile/usr.sbin/bsdconfig/share/media/common.subr projects/sendfile/usr.sbin/bsdconfig/share/media/dos.subr projects/sendfile/usr.sbin/bsdconfig/share/media/floppy.subr projects/sendfile/usr.sbin/bsdconfig/share/media/ftp.subr projects/sendfile/usr.sbin/bsdconfig/share/media/nfs.subr projects/sendfile/usr.sbin/bsdconfig/share/media/tcpip.subr projects/sendfile/usr.sbin/bsdconfig/share/media/ufs.subr projects/sendfile/usr.sbin/bsdconfig/share/media/usb.subr projects/sendfile/usr.sbin/bsdconfig/share/mustberoot.subr projects/sendfile/usr.sbin/bsdconfig/share/packages/categories.subr projects/sendfile/usr.sbin/bsdconfig/share/packages/index.subr projects/sendfile/usr.sbin/bsdconfig/share/packages/packages.subr projects/sendfile/usr.sbin/bsdconfig/share/strings.subr projects/sendfile/usr.sbin/bsdconfig/share/sysrc.subr projects/sendfile/usr.sbin/bsdconfig/startup/misc projects/sendfile/usr.sbin/bsdconfig/startup/rcadd projects/sendfile/usr.sbin/bsdconfig/startup/rcconf projects/sendfile/usr.sbin/bsdconfig/startup/rcdelete projects/sendfile/usr.sbin/bsdconfig/startup/rcedit projects/sendfile/usr.sbin/bsdconfig/startup/rcvar projects/sendfile/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/sendfile/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/sendfile/usr.sbin/bsdconfig/startup/share/rcvar.subr projects/sendfile/usr.sbin/bsdconfig/startup/startup projects/sendfile/usr.sbin/bsdconfig/timezone/share/zones.subr projects/sendfile/usr.sbin/bsdconfig/timezone/timezone projects/sendfile/usr.sbin/bsdconfig/ttys/ttys projects/sendfile/usr.sbin/bsdconfig/usermgmt/groupadd projects/sendfile/usr.sbin/bsdconfig/usermgmt/groupdel projects/sendfile/usr.sbin/bsdconfig/usermgmt/groupedit projects/sendfile/usr.sbin/bsdconfig/usermgmt/groupinput projects/sendfile/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/sendfile/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/sendfile/usr.sbin/bsdconfig/usermgmt/useradd projects/sendfile/usr.sbin/bsdconfig/usermgmt/userdel projects/sendfile/usr.sbin/bsdconfig/usermgmt/useredit projects/sendfile/usr.sbin/bsdconfig/usermgmt/userinput projects/sendfile/usr.sbin/bsdconfig/usermgmt/usermgmt projects/sendfile/usr.sbin/bsdinstall/scripts/zfsboot projects/sendfile/usr.sbin/ctld/ctl.conf.5 projects/sendfile/usr.sbin/ctld/parse.y projects/sendfile/usr.sbin/mfiutil/mfi_show.c Directory Properties: projects/sendfile/ (props changed) projects/sendfile/cddl/ (props changed) projects/sendfile/cddl/contrib/opensolaris/ (props changed) projects/sendfile/contrib/gcc/ (props changed) projects/sendfile/contrib/llvm/ (props changed) projects/sendfile/contrib/llvm/tools/clang/ (props changed) projects/sendfile/contrib/llvm/tools/lldb/ (props changed) projects/sendfile/contrib/nvi/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/include/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/amd64/vmm/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) projects/sendfile/sys/conf/ (props changed) projects/sendfile/usr.sbin/bhyve/ (props changed) projects/sendfile/usr.sbin/bhyveload/ (props changed) Modified: projects/sendfile/Makefile.inc1 ============================================================================== --- projects/sendfile/Makefile.inc1 Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/Makefile.inc1 Sun Dec 8 19:20:50 2013 (r259105) @@ -1499,7 +1499,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libelf lib/libexpat \ ${_lib_libgssapi} ${_lib_libipx} \ - lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ + lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \ + ${_lib_libcapsicum} \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ @@ -1521,6 +1522,11 @@ _lib_libthr= lib/libthr _ofed_lib= contrib/ofed/usr.lib/ .endif +.if ${MK_CASPER} != "no" +_lib_libcapsicum=lib/libcapsicum +.endif + +lib/libcapsicum__L: lib/libnv__L lib/libpjdlog__L: lib/libutil__L _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib} Modified: projects/sendfile/ObsoleteFiles.inc ============================================================================== --- projects/sendfile/ObsoleteFiles.inc Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/ObsoleteFiles.inc Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/bin/sh/eval.c ============================================================================== --- projects/sendfile/bin/sh/eval.c Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/bin/sh/eval.c Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/bin/test/test.c ============================================================================== --- projects/sendfile/bin/test/test.c Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/bin/test/test.c Sun Dec 8 19:20:50 2013 (r259105) @@ -67,9 +67,18 @@ error(const char *msg, ...) operand ::= <any legal UNIX file name> */ +enum token_types { + UNOP = 0x100, + BINOP = 0x200, + BUNOP = 0x300, + BBINOP = 0x400, + PAREN = 0x500 +}; + enum token { EOI, - FILRD, + OPERAND, + FILRD = UNOP + 1, FILWR, FILEX, FILEXIST, @@ -85,13 +94,13 @@ enum token { FILSUID, FILSGID, FILSTCK, - FILNT, - FILOT, - FILEQ, - FILUID, - FILGID, STREZ, STRNZ, + FILUID, + FILGID, + FILNT = BINOP + 1, + FILOT, + FILEQ, STREQ, STRNE, STRLT, @@ -102,76 +111,68 @@ enum token { INTGT, INTLE, INTLT, - UNOT, - BAND, + UNOT = BUNOP + 1, + BAND = BBINOP + 1, BOR, - LPAREN, - RPAREN, - OPERAND + LPAREN = PAREN + 1, + RPAREN }; -enum token_types { - UNOP, - BINOP, - BUNOP, - BBINOP, - PAREN -}; +#define TOKEN_TYPE(token) ((token) & 0xff00) static struct t_op { char op_text[4]; - short op_num, op_type; + short op_num; } const ops [] = { - {"-r", FILRD, UNOP}, - {"-w", FILWR, UNOP}, - {"-x", FILEX, UNOP}, - {"-e", FILEXIST,UNOP}, - {"-f", FILREG, UNOP}, - {"-d", FILDIR, UNOP}, - {"-c", FILCDEV,UNOP}, - {"-b", FILBDEV,UNOP}, - {"-p", FILFIFO,UNOP}, - {"-u", FILSUID,UNOP}, - {"-g", FILSGID,UNOP}, - {"-k", FILSTCK,UNOP}, - {"-s", FILGZ, UNOP}, - {"-t", FILTT, UNOP}, - {"-z", STREZ, UNOP}, - {"-n", STRNZ, UNOP}, - {"-h", FILSYM, UNOP}, /* for backwards compat */ - {"-O", FILUID, UNOP}, - {"-G", FILGID, UNOP}, - {"-L", FILSYM, UNOP}, - {"-S", FILSOCK,UNOP}, - {"=", STREQ, BINOP}, - {"==", STREQ, BINOP}, - {"!=", STRNE, BINOP}, - {"<", STRLT, BINOP}, - {">", STRGT, BINOP}, - {"-eq", INTEQ, BINOP}, - {"-ne", INTNE, BINOP}, - {"-ge", INTGE, BINOP}, - {"-gt", INTGT, BINOP}, - {"-le", INTLE, BINOP}, - {"-lt", INTLT, BINOP}, - {"-nt", FILNT, BINOP}, - {"-ot", FILOT, BINOP}, - {"-ef", FILEQ, BINOP}, - {"!", UNOT, BUNOP}, - {"-a", BAND, BBINOP}, - {"-o", BOR, BBINOP}, - {"(", LPAREN, PAREN}, - {")", RPAREN, PAREN}, - {"", 0, 0} + {"-r", FILRD}, + {"-w", FILWR}, + {"-x", FILEX}, + {"-e", FILEXIST}, + {"-f", FILREG}, + {"-d", FILDIR}, + {"-c", FILCDEV}, + {"-b", FILBDEV}, + {"-p", FILFIFO}, + {"-u", FILSUID}, + {"-g", FILSGID}, + {"-k", FILSTCK}, + {"-s", FILGZ}, + {"-t", FILTT}, + {"-z", STREZ}, + {"-n", STRNZ}, + {"-h", FILSYM}, /* for backwards compat */ + {"-O", FILUID}, + {"-G", FILGID}, + {"-L", FILSYM}, + {"-S", FILSOCK}, + {"=", STREQ}, + {"==", STREQ}, + {"!=", STRNE}, + {"<", STRLT}, + {">", STRGT}, + {"-eq", INTEQ}, + {"-ne", INTNE}, + {"-ge", INTGE}, + {"-gt", INTGT}, + {"-le", INTLE}, + {"-lt", INTLT}, + {"-nt", FILNT}, + {"-ot", FILOT}, + {"-ef", FILEQ}, + {"!", UNOT}, + {"-a", BAND}, + {"-o", BOR}, + {"(", LPAREN}, + {")", RPAREN}, + {"", 0} }; -static struct t_op const *t_wp_op; static int nargc; 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 *); @@ -295,10 +296,10 @@ primary(enum token n) parenlevel--; return res; } - if (t_wp_op && t_wp_op->op_type == UNOP) { + if (TOKEN_TYPE(n) == UNOP) { /* unary expression */ if (--nargc == 0) - syntax(t_wp_op->op_text, "argument expected"); + syntax(NULL, "argument expected"); /* impossible */ switch (n) { case STREZ: return strlen(*++t_wp) == 0; @@ -311,28 +312,25 @@ primary(enum token n) } } - if (t_lex(nargc > 0 ? t_wp[1] : NULL), t_wp_op && t_wp_op->op_type == - 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, *opnd2; - struct t_op const *op; + const char *opnd1, *op, *opnd2; opnd1 = *t_wp; - (void) t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL); - op = t_wp_op; + op = nargc > 0 ? (--nargc, *++t_wp) : NULL; if ((opnd2 = nargc > 0 ? (--nargc, *++t_wp) : NULL) == NULL) - syntax(op->op_text, "argument expected"); + syntax(op, "argument expected"); - switch (op->op_num) { + switch (n) { case STREQ: return strcmp(opnd1, opnd2) == 0; case STRNE: @@ -424,22 +422,20 @@ t_lex(char *s) struct t_op const *op = ops; if (s == 0) { - t_wp_op = NULL; return EOI; } while (*op->op_text) { if (strcmp(s, op->op_text) == 0) { - if (((op->op_type == UNOP || op->op_type == BUNOP) + if (((TOKEN_TYPE(op->op_num) == UNOP || + TOKEN_TYPE(op->op_num) == BUNOP) && isunopoperand()) || (op->op_num == LPAREN && islparenoperand()) || (op->op_num == RPAREN && isrparenoperand())) break; - t_wp_op = op; return op->op_num; } op++; } - t_wp_op = NULL; return OPERAND; } @@ -458,7 +454,7 @@ isunopoperand(void) t = *(t_wp + 2); while (*op->op_text) { if (strcmp(s, op->op_text) == 0) - return op->op_type == BINOP && + return TOKEN_TYPE(op->op_num) == BINOP && (parenlevel == 0 || t[0] != ')' || t[1] != '\0'); op++; } @@ -480,7 +476,7 @@ islparenoperand(void) return 0; while (*op->op_text) { if (strcmp(s, op->op_text) == 0) - return op->op_type == BINOP; + return TOKEN_TYPE(op->op_num) == BINOP; op++; } return 0; Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/contrib/gcc/ChangeLog.gcc43 ============================================================================== --- projects/sendfile/contrib/gcc/ChangeLog.gcc43 Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/contrib/gcc/ChangeLog.gcc43 Sun Dec 8 19:20:50 2013 (r259105) @@ -45,18 +45,40 @@ * flags.h (force_align_functions_log): Delete. * toplev.c (force_align_functions_log): Delete. +2007-06-28 Geoffrey Keating <geoffk@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@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@apple.com> +2007-05-31 Eric Christopher <echristo@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@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@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@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@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@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@gcc.gnu.org> (r120505) PR c/19978 Modified: projects/sendfile/contrib/gcc/c-common.c ============================================================================== --- projects/sendfile/contrib/gcc/c-common.c Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/contrib/gcc/c-common.c Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/contrib/gcc/c-common.h ============================================================================== --- projects/sendfile/contrib/gcc/c-common.h Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/contrib/gcc/c-common.h Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/contrib/gcc/c-opts.c ============================================================================== --- projects/sendfile/contrib/gcc/c-opts.c Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/contrib/gcc/c-opts.c Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/contrib/gcc/c-typeck.c ============================================================================== --- projects/sendfile/contrib/gcc/c-typeck.c Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/contrib/gcc/c-typeck.c Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/contrib/gcc/c.opt ============================================================================== --- projects/sendfile/contrib/gcc/c.opt Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/contrib/gcc/c.opt Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/contrib/gcc/config/i386/i386.c ============================================================================== --- projects/sendfile/contrib/gcc/config/i386/i386.c Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/contrib/gcc/config/i386/i386.c Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/contrib/gcc/config/rs6000/altivec.h ============================================================================== --- projects/sendfile/contrib/gcc/config/rs6000/altivec.h Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/contrib/gcc/config/rs6000/altivec.h Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/contrib/gcc/config/rs6000/rs6000-c.c ============================================================================== --- projects/sendfile/contrib/gcc/config/rs6000/rs6000-c.c Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/contrib/gcc/config/rs6000/rs6000-c.c Sun Dec 8 19:20:50 2013 (r259105) @@ -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: projects/sendfile/contrib/gcc/config/rs6000/rs6000.c ============================================================================== --- projects/sendfile/contrib/gcc/config/rs6000/rs6000.c Sun Dec 8 18:48:07 2013 (r259104) +++ projects/sendfile/contrib/gcc/config/rs6000/rs6000.c Sun Dec 8 19:20:50 2013 (r259105) @@ -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) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312081920.rB8JKqQS009938>