From owner-svn-src-projects@FreeBSD.ORG Sat Dec 14 17:47:07 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 618F18FF; Sat, 14 Dec 2013 17:47:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4746C1248; Sat, 14 Dec 2013 17:47:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBEHl7cU081523; Sat, 14 Dec 2013 17:47:07 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBEHkxme081463; Sat, 14 Dec 2013 17:46:59 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201312141746.rBEHkxme081463@svn.freebsd.org> From: Justin Hibbits Date: Sat, 14 Dec 2013 17:46:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r259392 - in projects/pmac_pmu: bin bin/date bin/date/tests bin/mv bin/mv/tests bin/pax bin/pax/tests bin/sh bin/sh/tests bin/test bin/test/tests bin/tests cddl/contrib/opensolaris/cmd/... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Dec 2013 17:47:07 -0000 Author: jhibbits Date: Sat Dec 14 17:46:58 2013 New Revision: 259392 URL: http://svnweb.freebsd.org/changeset/base/259392 Log: MFC@r259387 Added: projects/pmac_pmu/bin/date/tests/ - copied from r259387, head/bin/date/tests/ projects/pmac_pmu/bin/mv/tests/ - copied from r259387, head/bin/mv/tests/ projects/pmac_pmu/bin/pax/tests/ - copied from r259387, head/bin/pax/tests/ projects/pmac_pmu/bin/sh/tests/ - copied from r259387, head/bin/sh/tests/ projects/pmac_pmu/bin/test/tests/ - copied from r259387, head/bin/test/tests/ projects/pmac_pmu/bin/tests/ - copied from r259387, head/bin/tests/ projects/pmac_pmu/share/mk/tap.test.mk - copied unchanged from r259387, head/share/mk/tap.test.mk projects/pmac_pmu/sys/boot/fdt/dts/beri-netfpga.dts - copied unchanged from r259387, head/sys/boot/fdt/dts/beri-netfpga.dts projects/pmac_pmu/sys/mips/conf/BERI_NETFPGA_MDROOT - copied unchanged from r259387, head/sys/mips/conf/BERI_NETFPGA_MDROOT projects/pmac_pmu/sys/opencrypto/cryptodeflate.c - copied unchanged from r259387, head/sys/opencrypto/cryptodeflate.c projects/pmac_pmu/tools/regression/usr.bin/sed/regress.icase4.out - copied unchanged from r259387, head/tools/regression/usr.bin/sed/regress.icase4.out projects/pmac_pmu/tools/regression/usr.sbin/etcupdate/tzsetup.sh - copied unchanged from r259387, head/tools/regression/usr.sbin/etcupdate/tzsetup.sh projects/pmac_pmu/usr.sbin/bhyve/bhyve.8 - copied unchanged from r259387, head/usr.sbin/bhyve/bhyve.8 Deleted: projects/pmac_pmu/sys/opencrypto/deflate.c projects/pmac_pmu/tools/regression/bin/ Modified: projects/pmac_pmu/bin/Makefile projects/pmac_pmu/bin/date/Makefile projects/pmac_pmu/bin/mv/Makefile projects/pmac_pmu/bin/pax/Makefile projects/pmac_pmu/bin/sh/Makefile projects/pmac_pmu/bin/sh/eval.c projects/pmac_pmu/bin/test/Makefile projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c projects/pmac_pmu/contrib/gcc/ChangeLog.gcc43 projects/pmac_pmu/contrib/gcc/c-common.c projects/pmac_pmu/contrib/gcc/c-common.h projects/pmac_pmu/contrib/gcc/c-typeck.c projects/pmac_pmu/contrib/gcc/c.opt projects/pmac_pmu/contrib/gcc/config/i386/emmintrin.h projects/pmac_pmu/contrib/gcc/cp/ChangeLog.gcc43 projects/pmac_pmu/contrib/gcc/cp/decl.c projects/pmac_pmu/contrib/gcc/cp/decl2.c projects/pmac_pmu/contrib/gcc/cp/typeck.c projects/pmac_pmu/contrib/gcc/doc/invoke.texi projects/pmac_pmu/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp projects/pmac_pmu/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/pmac_pmu/contrib/llvm/tools/clang/lib/Driver/ToolChains.h projects/pmac_pmu/contrib/nvi/cl/cl_term.c projects/pmac_pmu/contrib/nvi/common/key.c projects/pmac_pmu/contrib/nvi/common/key.h projects/pmac_pmu/crypto/heimdal/lib/gssapi/krb5/prf.c projects/pmac_pmu/etc/devd/usb.conf projects/pmac_pmu/etc/mtree/BSD.tests.dist projects/pmac_pmu/etc/rc.d/jail projects/pmac_pmu/etc/syslog.conf projects/pmac_pmu/games/fortune/datfiles/fortunes projects/pmac_pmu/games/fortune/fortune/fortune.c projects/pmac_pmu/include/rpcsvc/bootparam_prot.x projects/pmac_pmu/include/rpcsvc/key_prot.x projects/pmac_pmu/include/rpcsvc/klm_prot.x projects/pmac_pmu/include/rpcsvc/mount.x projects/pmac_pmu/include/rpcsvc/nfs_prot.x projects/pmac_pmu/include/rpcsvc/nis.x projects/pmac_pmu/include/rpcsvc/nis_callback.x projects/pmac_pmu/include/rpcsvc/nis_object.x projects/pmac_pmu/include/rpcsvc/nis_tags.h projects/pmac_pmu/include/rpcsvc/rex.x projects/pmac_pmu/include/rpcsvc/rnusers.x projects/pmac_pmu/include/rpcsvc/rstat.x projects/pmac_pmu/include/rpcsvc/sm_inter.x projects/pmac_pmu/include/rpcsvc/spray.x projects/pmac_pmu/include/rpcsvc/yp.x projects/pmac_pmu/include/rpcsvc/yppasswd.x projects/pmac_pmu/lib/libc/stdlib/atexit.c projects/pmac_pmu/lib/libc/stdlib/getopt_long.3 projects/pmac_pmu/lib/libc/sys/wait.2 projects/pmac_pmu/lib/libc/xdr/xdr.c projects/pmac_pmu/lib/libc/xdr/xdr_array.c projects/pmac_pmu/lib/libc/xdr/xdr_float.c projects/pmac_pmu/lib/libc/xdr/xdr_mem.c projects/pmac_pmu/lib/libc/xdr/xdr_rec.c projects/pmac_pmu/lib/libc/xdr/xdr_reference.c projects/pmac_pmu/lib/libc/xdr/xdr_sizeof.c projects/pmac_pmu/lib/libc/xdr/xdr_stdio.c projects/pmac_pmu/libexec/rtld-elf/rtld.c projects/pmac_pmu/libexec/rtld-elf/rtld.h projects/pmac_pmu/libexec/rtld-elf/xmalloc.c projects/pmac_pmu/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/pmac_pmu/release/release.conf.sample projects/pmac_pmu/release/release.sh projects/pmac_pmu/release/scripts/pkg-stage.sh projects/pmac_pmu/sbin/casperd/casperd.8 projects/pmac_pmu/sbin/devd/devd.cc projects/pmac_pmu/sbin/growfs/growfs.8 projects/pmac_pmu/sbin/hastd/hastd.c projects/pmac_pmu/sbin/hastd/nv.c projects/pmac_pmu/sbin/hastd/primary.c projects/pmac_pmu/sbin/hastd/proto.c projects/pmac_pmu/sbin/hastd/secondary.c projects/pmac_pmu/sbin/mount_nfs/mount_nfs.8 projects/pmac_pmu/share/man/man4/netmap.4 projects/pmac_pmu/share/man/man4/run.4 projects/pmac_pmu/share/mk/Makefile projects/pmac_pmu/share/mk/bsd.progs.mk projects/pmac_pmu/share/mk/bsd.sys.mk projects/pmac_pmu/sys/amd64/include/apicvar.h projects/pmac_pmu/sys/amd64/include/vmm.h (contents, props changed) projects/pmac_pmu/sys/amd64/vmm/intel/vmx.c projects/pmac_pmu/sys/amd64/vmm/io/vlapic.c projects/pmac_pmu/sys/amd64/vmm/io/vlapic.h projects/pmac_pmu/sys/amd64/vmm/vmm.c projects/pmac_pmu/sys/amd64/vmm/vmm_lapic.c projects/pmac_pmu/sys/amd64/vmm/vmm_lapic.h projects/pmac_pmu/sys/amd64/vmm/vmm_msr.c projects/pmac_pmu/sys/amd64/vmm/vmm_msr.h projects/pmac_pmu/sys/arm/arm/bus_space-v6.c projects/pmac_pmu/sys/arm/at91/at91_machdep.c projects/pmac_pmu/sys/arm/at91/if_ate.c projects/pmac_pmu/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/pmac_pmu/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/pmac_pmu/sys/arm/freescale/imx/files.imx51 projects/pmac_pmu/sys/arm/freescale/imx/files.imx53 projects/pmac_pmu/sys/arm/freescale/imx/files.imx6 projects/pmac_pmu/sys/arm/rockchip/rk30xx_gpio.c projects/pmac_pmu/sys/arm/ti/am335x/am335x_dmtimer.c projects/pmac_pmu/sys/arm/ti/am335x/am335x_scm_padconf.c projects/pmac_pmu/sys/arm/ti/files.ti projects/pmac_pmu/sys/arm/ti/ti_gpio.c projects/pmac_pmu/sys/arm/ti/ti_i2c.c projects/pmac_pmu/sys/arm/versatile/bus_space.c projects/pmac_pmu/sys/arm/xilinx/zy7_bus_space.c projects/pmac_pmu/sys/boot/fdt/dts/rk3188.dtsi projects/pmac_pmu/sys/cam/scsi/scsi_all.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c projects/pmac_pmu/sys/conf/files projects/pmac_pmu/sys/conf/files.powerpc projects/pmac_pmu/sys/conf/kern.mk projects/pmac_pmu/sys/conf/options projects/pmac_pmu/sys/dev/ahci/ahciem.c projects/pmac_pmu/sys/dev/cxgbe/adapter.h projects/pmac_pmu/sys/dev/cxgbe/common/common.h projects/pmac_pmu/sys/dev/cxgbe/offload.h projects/pmac_pmu/sys/dev/cxgbe/t4_main.c projects/pmac_pmu/sys/dev/cxgbe/t4_sge.c projects/pmac_pmu/sys/dev/cxgbe/tom/t4_cpl_io.c projects/pmac_pmu/sys/dev/drm2/drmP.h projects/pmac_pmu/sys/dev/drm2/drm_fb_helper.c projects/pmac_pmu/sys/dev/drm2/radeon/atombios_dp.c projects/pmac_pmu/sys/dev/drm2/radeon/radeon_agp.c projects/pmac_pmu/sys/dev/gpio/gpioiic.c projects/pmac_pmu/sys/dev/gpio/gpioled.c projects/pmac_pmu/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/pmac_pmu/sys/dev/iicbus/ds1631.c projects/pmac_pmu/sys/dev/iicbus/ds1775.c projects/pmac_pmu/sys/dev/iicbus/max6690.c projects/pmac_pmu/sys/dev/iscsi/iscsi.c projects/pmac_pmu/sys/dev/iwn/if_iwn.c projects/pmac_pmu/sys/dev/iwn/if_iwn_chip_cfg.h projects/pmac_pmu/sys/dev/iwn/if_iwnreg.h projects/pmac_pmu/sys/dev/iwn/if_iwnvar.h projects/pmac_pmu/sys/dev/md/md.c projects/pmac_pmu/sys/dev/ofw/ofw_fdt.c projects/pmac_pmu/sys/dev/usb/controller/at91dci.c projects/pmac_pmu/sys/dev/usb/controller/atmegadci.c projects/pmac_pmu/sys/dev/usb/controller/avr32dci.c projects/pmac_pmu/sys/dev/usb/controller/dwc_otg.c projects/pmac_pmu/sys/dev/usb/controller/ehci.c projects/pmac_pmu/sys/dev/usb/controller/musb_otg.c projects/pmac_pmu/sys/dev/usb/controller/ohci.c projects/pmac_pmu/sys/dev/usb/controller/uhci.c projects/pmac_pmu/sys/dev/usb/controller/usb_controller.c projects/pmac_pmu/sys/dev/usb/controller/uss820dci.c projects/pmac_pmu/sys/dev/usb/controller/xhci.c projects/pmac_pmu/sys/dev/usb/template/usb_template.c projects/pmac_pmu/sys/dev/usb/usb_bus.h projects/pmac_pmu/sys/dev/usb/usb_controller.h projects/pmac_pmu/sys/dev/usb/usb_device.c projects/pmac_pmu/sys/dev/usb/usb_device.h projects/pmac_pmu/sys/dev/usb/usb_hub.c projects/pmac_pmu/sys/dev/usb/usb_transfer.c projects/pmac_pmu/sys/dev/usb/usbdevs projects/pmac_pmu/sys/dev/usb/usbdi.h projects/pmac_pmu/sys/dev/usb/wlan/if_run.c projects/pmac_pmu/sys/dev/usb/wlan/if_runreg.h projects/pmac_pmu/sys/dev/usb/wlan/if_runvar.h projects/pmac_pmu/sys/dev/vt/font/vt_mouse_cursor.c projects/pmac_pmu/sys/dev/vt/vt.h projects/pmac_pmu/sys/dev/vt/vt_buf.c projects/pmac_pmu/sys/dev/vt/vt_core.c projects/pmac_pmu/sys/dev/vt/vt_sysmouse.c projects/pmac_pmu/sys/fs/devfs/devfs_devs.c projects/pmac_pmu/sys/fs/nfsclient/nfs_clbio.c projects/pmac_pmu/sys/fs/nfsclient/nfs_clvfsops.c projects/pmac_pmu/sys/fs/nfsclient/nfs_clvnops.c projects/pmac_pmu/sys/fs/nfsclient/nfsnode.h projects/pmac_pmu/sys/geom/geom_dev.c projects/pmac_pmu/sys/i386/include/apicvar.h projects/pmac_pmu/sys/ia64/ia64/pmap.c projects/pmac_pmu/sys/kern/kern_resource.c projects/pmac_pmu/sys/kern/subr_vmem.c projects/pmac_pmu/sys/kern/vfs_bio.c projects/pmac_pmu/sys/mips/beri/beri_machdep.c projects/pmac_pmu/sys/mips/cavium/octe/cavium-ethernet.h projects/pmac_pmu/sys/mips/cavium/octe/ethernet-mv88e61xx.c projects/pmac_pmu/sys/modules/crypto/Makefile projects/pmac_pmu/sys/modules/drm2/drm2/Makefile projects/pmac_pmu/sys/modules/drm2/i915kms/Makefile projects/pmac_pmu/sys/modules/drm2/radeonkms/Makefile projects/pmac_pmu/sys/modules/iwnfw/iwn6000g2b/Makefile projects/pmac_pmu/sys/modules/usb/Makefile projects/pmac_pmu/sys/nfsclient/nfsargs.h projects/pmac_pmu/sys/powerpc/aim/trap.c projects/pmac_pmu/sys/powerpc/aim/trap_subr32.S projects/pmac_pmu/sys/powerpc/aim/trap_subr64.S projects/pmac_pmu/sys/powerpc/cpufreq/pmufreq.c projects/pmac_pmu/sys/powerpc/include/spr.h projects/pmac_pmu/sys/powerpc/powermac/platform_powermac.c projects/pmac_pmu/sys/powerpc/powermac/pmuvar.h projects/pmac_pmu/sys/powerpc/powerpc/mp_machdep.c projects/pmac_pmu/sys/sparc64/sparc64/machdep.c projects/pmac_pmu/sys/vm/vm_page.c projects/pmac_pmu/sys/vm/vm_radix.c projects/pmac_pmu/sys/vm/vm_radix.h projects/pmac_pmu/sys/x86/acpica/madt.c projects/pmac_pmu/sys/x86/cpufreq/est.c projects/pmac_pmu/sys/x86/include/apicreg.h projects/pmac_pmu/sys/x86/include/mptable.h projects/pmac_pmu/sys/x86/x86/local_apic.c projects/pmac_pmu/sys/x86/x86/mptable.c projects/pmac_pmu/tools/regression/usr.bin/sed/regress.sh projects/pmac_pmu/tools/regression/usr.sbin/etcupdate/preworld.sh projects/pmac_pmu/tools/regression/usr.sbin/etcupdate/tests.sh projects/pmac_pmu/tools/tools/cxgbetool/cxgbetool.c projects/pmac_pmu/usr.bin/bc/bc.1 projects/pmac_pmu/usr.bin/bc/bc.y projects/pmac_pmu/usr.bin/calendar/calcpp.c projects/pmac_pmu/usr.bin/dtc/fdt.cc projects/pmac_pmu/usr.bin/sed/compile.c projects/pmac_pmu/usr.bin/sed/sed.1 projects/pmac_pmu/usr.sbin/bhyve/Makefile projects/pmac_pmu/usr.sbin/bhyve/bhyverun.c projects/pmac_pmu/usr.sbin/bhyvectl/bhyvectl.c projects/pmac_pmu/usr.sbin/bsdconfig/console/console projects/pmac_pmu/usr.sbin/bsdconfig/console/font projects/pmac_pmu/usr.sbin/bsdconfig/console/keymap projects/pmac_pmu/usr.sbin/bsdconfig/console/repeat projects/pmac_pmu/usr.sbin/bsdconfig/console/saver projects/pmac_pmu/usr.sbin/bsdconfig/console/screenmap projects/pmac_pmu/usr.sbin/bsdconfig/console/ttys projects/pmac_pmu/usr.sbin/bsdconfig/diskmgmt/diskmgmt projects/pmac_pmu/usr.sbin/bsdconfig/docsinstall/docsinstall projects/pmac_pmu/usr.sbin/bsdconfig/dot/dot projects/pmac_pmu/usr.sbin/bsdconfig/includes/includes projects/pmac_pmu/usr.sbin/bsdconfig/mouse/disable projects/pmac_pmu/usr.sbin/bsdconfig/mouse/enable projects/pmac_pmu/usr.sbin/bsdconfig/mouse/flags projects/pmac_pmu/usr.sbin/bsdconfig/mouse/mouse projects/pmac_pmu/usr.sbin/bsdconfig/mouse/port projects/pmac_pmu/usr.sbin/bsdconfig/mouse/type projects/pmac_pmu/usr.sbin/bsdconfig/networking/defaultrouter projects/pmac_pmu/usr.sbin/bsdconfig/networking/devices projects/pmac_pmu/usr.sbin/bsdconfig/networking/hostname projects/pmac_pmu/usr.sbin/bsdconfig/networking/nameservers projects/pmac_pmu/usr.sbin/bsdconfig/networking/networking projects/pmac_pmu/usr.sbin/bsdconfig/networking/share/device.subr projects/pmac_pmu/usr.sbin/bsdconfig/networking/share/hostname.subr projects/pmac_pmu/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/pmac_pmu/usr.sbin/bsdconfig/networking/share/media.subr projects/pmac_pmu/usr.sbin/bsdconfig/networking/share/netmask.subr projects/pmac_pmu/usr.sbin/bsdconfig/networking/share/resolv.subr projects/pmac_pmu/usr.sbin/bsdconfig/networking/share/routing.subr projects/pmac_pmu/usr.sbin/bsdconfig/networking/share/services.subr projects/pmac_pmu/usr.sbin/bsdconfig/packages/packages projects/pmac_pmu/usr.sbin/bsdconfig/password/password projects/pmac_pmu/usr.sbin/bsdconfig/security/kern_securelevel projects/pmac_pmu/usr.sbin/bsdconfig/security/security projects/pmac_pmu/usr.sbin/bsdconfig/share/common.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/device.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/dialog.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/keymap.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/media/cdrom.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/media/common.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/media/dos.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/media/floppy.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/media/ftp.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/media/nfs.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/media/tcpip.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/media/ufs.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/media/usb.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/mustberoot.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/packages/categories.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/packages/index.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/packages/packages.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/strings.subr projects/pmac_pmu/usr.sbin/bsdconfig/share/sysrc.subr projects/pmac_pmu/usr.sbin/bsdconfig/startup/misc projects/pmac_pmu/usr.sbin/bsdconfig/startup/rcadd projects/pmac_pmu/usr.sbin/bsdconfig/startup/rcconf projects/pmac_pmu/usr.sbin/bsdconfig/startup/rcdelete projects/pmac_pmu/usr.sbin/bsdconfig/startup/rcedit projects/pmac_pmu/usr.sbin/bsdconfig/startup/rcvar projects/pmac_pmu/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/pmac_pmu/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/pmac_pmu/usr.sbin/bsdconfig/startup/share/rcvar.subr projects/pmac_pmu/usr.sbin/bsdconfig/startup/startup projects/pmac_pmu/usr.sbin/bsdconfig/timezone/share/zones.subr projects/pmac_pmu/usr.sbin/bsdconfig/timezone/timezone projects/pmac_pmu/usr.sbin/bsdconfig/ttys/ttys projects/pmac_pmu/usr.sbin/bsdconfig/usermgmt/groupadd projects/pmac_pmu/usr.sbin/bsdconfig/usermgmt/groupdel projects/pmac_pmu/usr.sbin/bsdconfig/usermgmt/groupedit projects/pmac_pmu/usr.sbin/bsdconfig/usermgmt/groupinput projects/pmac_pmu/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/pmac_pmu/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/pmac_pmu/usr.sbin/bsdconfig/usermgmt/useradd projects/pmac_pmu/usr.sbin/bsdconfig/usermgmt/userdel projects/pmac_pmu/usr.sbin/bsdconfig/usermgmt/useredit projects/pmac_pmu/usr.sbin/bsdconfig/usermgmt/userinput projects/pmac_pmu/usr.sbin/bsdconfig/usermgmt/usermgmt projects/pmac_pmu/usr.sbin/bsdinstall/bsdinstall projects/pmac_pmu/usr.sbin/bsdinstall/scripts/services projects/pmac_pmu/usr.sbin/bsdinstall/scripts/zfsboot projects/pmac_pmu/usr.sbin/ctld/login.c projects/pmac_pmu/usr.sbin/etcupdate/etcupdate.8 projects/pmac_pmu/usr.sbin/etcupdate/etcupdate.sh projects/pmac_pmu/usr.sbin/mptable/mptable.c projects/pmac_pmu/usr.sbin/mtest/mtest.8 projects/pmac_pmu/usr.sbin/ndp/ndp.c projects/pmac_pmu/usr.sbin/pkg/config.c projects/pmac_pmu/usr.sbin/pkg/config.h projects/pmac_pmu/usr.sbin/pkg/pkg.7 Directory Properties: projects/pmac_pmu/ (props changed) projects/pmac_pmu/cddl/ (props changed) projects/pmac_pmu/cddl/contrib/opensolaris/ (props changed) projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/pmac_pmu/contrib/gcc/ (props changed) projects/pmac_pmu/contrib/llvm/ (props changed) projects/pmac_pmu/contrib/llvm/tools/clang/ (props changed) projects/pmac_pmu/contrib/nvi/ (props changed) projects/pmac_pmu/crypto/heimdal/ (props changed) projects/pmac_pmu/etc/ (props changed) projects/pmac_pmu/include/ (props changed) projects/pmac_pmu/lib/libc/ (props changed) projects/pmac_pmu/sbin/ (props changed) projects/pmac_pmu/share/man/man4/ (props changed) projects/pmac_pmu/sys/ (props changed) projects/pmac_pmu/sys/amd64/vmm/ (props changed) projects/pmac_pmu/sys/boot/ (props changed) projects/pmac_pmu/sys/cddl/contrib/opensolaris/ (props changed) projects/pmac_pmu/sys/conf/ (props changed) projects/pmac_pmu/sys/dev/hyperv/ (props changed) projects/pmac_pmu/usr.bin/calendar/ (props changed) projects/pmac_pmu/usr.sbin/bhyve/ (props changed) projects/pmac_pmu/usr.sbin/bhyvectl/ (props changed) Modified: projects/pmac_pmu/bin/Makefile ============================================================================== --- projects/pmac_pmu/bin/Makefile Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/bin/Makefile Sat Dec 14 17:46:58 2013 (r259392) @@ -52,6 +52,10 @@ SUBDIR+= rmail SUBDIR+= csh .endif +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include SUBDIR:= ${SUBDIR:O} Modified: projects/pmac_pmu/bin/date/Makefile ============================================================================== --- projects/pmac_pmu/bin/date/Makefile Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/bin/date/Makefile Sat Dec 14 17:46:58 2013 (r259392) @@ -1,7 +1,13 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include + PROG= date SRCS= date.c netdate.c vary.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include Modified: projects/pmac_pmu/bin/mv/Makefile ============================================================================== --- projects/pmac_pmu/bin/mv/Makefile Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/bin/mv/Makefile Sat Dec 14 17:46:58 2013 (r259392) @@ -1,6 +1,12 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 # $FreeBSD$ +.include + PROG= mv +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include Modified: projects/pmac_pmu/bin/pax/Makefile ============================================================================== --- projects/pmac_pmu/bin/pax/Makefile Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/bin/pax/Makefile Sat Dec 14 17:46:58 2013 (r259392) @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include + # To install on versions prior to BSD 4.4 the following may have to be # defined with CFLAGS += # @@ -30,4 +32,8 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \ tables.c tar.c tty_subs.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include Modified: projects/pmac_pmu/bin/sh/Makefile ============================================================================== --- projects/pmac_pmu/bin/sh/Makefile Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/bin/sh/Makefile Sat Dec 14 17:46:58 2013 (r259392) @@ -1,6 +1,8 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 # $FreeBSD$ +.include + PROG= sh INSTALLFLAGS= -S SHSRCS= alias.c arith_yacc.c arith_yylex.c cd.c echo.c error.c eval.c \ @@ -59,7 +61,8 @@ syntax.c syntax.h: mksyntax token.h: mktokens sh ${.CURDIR}/mktokens -regress: - cd ${.CURDIR}/../../tools/regression/bin/sh && ${MAKE} SH=${.OBJDIR}/sh +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include Modified: projects/pmac_pmu/bin/sh/eval.c ============================================================================== --- projects/pmac_pmu/bin/sh/eval.c Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/bin/sh/eval.c Sat Dec 14 17:46:58 2013 (r259392) @@ -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/pmac_pmu/bin/test/Makefile ============================================================================== --- projects/pmac_pmu/bin/test/Makefile Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/bin/test/Makefile Sat Dec 14 17:46:58 2013 (r259392) @@ -1,8 +1,14 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include + PROG= test LINKS= ${BINDIR}/test ${BINDIR}/[ MLINKS= test.1 [.1 +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Sat Dec 14 17:46:58 2013 (r259392) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Dec 14 17:46:58 2013 (r259392) @@ -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: projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Sat Dec 14 17:46:58 2013 (r259392) @@ -995,10 +995,10 @@ nozpool_all_slices(avl_tree_t *r, const #endif /* sun */ } +#ifdef sun static void check_slices(avl_tree_t *r, int fd, const char *sname) { -#ifdef sun struct extvtoc vtoc; struct dk_gpt *gpt; char diskname[MAXNAMELEN]; @@ -1028,8 +1028,8 @@ check_slices(avl_tree_t *r, int fd, cons check_one_slice(r, diskname, i, 0, 1); efi_free(gpt); } -#endif /* sun */ } +#endif /* sun */ static void zpool_open_func(void *arg) @@ -1059,6 +1059,7 @@ zpool_open_func(void *arg) return; } /* this file is too small to hold a zpool */ +#ifdef sun if (S_ISREG(statbuf.st_mode) && statbuf.st_size < SPA_MINDEVSIZE) { (void) close(fd); @@ -1070,6 +1071,12 @@ zpool_open_func(void *arg) */ check_slices(rn->rn_avl, fd, rn->rn_name); } +#else /* !sun */ + if (statbuf.st_size < SPA_MINDEVSIZE) { + (void) close(fd); + return; + } +#endif /* sun */ if ((zpool_read_label(fd, &config)) != 0) { (void) close(fd); Modified: projects/pmac_pmu/contrib/gcc/ChangeLog.gcc43 ============================================================================== --- projects/pmac_pmu/contrib/gcc/ChangeLog.gcc43 Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/gcc/ChangeLog.gcc43 Sat Dec 14 17:46:58 2013 (r259392) @@ -45,6 +45,12 @@ * flags.h (force_align_functions_log): Delete. * toplev.c (force_align_functions_log): Delete. +2007-06-28 Geoffrey Keating (r126088) + + * doc/invoke.texi (C++ Dialect Options): Document + fvisibility-ms-compat. + * c.opt (fvisibility-ms-compat): New. + 2007-06-05 Joerg Wunsch (r125346) PR preprocessor/23479 @@ -57,6 +63,14 @@ operand. (store_expr): Handle BLKmode moves by calling emit_block_move. +2007-05-31 Daniel Berlin (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 (r125116) * config/rs6000/rs6000.c (rs6000_emit_prologue): Update Modified: projects/pmac_pmu/contrib/gcc/c-common.c ============================================================================== --- projects/pmac_pmu/contrib/gcc/c-common.c Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/gcc/c-common.c Sat Dec 14 17:46:58 2013 (r259392) @@ -2019,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; @@ -2073,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/pmac_pmu/contrib/gcc/c-common.h ============================================================================== --- projects/pmac_pmu/contrib/gcc/c-common.h Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/gcc/c-common.h Sat Dec 14 17:46:58 2013 (r259392) @@ -654,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); Modified: projects/pmac_pmu/contrib/gcc/c-typeck.c ============================================================================== --- projects/pmac_pmu/contrib/gcc/c-typeck.c Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/gcc/c-typeck.c Sat Dec 14 17:46:58 2013 (r259392) @@ -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; } @@ -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/pmac_pmu/contrib/gcc/c.opt ============================================================================== --- projects/pmac_pmu/contrib/gcc/c.opt Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/gcc/c.opt Sat Dec 14 17:46:58 2013 (r259392) @@ -741,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/pmac_pmu/contrib/gcc/config/i386/emmintrin.h ============================================================================== --- projects/pmac_pmu/contrib/gcc/config/i386/emmintrin.h Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/gcc/config/i386/emmintrin.h Sat Dec 14 17:46:58 2013 (r259392) @@ -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: projects/pmac_pmu/contrib/gcc/cp/ChangeLog.gcc43 ============================================================================== --- projects/pmac_pmu/contrib/gcc/cp/ChangeLog.gcc43 Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/gcc/cp/ChangeLog.gcc43 Sat Dec 14 17:46:58 2013 (r259392) @@ -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 (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 (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 (r125239) + + * typeck.c (build_binary_op): Include types in error. + 2007-05-05 Geoffrey Keating (r124467) PR 31775 Modified: projects/pmac_pmu/contrib/gcc/cp/decl.c ============================================================================== --- projects/pmac_pmu/contrib/gcc/cp/decl.c Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/gcc/cp/decl.c Sat Dec 14 17:46:58 2013 (r259392) @@ -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: projects/pmac_pmu/contrib/gcc/cp/decl2.c ============================================================================== --- projects/pmac_pmu/contrib/gcc/cp/decl2.c Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/gcc/cp/decl2.c Sat Dec 14 17:46:58 2013 (r259392) @@ -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: projects/pmac_pmu/contrib/gcc/cp/typeck.c ============================================================================== --- projects/pmac_pmu/contrib/gcc/cp/typeck.c Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/gcc/cp/typeck.c Sat Dec 14 17:46:58 2013 (r259392) @@ -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; Modified: projects/pmac_pmu/contrib/gcc/doc/invoke.texi ============================================================================== --- projects/pmac_pmu/contrib/gcc/doc/invoke.texi Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/gcc/doc/invoke.texi Sat Dec 14 17:46:58 2013 (r259392) @@ -186,6 +186,7 @@ in the following sections. -frepo -fno-rtti -fstats -ftemplate-depth-@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 @@ -1626,6 +1627,40 @@ Explicitly instantiated inline methods a as their linkage might otherwise cross a shared library boundary. @xref{Template Instantiation}. +@item -fvisibility-ms-compat +@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: + +@enumerate +@item +It sets the default visibility to @code{hidden}, like +@option{-fvisibility=hidden}. + +@item +Types, but not their members, are not hidden by default. + +@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. +@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: projects/pmac_pmu/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp ============================================================================== --- projects/pmac_pmu/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp Sat Dec 14 17:46:58 2013 (r259392) @@ -454,10 +454,9 @@ void CodeGenVTables::EmitThunk(GlobalDec } else { // Normal thunk body generation. CodeGenFunction(CGM).GenerateThunk(ThunkFn, FnInfo, GD, Thunk); + if (UseAvailableExternallyLinkage) + ThunkFn->setLinkage(llvm::GlobalValue::AvailableExternallyLinkage); } - - if (UseAvailableExternallyLinkage) - ThunkFn->setLinkage(llvm::GlobalValue::AvailableExternallyLinkage); } void CodeGenVTables::MaybeEmitThunkAvailableExternally(GlobalDecl GD, Modified: projects/pmac_pmu/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp ============================================================================== --- projects/pmac_pmu/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp Sat Dec 14 17:46:58 2013 (r259392) @@ -991,7 +991,7 @@ static StringRef getGCCToolchainDir(cons return GCC_INSTALL_PREFIX; } -/// \brief Construct a GCCInstallationDetector from the driver. +/// \brief Initialize a GCCInstallationDetector from the driver. /// /// This performs all of the autodetection and sets up the various paths. /// Once constructed, a GCCInstallationDetector is essentially immutable. @@ -1000,11 +1000,9 @@ static StringRef getGCCToolchainDir(cons /// should instead pull the target out of the driver. This is currently /// necessary because the driver doesn't store the final version of the target /// triple. -Generic_GCC::GCCInstallationDetector::GCCInstallationDetector( - const Driver &D, - const llvm::Triple &TargetTriple, - const ArgList &Args) - : IsValid(false) { +void +Generic_GCC::GCCInstallationDetector::init( + const Driver &D, const llvm::Triple &TargetTriple, const ArgList &Args) { llvm::Triple MultiarchTriple = TargetTriple.isArch32Bit() ? TargetTriple.get64BitArchVariant() : TargetTriple.get32BitArchVariant(); @@ -1448,7 +1446,7 @@ void Generic_GCC::GCCInstallationDetecto Generic_GCC::Generic_GCC(const Driver &D, const llvm::Triple& Triple, const ArgList &Args) - : ToolChain(D, Triple, Args), GCCInstallation(getDriver(), Triple, Args) { + : ToolChain(D, Triple, Args), GCCInstallation() { getProgramPaths().push_back(getDriver().getInstalledDir()); if (getDriver().getInstalledDir() != getDriver().Dir) getProgramPaths().push_back(getDriver().Dir); @@ -2243,6 +2241,7 @@ static StringRef getMultilibDir(const ll Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) : Generic_ELF(D, Triple, Args) { + GCCInstallation.init(D, Triple, Args); llvm::Triple::ArchType Arch = Triple.getArch(); std::string SysRoot = computeSysRoot(Args); Modified: projects/pmac_pmu/contrib/llvm/tools/clang/lib/Driver/ToolChains.h ============================================================================== --- projects/pmac_pmu/contrib/llvm/tools/clang/lib/Driver/ToolChains.h Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/llvm/tools/clang/lib/Driver/ToolChains.h Sat Dec 14 17:46:58 2013 (r259392) @@ -78,7 +78,8 @@ protected: GCCVersion Version; public: - GCCInstallationDetector(const Driver &D, const llvm::Triple &TargetTriple, + GCCInstallationDetector() : IsValid(false) {} + void init(const Driver &D, const llvm::Triple &TargetTriple, const ArgList &Args); /// \brief Check whether we detected a valid GCC install. Modified: projects/pmac_pmu/contrib/nvi/cl/cl_term.c ============================================================================== --- projects/pmac_pmu/contrib/nvi/cl/cl_term.c Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/nvi/cl/cl_term.c Sat Dec 14 17:46:58 2013 (r259392) @@ -10,7 +10,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "$Id: cl_term.c,v 10.33 2012/04/21 23:51:46 zy Exp $"; +static const char sccsid[] = "$Id: cl_term.c,v 10.34 2013/12/07 16:21:14 wjenkner Exp $"; #endif /* not lint */ #include @@ -187,14 +187,18 @@ cl_term_init(SCR *sp) int cl_term_end(GS *gp) { - SEQ *qp, *nqp; + SEQ *qp, *nqp, *pre_qp = NULL; /* Delete screen specific mappings. */ SLIST_FOREACH_SAFE(qp, gp->seqq, q, nqp) if (F_ISSET(qp, SEQ_SCREEN)) { - SLIST_REMOVE_HEAD(gp->seqq, q); + if (qp == SLIST_FIRST(gp->seqq)) + SLIST_REMOVE_HEAD(gp->seqq, q); + else + SLIST_REMOVE_AFTER(pre_qp, q); (void)seq_free(qp); - } + } else + pre_qp = qp; return (0); } Modified: projects/pmac_pmu/contrib/nvi/common/key.c ============================================================================== --- projects/pmac_pmu/contrib/nvi/common/key.c Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/nvi/common/key.c Sat Dec 14 17:46:58 2013 (r259392) @@ -10,7 +10,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "$Id: key.c,v 10.53 2013/03/11 01:20:53 yamt Exp $"; +static const char sccsid[] = "$Id: key.c,v 10.54 2013/11/13 12:15:27 zy Exp $"; #endif /* not lint */ #include @@ -272,7 +272,7 @@ v_key_name( * The code prints non-printable wide characters in 4 or 5 digits * Unicode escape sequences, so only supports plane 0 to 15. */ - if (ISPRINT(ach)) + if (CAN_PRINT(sp, ach)) goto done; nopr: if (iscntrl(ch) && (ch < 0x20 || ch == 0x7f)) { sp->cname[0] = '^'; Modified: projects/pmac_pmu/contrib/nvi/common/key.h ============================================================================== --- projects/pmac_pmu/contrib/nvi/common/key.h Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/contrib/nvi/common/key.h Sat Dec 14 17:46:58 2013 (r259392) @@ -6,7 +6,7 @@ * * See the LICENSE file for redistribution information. * - * $Id: key.h,v 10.55 2012/10/07 01:31:17 zy Exp $ + * $Id: key.h,v 10.56 2013/11/13 12:15:27 zy Exp $ */ #include "multibyte.h" @@ -23,8 +23,9 @@ #define INPUT2INT5(sp,cw,n,nlen,w,wlen) \ sp->conv.input2int(sp, n, nlen, &(cw), &wlen, &w) #define CONST +#define INTISWIDE(c) (wctob(c) == EOF) #define CHAR_WIDTH(sp, ch) wcwidth(ch) -#define INTISWIDE(c) (wctob(c) == EOF) +#define CAN_PRINT(sp, ch) (CHAR_WIDTH(sp, ch) > 0) #else #define FILE2INT5(sp,buf,n,nlen,w,wlen) \ (w = n, wlen = nlen, 0) @@ -36,9 +37,10 @@ (n = w, nlen = wlen, 0) #define INPUT2INT5(sp,buf,n,nlen,w,wlen) \ (w = n, wlen = nlen, 0) -#define CONST const -#define INTISWIDE(c) 0 +#define CONST const +#define INTISWIDE(c) 0 #define CHAR_WIDTH(sp, ch) 1 +#define CAN_PRINT(sp, ch) isprint(ch) #endif #define FILE2INT(sp,n,nlen,w,wlen) \ FILE2INT5(sp,sp->cw,n,nlen,w,wlen) Modified: projects/pmac_pmu/crypto/heimdal/lib/gssapi/krb5/prf.c ============================================================================== --- projects/pmac_pmu/crypto/heimdal/lib/gssapi/krb5/prf.c Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/crypto/heimdal/lib/gssapi/krb5/prf.c Sat Dec 14 17:46:58 2013 (r259392) @@ -119,7 +119,7 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_ while(dol > 0) { size_t tsize; - _gsskrb5_encode_om_uint32(num, input.data); + _gsskrb5_encode_be_om_uint32(num, input.data); ret = krb5_crypto_prf(context, crypto, &input, &output); if (ret) { @@ -133,7 +133,7 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_ tsize = min(dol, output.length); memcpy(p, output.data, tsize); - p += output.length; + p += tsize; dol -= tsize; krb5_data_free(&output); num++; Modified: projects/pmac_pmu/etc/devd/usb.conf ============================================================================== --- projects/pmac_pmu/etc/devd/usb.conf Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/etc/devd/usb.conf Sat Dec 14 17:46:58 2013 (r259392) @@ -3825,7 +3825,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x148f"; - match "product" "(0x2770|0x2870|0x3070|0x3071|0x3072|0x3370|0x3572|0x5370|0x8070)"; + match "product" "(0x2770|0x2870|0x3070|0x3071|0x3072|0x3370|0x3572|0x5370|0x5572|0x8070)"; action "kldload -n if_run"; }; @@ -4625,7 +4625,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x2001"; - match "product" "(0x3c09|0x3c0a|0x3c15|0x3c1b)"; + match "product" "(0x3c09|0x3c0a|0x3c15|0x3c1a|0x3c1b)"; action "kldload -n if_run"; }; @@ -5341,5 +5341,5 @@ nomatch 32 { action "kldload -n umass"; }; -# 2574 USB entries processed +# 2576 USB entries processed Modified: projects/pmac_pmu/etc/mtree/BSD.tests.dist ============================================================================== --- projects/pmac_pmu/etc/mtree/BSD.tests.dist Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/etc/mtree/BSD.tests.dist Sat Dec 14 17:46:58 2013 (r259392) @@ -20,6 +20,32 @@ .. .. tests + bin + date + .. + mv + .. + pax + .. + sh + builtins + .. + errors + .. + execution + .. + expansion + .. + parameters + .. + parser + .. + set-e + .. + .. + test + .. + .. lib atf libatf-c Modified: projects/pmac_pmu/etc/rc.d/jail ============================================================================== --- projects/pmac_pmu/etc/rc.d/jail Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/etc/rc.d/jail Sat Dec 14 17:46:58 2013 (r259392) @@ -319,8 +319,8 @@ jail_extract_address() _mask=${_mask:-/32} elif [ "${_type}" = "inet6" ]; then - # In case _maske is not set for IPv6, use /64. - _mask=${_mask:-/64} + # In case _maske is not set for IPv6, use /128. + _mask=${_mask:-/128} fi } Modified: projects/pmac_pmu/etc/syslog.conf ============================================================================== --- projects/pmac_pmu/etc/syslog.conf Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/etc/syslog.conf Sat Dec 14 17:46:58 2013 (r259392) @@ -30,7 +30,7 @@ cron.* /var/log/cron # news.notice /var/log/news/news.notice # Uncomment this if you wish to see messages produced by devd # !devd -# *.>=info /var/log/devd.log +# *.>=notice /var/log/devd.log !ppp *.* /var/log/ppp.log !* Modified: projects/pmac_pmu/games/fortune/datfiles/fortunes ============================================================================== --- projects/pmac_pmu/games/fortune/datfiles/fortunes Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/games/fortune/datfiles/fortunes Sat Dec 14 17:46:58 2013 (r259392) @@ -46677,7 +46677,7 @@ they had just discovered that he lived i taken another one of those damned Vermont winters!" % THE OLD POOL SHOOTER had won many a game in his life. But now it was time -to hang up the cue. When he did, all the other cues came crashing go the +to hang up the cue. When he did, all the other cues came crashing to the floor. "Sorry," he said with a smile. Modified: projects/pmac_pmu/games/fortune/fortune/fortune.c ============================================================================== --- projects/pmac_pmu/games/fortune/fortune/fortune.c Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/games/fortune/fortune/fortune.c Sat Dec 14 17:46:58 2013 (r259392) @@ -486,7 +486,7 @@ add_file(int percent, const char *file, if (Offend) { if (was_malloc) free(tpath); - path = offensive; + path = tpath = offensive; offensive = NULL; was_malloc = TRUE; DPRINTF(1, (stderr, "\ttrying \"%s\"\n", path)); @@ -508,7 +508,7 @@ over: if (All_forts && offensive != NULL) { if (was_malloc) free(tpath); - path = offensive; + path = tpath = offensive; offensive = NULL; was_malloc = TRUE; DPRINTF(1, (stderr, "\ttrying \"%s\"\n", path)); @@ -806,10 +806,6 @@ is_fortfile(const char *file, char **dat strcat(datfile, ".dat"); if (access(datfile, R_OK) < 0) { DPRINTF(2, (stderr, "FALSE (no readable \".dat\" file)\n")); -#ifdef DEBUG - if (Debug < 2) - DPRINTF(0, (stderr, "Warning: file \"%s\" unreadable\n", datfile)); -#endif free(datfile); return (FALSE); } Modified: projects/pmac_pmu/include/rpcsvc/bootparam_prot.x ============================================================================== --- projects/pmac_pmu/include/rpcsvc/bootparam_prot.x Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/include/rpcsvc/bootparam_prot.x Sat Dec 14 17:46:58 2013 (r259392) @@ -1,30 +1,32 @@ -/* - * Sun RPC is a product of Sun Microsystems, Inc. and is provided for - * unrestricted use provided that this legend is included on all tape - * media and as a part of the software program in whole or part. Users - * may copy or modify Sun RPC without charge, but are not authorized - * to license or distribute it to anyone else except as part of a product or - * program developed by the user. - * - * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE - * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR - * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * - * Sun RPC is provided with no support and without any obligation on the - * part of Sun Microsystems, Inc. to assist in its use, correction, - * modification or enhancement. - * - * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE - * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC - * OR ANY PART THEREOF. - * - * In no event will Sun Microsystems, Inc. be liable for any lost revenue - * or profits or other special, indirect and consequential damages, even if - * Sun has been advised of the possibility of such damages. - * - * Sun Microsystems, Inc. - * 2550 Garcia Avenue - * Mountain View, California 94043 +/*- + * Copyright (c) 2010, Oracle America, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * * Neither the name of the "Oracle America, Inc." nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* Modified: projects/pmac_pmu/include/rpcsvc/key_prot.x ============================================================================== --- projects/pmac_pmu/include/rpcsvc/key_prot.x Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/include/rpcsvc/key_prot.x Sat Dec 14 17:46:58 2013 (r259392) @@ -1,30 +1,32 @@ -%/* -% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for -% * unrestricted use provided that this legend is included on all tape -% * media and as a part of the software program in whole or part. Users -% * may copy or modify Sun RPC without charge, but are not authorized -% * to license or distribute it to anyone else except as part of a product or -% * program developed by the user. +%/*- +% * Copyright (c) 2010, Oracle America, Inc. % * -% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE -% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR -% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. +% * Redistribution and use in source and binary forms, with or without +% * modification, are permitted provided that the following conditions are +% * met: % * -% * Sun RPC is provided with no support and without any obligation on the -% * part of Sun Microsystems, Inc. to assist in its use, correction, -% * modification or enhancement. +% * * Redistributions of source code must retain the above copyright +% * notice, this list of conditions and the following disclaimer. +% * * Redistributions in binary form must reproduce the above +% * copyright notice, this list of conditions and the following +% * disclaimer in the documentation and/or other materials +% * provided with the distribution. +% * * Neither the name of the "Oracle America, Inc." nor the names of its +% * contributors may be used to endorse or promote products derived +% * from this software without specific prior written permission. % * -% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE -% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC -% * OR ANY PART THEREOF. -% * -% * In no event will Sun Microsystems, Inc. be liable for any lost revenue -% * or profits or other special, indirect and consequential damages, even if -% * Sun has been advised of the possibility of such damages. -% * -% * Sun Microsystems, Inc. -% * 2550 Garcia Avenue -% * Mountain View, California 94043 +% * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +% * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +% * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +% * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +% * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +% * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +% * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +% * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +% * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +% * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +% * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +% * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. % */ /* * Key server protocol definition Modified: projects/pmac_pmu/include/rpcsvc/klm_prot.x ============================================================================== --- projects/pmac_pmu/include/rpcsvc/klm_prot.x Sat Dec 14 14:49:09 2013 (r259391) +++ projects/pmac_pmu/include/rpcsvc/klm_prot.x Sat Dec 14 17:46:58 2013 (r259392) @@ -1,30 +1,32 @@ -/* - * Sun RPC is a product of Sun Microsystems, Inc. and is provided for - * unrestricted use provided that this legend is included on all tape - * media and as a part of the software program in whole or part. Users - * may copy or modify Sun RPC without charge, but are not authorized - * to license or distribute it to anyone else except as part of a product or - * program developed by the user. - * - * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE - * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR - * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * - * Sun RPC is provided with no support and without any obligation on the - * part of Sun Microsystems, Inc. to assist in its use, correction, - * modification or enhancement. - * - * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE - * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC - * OR ANY PART THEREOF. - * - * In no event will Sun Microsystems, Inc. be liable for any lost revenue - * or profits or other special, indirect and consequential damages, even if - * Sun has been advised of the possibility of such damages. - * - * Sun Microsystems, Inc. - * 2550 Garcia Avenue - * Mountain View, California 94043 +/*- + * Copyright (c) 2010, Oracle America, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * * Neither the name of the "Oracle America, Inc." nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***