Date: Wed, 26 Dec 2012 08:20:28 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r244694 - in user/attilio/vmcontention: . bin/date bin/df bin/ps bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/lib/libzfs/common contrib/binutils/bfd contrib/binutils... Message-ID: <201212260820.qBQ8KSj7028244@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Wed Dec 26 08:20:27 2012 New Revision: 244694 URL: http://svnweb.freebsd.org/changeset/base/244694 Log: MFC Added: user/attilio/vmcontention/contrib/libc-vis/ - copied from r244693, head/contrib/libc-vis/ user/attilio/vmcontention/contrib/mknod/ - copied from r244693, head/contrib/mknod/ user/attilio/vmcontention/contrib/mtree/ - copied from r244693, head/contrib/mtree/ user/attilio/vmcontention/lib/libc/gen/unvis-compat.c - copied unchanged from r244693, head/lib/libc/gen/unvis-compat.c user/attilio/vmcontention/lib/libnetbsd/ - copied from r244693, head/lib/libnetbsd/ user/attilio/vmcontention/lib/libstand/amd64/ - copied from r244693, head/lib/libstand/amd64/ user/attilio/vmcontention/sys/arm/arm/cpufunc_asm_arm11x6.S - copied unchanged from r244693, head/sys/arm/arm/cpufunc_asm_arm11x6.S user/attilio/vmcontention/sys/arm/arm/pl190.c - copied unchanged from r244693, head/sys/arm/arm/pl190.c user/attilio/vmcontention/sys/arm/conf/VERSATILEPB - copied unchanged from r244693, head/sys/arm/conf/VERSATILEPB user/attilio/vmcontention/sys/arm/versatile/ - copied from r244693, head/sys/arm/versatile/ user/attilio/vmcontention/sys/boot/fdt/dts/versatilepb.dts - copied unchanged from r244693, head/sys/boot/fdt/dts/versatilepb.dts user/attilio/vmcontention/sys/boot/ficl64/ - copied from r244693, head/sys/boot/ficl64/ user/attilio/vmcontention/sys/kern/subr_busdma_bufalloc.c - copied unchanged from r244693, head/sys/kern/subr_busdma_bufalloc.c user/attilio/vmcontention/sys/security/audit/bsm_domain.c - copied unchanged from r244693, head/sys/security/audit/bsm_domain.c user/attilio/vmcontention/sys/security/audit/bsm_errno.c - copied unchanged from r244693, head/sys/security/audit/bsm_errno.c user/attilio/vmcontention/sys/security/audit/bsm_fcntl.c - copied unchanged from r244693, head/sys/security/audit/bsm_fcntl.c user/attilio/vmcontention/sys/security/audit/bsm_socket_type.c - copied unchanged from r244693, head/sys/security/audit/bsm_socket_type.c user/attilio/vmcontention/sys/security/audit/bsm_token.c - copied unchanged from r244693, head/sys/security/audit/bsm_token.c user/attilio/vmcontention/sys/sys/busdma_bufalloc.h - copied unchanged from r244693, head/sys/sys/busdma_bufalloc.h user/attilio/vmcontention/tools/regression/bin/sh/errors/write-error1.0 - copied unchanged from r244693, head/tools/regression/bin/sh/errors/write-error1.0 user/attilio/vmcontention/tools/regression/usr.bin/printf/regress.zero.out - copied unchanged from r244693, head/tools/regression/usr.bin/printf/regress.zero.out user/attilio/vmcontention/usr.sbin/nmtree/ - copied from r244693, head/usr.sbin/nmtree/ Deleted: user/attilio/vmcontention/include/vis.h user/attilio/vmcontention/lib/libc/gen/unvis.3 user/attilio/vmcontention/lib/libc/gen/unvis.c user/attilio/vmcontention/lib/libc/gen/vis.3 user/attilio/vmcontention/lib/libc/gen/vis.c user/attilio/vmcontention/sys/boot/userboot/libstand/amd64/ user/attilio/vmcontention/sys/security/audit/audit_bsm_domain.c user/attilio/vmcontention/sys/security/audit/audit_bsm_errno.c user/attilio/vmcontention/sys/security/audit/audit_bsm_fcntl.c user/attilio/vmcontention/sys/security/audit/audit_bsm_socket_type.c user/attilio/vmcontention/sys/security/audit/audit_bsm_token.c Modified: user/attilio/vmcontention/UPDATING user/attilio/vmcontention/bin/date/netdate.c user/attilio/vmcontention/bin/df/df.c user/attilio/vmcontention/bin/ps/ps.c user/attilio/vmcontention/bin/sh/eval.c user/attilio/vmcontention/bin/sh/jobs.c user/attilio/vmcontention/bin/sh/output.c user/attilio/vmcontention/bin/sh/output.h user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c user/attilio/vmcontention/contrib/binutils/bfd/elflink.c user/attilio/vmcontention/contrib/binutils/gas/config/tc-arm.c user/attilio/vmcontention/contrib/gcc/config/arm/arm.h user/attilio/vmcontention/contrib/gcc/longlong.h user/attilio/vmcontention/contrib/gdb/gdb/dwarf2read.c user/attilio/vmcontention/contrib/gdb/gdb/gdbtypes.c user/attilio/vmcontention/contrib/gdb/gdb/gdbtypes.h user/attilio/vmcontention/contrib/gdb/gdb/hpread.c user/attilio/vmcontention/contrib/gdb/gdb/parse.c user/attilio/vmcontention/contrib/gdb/gdb/stabsread.c user/attilio/vmcontention/contrib/libstdc++/include/std/std_limits.h user/attilio/vmcontention/contrib/llvm/include/llvm/MC/MCExpr.h user/attilio/vmcontention/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp user/attilio/vmcontention/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp user/attilio/vmcontention/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h user/attilio/vmcontention/contrib/llvm/lib/MC/MCExpr.cpp user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MipsJITInfo.cpp user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MipsJITInfo.h user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MipsMCInstLower.cpp user/attilio/vmcontention/contrib/llvm/lib/Transforms/Scalar/SROA.cpp user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Sema/Scope.h user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Basic/Targets.cpp user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Basic/Version.cpp user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Driver/ToolChains.h user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Driver/Tools.cpp user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Sema/IdentifierResolver.cpp user/attilio/vmcontention/contrib/openbsm/INSTALL user/attilio/vmcontention/contrib/openbsm/NEWS user/attilio/vmcontention/contrib/openbsm/VERSION user/attilio/vmcontention/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 user/attilio/vmcontention/contrib/openbsm/config/config.h user/attilio/vmcontention/contrib/openbsm/configure user/attilio/vmcontention/contrib/openbsm/configure.ac user/attilio/vmcontention/contrib/openbsm/etc/audit_event user/attilio/vmcontention/contrib/openbsm/sys/bsm/audit_kevents.h user/attilio/vmcontention/contrib/openbsm/sys/bsm/audit_record.h user/attilio/vmcontention/contrib/top/top.h user/attilio/vmcontention/contrib/xz/AUTHORS user/attilio/vmcontention/contrib/xz/ChangeLog user/attilio/vmcontention/contrib/xz/README user/attilio/vmcontention/contrib/xz/THANKS user/attilio/vmcontention/contrib/xz/po/de.po user/attilio/vmcontention/contrib/xz/po/fr.po user/attilio/vmcontention/contrib/xz/po/it.po user/attilio/vmcontention/contrib/xz/po/pl.po user/attilio/vmcontention/contrib/xz/src/common/sysdefs.h user/attilio/vmcontention/contrib/xz/src/liblzma/api/lzma/version.h user/attilio/vmcontention/contrib/xz/src/liblzma/simple/simple_coder.c user/attilio/vmcontention/contrib/xz/src/liblzma/simple/simple_private.h user/attilio/vmcontention/contrib/xz/src/xz/args.c user/attilio/vmcontention/contrib/xz/src/xz/coder.c user/attilio/vmcontention/contrib/xz/src/xz/message.c user/attilio/vmcontention/contrib/xz/src/xz/xz.1 user/attilio/vmcontention/etc/defaults/rc.conf user/attilio/vmcontention/etc/devd/usb.conf user/attilio/vmcontention/etc/login.conf user/attilio/vmcontention/etc/newsyslog.conf user/attilio/vmcontention/etc/periodic/daily/Makefile user/attilio/vmcontention/etc/rc.d/auditdistd user/attilio/vmcontention/etc/rc.d/savecore user/attilio/vmcontention/etc/rc.d/sysctl user/attilio/vmcontention/gnu/lib/libgcc/Makefile user/attilio/vmcontention/gnu/usr.bin/binutils/as/Makefile user/attilio/vmcontention/include/Makefile user/attilio/vmcontention/lib/Makefile user/attilio/vmcontention/lib/clang/Makefile user/attilio/vmcontention/lib/clang/include/clang/Basic/Version.inc user/attilio/vmcontention/lib/libc/gen/Makefile.inc user/attilio/vmcontention/lib/libc/gen/Symbol.map user/attilio/vmcontention/lib/libc/gen/check_utility_compat.c user/attilio/vmcontention/lib/libc/gen/sysctlbyname.c user/attilio/vmcontention/lib/libc/iconv/citrus_mmap.c user/attilio/vmcontention/lib/libc/locale/collate.c user/attilio/vmcontention/lib/libc/locale/setrunelocale.c user/attilio/vmcontention/lib/libc/nls/msgcat.c user/attilio/vmcontention/lib/libc/sys/mlock.2 user/attilio/vmcontention/lib/libc/sys/mlockall.2 user/attilio/vmcontention/lib/libcompiler_rt/Makefile user/attilio/vmcontention/lib/libdevstat/devstat.3 user/attilio/vmcontention/lib/libdevstat/devstat.c user/attilio/vmcontention/lib/libdevstat/devstat.h user/attilio/vmcontention/lib/libnetgraph/sock.c user/attilio/vmcontention/lib/libproc/test/t1-bkpt/t1-bkpt.c user/attilio/vmcontention/libexec/tftpd/tftp-io.c user/attilio/vmcontention/release/picobsd/build/picobsd user/attilio/vmcontention/sbin/growfs/growfs.c user/attilio/vmcontention/sbin/hastd/parse.y user/attilio/vmcontention/sbin/ifconfig/af_nd6.c user/attilio/vmcontention/sbin/ifconfig/ifconfig.c user/attilio/vmcontention/sbin/route/route.c user/attilio/vmcontention/sbin/savecore/savecore.8 user/attilio/vmcontention/sbin/savecore/savecore.c user/attilio/vmcontention/sbin/setkey/setkey.8 user/attilio/vmcontention/sbin/sysctl/sysctl.8 user/attilio/vmcontention/sbin/sysctl/sysctl.c user/attilio/vmcontention/share/examples/etc/make.conf user/attilio/vmcontention/share/i18n/csmapper/Makefile.part user/attilio/vmcontention/share/man/man4/arcmsr.4 user/attilio/vmcontention/share/man/man4/carp.4 user/attilio/vmcontention/share/man/man9/lock.9 user/attilio/vmcontention/share/man/man9/make_dev.9 user/attilio/vmcontention/share/misc/committers-src.dot user/attilio/vmcontention/share/mk/bsd.lib.mk user/attilio/vmcontention/share/mk/bsd.own.mk user/attilio/vmcontention/share/mk/bsd.prog.mk user/attilio/vmcontention/share/mk/sys.mk user/attilio/vmcontention/share/syscons/keymaps/spanish.dvorak.kbd user/attilio/vmcontention/sys/amd64/amd64/fpu.c user/attilio/vmcontention/sys/amd64/include/bus.h user/attilio/vmcontention/sys/amd64/include/fpu.h user/attilio/vmcontention/sys/arm/arm/busdma_machdep-v6.c user/attilio/vmcontention/sys/arm/arm/busdma_machdep.c user/attilio/vmcontention/sys/arm/arm/cpufunc.c user/attilio/vmcontention/sys/arm/arm/elf_trampoline.c user/attilio/vmcontention/sys/arm/arm/identcpu.c user/attilio/vmcontention/sys/arm/arm/locore.S user/attilio/vmcontention/sys/arm/arm/pmap-v6.c user/attilio/vmcontention/sys/arm/arm/pmap.c user/attilio/vmcontention/sys/arm/broadcom/bcm2835/bcm2835_gpio.c user/attilio/vmcontention/sys/arm/broadcom/bcm2835/files.bcm2835 user/attilio/vmcontention/sys/arm/conf/PANDABOARD user/attilio/vmcontention/sys/arm/conf/RPI-B user/attilio/vmcontention/sys/arm/include/armreg.h user/attilio/vmcontention/sys/arm/include/cpuconf.h user/attilio/vmcontention/sys/arm/include/cpufunc.h user/attilio/vmcontention/sys/arm/include/intr.h user/attilio/vmcontention/sys/arm/include/pmap.h user/attilio/vmcontention/sys/arm/include/vm.h user/attilio/vmcontention/sys/boot/arm/uboot/Makefile user/attilio/vmcontention/sys/boot/ficl/Makefile user/attilio/vmcontention/sys/boot/forth/beastie.4th.8 user/attilio/vmcontention/sys/boot/forth/check-password.4th user/attilio/vmcontention/sys/boot/forth/check-password.4th.8 user/attilio/vmcontention/sys/boot/forth/loader.4th.8 user/attilio/vmcontention/sys/boot/forth/loader.conf.5 user/attilio/vmcontention/sys/boot/forth/menu.4th.8 user/attilio/vmcontention/sys/boot/i386/efi/ldscript.amd64 user/attilio/vmcontention/sys/boot/sparc64/boot1/boot1.c user/attilio/vmcontention/sys/boot/userboot/libstand/Makefile user/attilio/vmcontention/sys/cam/scsi/scsi_enc_ses.c user/attilio/vmcontention/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c user/attilio/vmcontention/sys/cddl/compat/opensolaris/sys/kstat.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c user/attilio/vmcontention/sys/cddl/dev/dtrace/dtrace_debug.c user/attilio/vmcontention/sys/conf/files user/attilio/vmcontention/sys/conf/files.arm user/attilio/vmcontention/sys/conf/options.arm user/attilio/vmcontention/sys/dev/agp/agp_i810.c user/attilio/vmcontention/sys/dev/ahci/ahci.c user/attilio/vmcontention/sys/dev/ale/if_ale.c user/attilio/vmcontention/sys/dev/arcmsr/arcmsr.c user/attilio/vmcontention/sys/dev/arcmsr/arcmsr.h user/attilio/vmcontention/sys/dev/ata/ata-pci.h user/attilio/vmcontention/sys/dev/ata/chipsets/ata-ati.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c user/attilio/vmcontention/sys/dev/ath/if_athvar.h user/attilio/vmcontention/sys/dev/atkbdc/psm.c user/attilio/vmcontention/sys/dev/cxgbe/t4_l2t.c user/attilio/vmcontention/sys/dev/cxgbe/t4_main.c user/attilio/vmcontention/sys/dev/ixgbe/ixgbe.c user/attilio/vmcontention/sys/dev/ixgbe/ixgbe.h user/attilio/vmcontention/sys/dev/mii/brgphy.c user/attilio/vmcontention/sys/dev/mii/miidevs user/attilio/vmcontention/sys/dev/netmap/ixgbe_netmap.h user/attilio/vmcontention/sys/dev/nvme/nvme.c user/attilio/vmcontention/sys/dev/nvme/nvme_ctrlr.c user/attilio/vmcontention/sys/dev/nvme/nvme_private.h user/attilio/vmcontention/sys/dev/nvme/nvme_test.c user/attilio/vmcontention/sys/dev/smc/if_smc.c user/attilio/vmcontention/sys/dev/sound/pci/hda/hdaa_patches.c user/attilio/vmcontention/sys/dev/sound/pci/hda/hdac.h user/attilio/vmcontention/sys/dev/sound/usb/uaudio.c user/attilio/vmcontention/sys/dev/sym/sym_hipd.c user/attilio/vmcontention/sys/dev/uart/uart_bus_fdt.c user/attilio/vmcontention/sys/dev/usb/serial/usb_serial.c user/attilio/vmcontention/sys/dev/usb/serial/usb_serial.h user/attilio/vmcontention/sys/dev/usb/storage/umass.c user/attilio/vmcontention/sys/dev/usb/storage/ustorage_fs.c user/attilio/vmcontention/sys/dev/usb/usb_busdma.c user/attilio/vmcontention/sys/dev/usb/usb_msctest.c user/attilio/vmcontention/sys/dev/usb/usb_transfer.c user/attilio/vmcontention/sys/dev/usb/usbdi.h user/attilio/vmcontention/sys/dev/usb/wlan/if_uath.c user/attilio/vmcontention/sys/dev/usb/wlan/if_uathvar.h user/attilio/vmcontention/sys/dev/usb/wlan/if_upgt.c user/attilio/vmcontention/sys/dev/usb/wlan/if_upgtvar.h user/attilio/vmcontention/sys/dev/usb/wlan/if_urtw.c user/attilio/vmcontention/sys/dev/usb/wlan/if_urtwvar.h user/attilio/vmcontention/sys/dev/virtio/block/virtio_blk.c user/attilio/vmcontention/sys/dev/virtio/network/if_vtnet.c user/attilio/vmcontention/sys/dev/virtio/scsi/virtio_scsi.c user/attilio/vmcontention/sys/dev/wbwd/wbwd.c user/attilio/vmcontention/sys/dev/wtap/if_wtap.c user/attilio/vmcontention/sys/fs/devfs/devfs_vnops.c user/attilio/vmcontention/sys/fs/ext2fs/ext2_dinode.h user/attilio/vmcontention/sys/fs/ext2fs/ext2_inode_cnv.c user/attilio/vmcontention/sys/fs/ext2fs/ext2_vfsops.c user/attilio/vmcontention/sys/fs/ext2fs/ext2fs.h user/attilio/vmcontention/sys/geom/label/g_label.c user/attilio/vmcontention/sys/i386/include/bus.h user/attilio/vmcontention/sys/kern/kern_conf.c user/attilio/vmcontention/sys/kern/kern_descrip.c user/attilio/vmcontention/sys/kern/kern_fork.c user/attilio/vmcontention/sys/kern/kern_jail.c user/attilio/vmcontention/sys/kern/kern_lock.c user/attilio/vmcontention/sys/kern/kern_mib.c user/attilio/vmcontention/sys/kern/kern_mutex.c user/attilio/vmcontention/sys/kern/kern_priv.c user/attilio/vmcontention/sys/kern/kern_rmlock.c user/attilio/vmcontention/sys/kern/kern_rwlock.c user/attilio/vmcontention/sys/kern/kern_shutdown.c user/attilio/vmcontention/sys/kern/kern_sig.c user/attilio/vmcontention/sys/kern/kern_sx.c user/attilio/vmcontention/sys/kern/subr_smp.c user/attilio/vmcontention/sys/kern/subr_syscall.c user/attilio/vmcontention/sys/kern/subr_witness.c user/attilio/vmcontention/sys/kern/sys_generic.c user/attilio/vmcontention/sys/kern/vfs_bio.c user/attilio/vmcontention/sys/kern/vfs_export.c user/attilio/vmcontention/sys/kern/vfs_mount.c user/attilio/vmcontention/sys/kern/vfs_subr.c user/attilio/vmcontention/sys/kgssapi/gss_accept_sec_context.c user/attilio/vmcontention/sys/kgssapi/gss_acquire_cred.c user/attilio/vmcontention/sys/kgssapi/gss_canonicalize_name.c user/attilio/vmcontention/sys/kgssapi/gss_delete_sec_context.c user/attilio/vmcontention/sys/kgssapi/gss_display_status.c user/attilio/vmcontention/sys/kgssapi/gss_export_name.c user/attilio/vmcontention/sys/kgssapi/gss_impl.c user/attilio/vmcontention/sys/kgssapi/gss_import_name.c user/attilio/vmcontention/sys/kgssapi/gss_init_sec_context.c user/attilio/vmcontention/sys/kgssapi/gss_pname_to_uid.c user/attilio/vmcontention/sys/kgssapi/gss_release_cred.c user/attilio/vmcontention/sys/kgssapi/gss_release_name.c user/attilio/vmcontention/sys/kgssapi/gss_set_cred_option.c user/attilio/vmcontention/sys/kgssapi/gssapi_impl.h user/attilio/vmcontention/sys/mips/include/param.h user/attilio/vmcontention/sys/net/if_bridge.c user/attilio/vmcontention/sys/net/if_llatbl.c user/attilio/vmcontention/sys/net80211/ieee80211_hostap.c user/attilio/vmcontention/sys/net80211/ieee80211_proto.c user/attilio/vmcontention/sys/netinet/if_ether.c user/attilio/vmcontention/sys/netinet/in.c user/attilio/vmcontention/sys/netinet/ip_carp.c user/attilio/vmcontention/sys/netinet/tcp_input.c user/attilio/vmcontention/sys/netinet/tcp_reass.c user/attilio/vmcontention/sys/netinet/tcp_syncache.c user/attilio/vmcontention/sys/netinet6/in6.c user/attilio/vmcontention/sys/netinet6/in6_var.h user/attilio/vmcontention/sys/netinet6/ip6_input.c user/attilio/vmcontention/sys/netinet6/ip6_output.c user/attilio/vmcontention/sys/netinet6/ip6_var.h user/attilio/vmcontention/sys/netinet6/nd6.c user/attilio/vmcontention/sys/netpfil/ipfw/ip_fw2.c user/attilio/vmcontention/sys/netpfil/ipfw/ip_fw_dynamic.c user/attilio/vmcontention/sys/netpfil/ipfw/ip_fw_log.c user/attilio/vmcontention/sys/netpfil/ipfw/ip_fw_private.h user/attilio/vmcontention/sys/netpfil/pf/if_pfsync.c user/attilio/vmcontention/sys/netpfil/pf/pf.c user/attilio/vmcontention/sys/netpfil/pf/pf_if.c user/attilio/vmcontention/sys/netpfil/pf/pf_ioctl.c user/attilio/vmcontention/sys/netpfil/pf/pf_norm.c user/attilio/vmcontention/sys/sparc64/conf/GENERIC user/attilio/vmcontention/sys/sys/file.h user/attilio/vmcontention/sys/sys/fnv_hash.h user/attilio/vmcontention/sys/sys/ktr.h user/attilio/vmcontention/sys/sys/mount.h user/attilio/vmcontention/sys/sys/sysctl.h user/attilio/vmcontention/sys/sys/systm.h user/attilio/vmcontention/sys/tools/vnode_if.awk user/attilio/vmcontention/sys/ufs/ffs/ffs_softdep.c user/attilio/vmcontention/sys/ufs/ufs/ufs_quota.c user/attilio/vmcontention/sys/vm/uma_int.h user/attilio/vmcontention/sys/vm/vm.h user/attilio/vmcontention/sys/vm/vm_map.c user/attilio/vmcontention/sys/vm/vm_mmap.c user/attilio/vmcontention/sys/vm/vm_unix.c user/attilio/vmcontention/sys/x86/include/bus.h user/attilio/vmcontention/tools/build/mk/OptionalObsoleteFiles.inc user/attilio/vmcontention/tools/regression/usr.bin/printf/regress.sh user/attilio/vmcontention/tools/tools/netrate/netreceive/Makefile user/attilio/vmcontention/tools/tools/netrate/netreceive/netreceive.c user/attilio/vmcontention/tools/tools/sysbuild/sysbuild.sh user/attilio/vmcontention/usr.bin/calendar/parsedata.c user/attilio/vmcontention/usr.bin/clang/clang/clang.1 user/attilio/vmcontention/usr.bin/grep/grep.c user/attilio/vmcontention/usr.bin/grep/grep.h user/attilio/vmcontention/usr.bin/grep/util.c user/attilio/vmcontention/usr.bin/indent/indent_globs.h user/attilio/vmcontention/usr.bin/printf/printf.c user/attilio/vmcontention/usr.bin/sort/sort.c user/attilio/vmcontention/usr.bin/sort/sort.h user/attilio/vmcontention/usr.sbin/Makefile user/attilio/vmcontention/usr.sbin/acpi/acpidump/acpi.c user/attilio/vmcontention/usr.sbin/acpi/acpidump/acpidump.8 user/attilio/vmcontention/usr.sbin/bsdconfig/bsdconfig user/attilio/vmcontention/usr.sbin/bsdconfig/console/console user/attilio/vmcontention/usr.sbin/bsdconfig/console/font user/attilio/vmcontention/usr.sbin/bsdconfig/console/keymap user/attilio/vmcontention/usr.sbin/bsdconfig/console/repeat user/attilio/vmcontention/usr.sbin/bsdconfig/console/saver user/attilio/vmcontention/usr.sbin/bsdconfig/console/screenmap user/attilio/vmcontention/usr.sbin/bsdconfig/console/ttys user/attilio/vmcontention/usr.sbin/bsdconfig/diskmgmt/diskmgmt user/attilio/vmcontention/usr.sbin/bsdconfig/docsinstall/docsinstall user/attilio/vmcontention/usr.sbin/bsdconfig/dot/dot user/attilio/vmcontention/usr.sbin/bsdconfig/examples/bsdconfigrc user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/disable user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/enable user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/flags user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/mouse user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/port user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/type user/attilio/vmcontention/usr.sbin/bsdconfig/networking/defaultrouter user/attilio/vmcontention/usr.sbin/bsdconfig/networking/devices user/attilio/vmcontention/usr.sbin/bsdconfig/networking/hostname user/attilio/vmcontention/usr.sbin/bsdconfig/networking/nameservers user/attilio/vmcontention/usr.sbin/bsdconfig/networking/networking user/attilio/vmcontention/usr.sbin/bsdconfig/networking/share/common.subr user/attilio/vmcontention/usr.sbin/bsdconfig/networking/share/device.subr user/attilio/vmcontention/usr.sbin/bsdconfig/networking/share/hostname.subr user/attilio/vmcontention/usr.sbin/bsdconfig/networking/share/ipaddr.subr user/attilio/vmcontention/usr.sbin/bsdconfig/networking/share/media.subr user/attilio/vmcontention/usr.sbin/bsdconfig/networking/share/netmask.subr user/attilio/vmcontention/usr.sbin/bsdconfig/networking/share/resolv.subr user/attilio/vmcontention/usr.sbin/bsdconfig/networking/share/routing.subr user/attilio/vmcontention/usr.sbin/bsdconfig/password/password user/attilio/vmcontention/usr.sbin/bsdconfig/password/share/password.subr user/attilio/vmcontention/usr.sbin/bsdconfig/security/kern_securelevel user/attilio/vmcontention/usr.sbin/bsdconfig/security/security user/attilio/vmcontention/usr.sbin/bsdconfig/share/common.subr user/attilio/vmcontention/usr.sbin/bsdconfig/share/dialog.subr user/attilio/vmcontention/usr.sbin/bsdconfig/share/mustberoot.subr user/attilio/vmcontention/usr.sbin/bsdconfig/share/strings.subr user/attilio/vmcontention/usr.sbin/bsdconfig/share/sysrc.subr user/attilio/vmcontention/usr.sbin/bsdconfig/startup/misc user/attilio/vmcontention/usr.sbin/bsdconfig/startup/rcadd user/attilio/vmcontention/usr.sbin/bsdconfig/startup/rcconf user/attilio/vmcontention/usr.sbin/bsdconfig/startup/rcdelete user/attilio/vmcontention/usr.sbin/bsdconfig/startup/rcedit user/attilio/vmcontention/usr.sbin/bsdconfig/startup/rcvar user/attilio/vmcontention/usr.sbin/bsdconfig/startup/share/rcconf.subr user/attilio/vmcontention/usr.sbin/bsdconfig/startup/share/rcedit.subr user/attilio/vmcontention/usr.sbin/bsdconfig/startup/share/rcvar.subr user/attilio/vmcontention/usr.sbin/bsdconfig/startup/startup user/attilio/vmcontention/usr.sbin/bsdconfig/timezone/share/continents.subr user/attilio/vmcontention/usr.sbin/bsdconfig/timezone/share/countries.subr user/attilio/vmcontention/usr.sbin/bsdconfig/timezone/share/iso3166.subr user/attilio/vmcontention/usr.sbin/bsdconfig/timezone/share/menus.subr user/attilio/vmcontention/usr.sbin/bsdconfig/timezone/share/zones.subr user/attilio/vmcontention/usr.sbin/bsdconfig/timezone/timezone user/attilio/vmcontention/usr.sbin/bsdconfig/ttys/ttys user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/groupadd user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/groupdel user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/groupedit user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/groupinput user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/share/group_input.subr user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/share/user_input.subr user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/useradd user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/userdel user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/useredit user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/userinput user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/usermgmt user/attilio/vmcontention/usr.sbin/gssd/Makefile user/attilio/vmcontention/usr.sbin/gssd/gssd.8 user/attilio/vmcontention/usr.sbin/gssd/gssd.c user/attilio/vmcontention/usr.sbin/iostat/iostat.8 user/attilio/vmcontention/usr.sbin/iostat/iostat.c user/attilio/vmcontention/usr.sbin/mountd/exports.5 user/attilio/vmcontention/usr.sbin/mountd/mountd.c user/attilio/vmcontention/usr.sbin/mptable/mptable.c user/attilio/vmcontention/usr.sbin/mtest/mtest.c user/attilio/vmcontention/usr.sbin/ndp/ndp.8 user/attilio/vmcontention/usr.sbin/nfsd/nfsd.c user/attilio/vmcontention/usr.sbin/nfsd/nfsv4.4 user/attilio/vmcontention/usr.sbin/pkg/pkg.c user/attilio/vmcontention/usr.sbin/portsnap/portsnap/portsnap.sh user/attilio/vmcontention/usr.sbin/rpcbind/rpcbind.c user/attilio/vmcontention/usr.sbin/service/service.8 user/attilio/vmcontention/usr.sbin/service/service.sh user/attilio/vmcontention/usr.sbin/syslogd/syslogd.c user/attilio/vmcontention/usr.sbin/ypserv/yp_main.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/ (props changed) user/attilio/vmcontention/contrib/binutils/ (props changed) user/attilio/vmcontention/contrib/gcc/ (props changed) user/attilio/vmcontention/contrib/gdb/ (props changed) user/attilio/vmcontention/contrib/libstdc++/ (props changed) user/attilio/vmcontention/contrib/llvm/ (props changed) user/attilio/vmcontention/contrib/llvm/tools/clang/ (props changed) user/attilio/vmcontention/contrib/openbsm/ (props changed) user/attilio/vmcontention/contrib/top/ (props changed) user/attilio/vmcontention/contrib/xz/ (props changed) user/attilio/vmcontention/gnu/lib/ (props changed) user/attilio/vmcontention/gnu/usr.bin/binutils/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/share/man/man4/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/boot/ (props changed) user/attilio/vmcontention/sys/boot/i386/efi/ (props changed) user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) user/attilio/vmcontention/sys/powerpc/wii/locore.S (props changed) user/attilio/vmcontention/usr.bin/calendar/ (props changed) Modified: user/attilio/vmcontention/UPDATING ============================================================================== --- user/attilio/vmcontention/UPDATING Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/UPDATING Wed Dec 26 08:20:27 2012 (r244694) @@ -26,6 +26,24 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20121223: + After switching to Clang as the default compiler some users of ZFS + on i386 systems started to experience stack overflow kernel panics. + Please consider using 'options KSTACK_PAGES=4' in such configurations. + +20121222: + GEOM_LABEL now mangles label names read from file system metadata. + Mangling affect labels containing spaces, non-printable characters, + '%' or '"'. Device names in /etc/fstab and other places may need to + be updated. + +20121217: + By default, only the 10 most recent kernel dumps will be saved. To + restore the previous behaviour (no limit on the number of kernel dumps + stored in the dump directory) add the following line to /etc/rc.conf: + + savecore_flags="" + 20121201: With the addition of auditdistd(8), a new auditdistd user is now depended on during installworld. "mergemaster -p" can be used to add Modified: user/attilio/vmcontention/bin/date/netdate.c ============================================================================== --- user/attilio/vmcontention/bin/date/netdate.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/bin/date/netdate.c Wed Dec 26 08:20:27 2012 (r244694) @@ -85,7 +85,7 @@ netsettime(time_t tval) dest.sin_addr.s_addr = htonl((u_long)INADDR_ANY); s = socket(AF_INET, SOCK_DGRAM, 0); if (s < 0) { - if (errno != EPROTONOSUPPORT) + if (errno != EAFNOSUPPORT) warn("timed"); return (retval = 2); } Modified: user/attilio/vmcontention/bin/df/df.c ============================================================================== --- user/attilio/vmcontention/bin/df/df.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/bin/df/df.c Wed Dec 26 08:20:27 2012 (r244694) @@ -397,7 +397,7 @@ prthumanvalinode(int64_t bytes) static intmax_t fsbtoblk(int64_t num, uint64_t fsbs, u_long bs) { - return (num * (intmax_t) fsbs / bs); + return (num * (intmax_t) fsbs / (int64_t) bs); } /* Modified: user/attilio/vmcontention/bin/ps/ps.c ============================================================================== --- user/attilio/vmcontention/bin/ps/ps.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/bin/ps/ps.c Wed Dec 26 08:20:27 2012 (r244694) @@ -109,6 +109,7 @@ static int needcomm; /* -o "command" */ static int needenv; /* -e */ static int needuser; /* -o "user" */ static int optfatal; /* Fatal error parsing some list-option. */ +static int pid_max; /* kern.max_pid */ static enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT; @@ -148,6 +149,7 @@ static int pscomp(const void *, const v static void saveuser(KINFO *); static void scanvars(void); static void sizevars(void); +static void pidmax_init(void); static void usage(void); static char dfmt[] = "pid,tt,state,time,command"; @@ -200,6 +202,8 @@ main(int argc, char *argv[]) if (argc > 1) argv[1] = kludge_oldps_options(PS_ARGS, argv[1], argv[2]); + pidmax_init(); + all = descendancy = _fmt = nselectors = optfatal = 0; prtheader = showthreads = wflag = xkeep_implied = 0; xkeep = -1; /* Neither -x nor -X. */ @@ -722,7 +726,6 @@ addelem_gid(struct listinfo *inf, const return (1); } -#define BSD_PID_MAX 99999 /* Copy of PID_MAX from sys/proc.h. */ static int addelem_pid(struct listinfo *inf, const char *elem) { @@ -740,7 +743,7 @@ addelem_pid(struct listinfo *inf, const if (*endp != '\0' || tempid < 0 || elem == endp) { warnx("Invalid %s: %s", inf->lname, elem); errno = ERANGE; - } else if (errno != 0 || tempid > BSD_PID_MAX) { + } else if (errno != 0 || tempid > pid_max) { warnx("%s too large: %s", inf->lname, elem); errno = ERANGE; } @@ -753,7 +756,6 @@ addelem_pid(struct listinfo *inf, const inf->l.pids[(inf->count)++] = tempid; return (1); } -#undef BSD_PID_MAX /*- * The user can specify a device via one of three formats: @@ -1352,6 +1354,18 @@ kludge_oldps_options(const char *optlist } static void +pidmax_init(void) +{ + size_t intsize; + + intsize = sizeof(pid_max); + if (sysctlbyname("kern.pid_max", &pid_max, &intsize, NULL, 0) < 0) { + warn("unable to read kern.pid_max"); + pid_max = 99999; + } +} + +static void usage(void) { #define SINGLE_OPTS "[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]" Modified: user/attilio/vmcontention/bin/sh/eval.c ============================================================================== --- user/attilio/vmcontention/bin/sh/eval.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/bin/sh/eval.c Wed Dec 26 08:20:27 2012 (r244694) @@ -1070,6 +1070,7 @@ evalcommand(union node *cmd, int flags, } handler = &jmploc; redirect(cmd->ncmd.redirect, mode); + outclearerror(out1); /* * If there is no command word, redirection errors should * not be fatal but assignment errors should. @@ -1085,6 +1086,11 @@ evalcommand(union node *cmd, int flags, builtin_flags = flags; exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv); flushall(); + if (outiserror(out1)) { + warning("write error on stdout"); + if (exitstatus == 0 || exitstatus == 1) + exitstatus = 2; + } cmddone: if (argc > 0) bltinunsetlocale(); Modified: user/attilio/vmcontention/bin/sh/jobs.c ============================================================================== --- user/attilio/vmcontention/bin/sh/jobs.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/bin/sh/jobs.c Wed Dec 26 08:20:27 2012 (r244694) @@ -298,6 +298,7 @@ showjob(struct job *jp, int mode) { char s[64]; char statestr[64]; + const char *sigstr; struct procstat *ps; struct job *j; int col, curr, i, jobno, prev, procno; @@ -324,8 +325,9 @@ showjob(struct job *jp, int mode) i = WSTOPSIG(ps->status); else i = -1; - if (i > 0 && i < sys_nsig && sys_siglist[i]) - strcpy(statestr, sys_siglist[i]); + sigstr = strsignal(i); + if (sigstr != NULL) + strcpy(statestr, sigstr); else strcpy(statestr, "Suspended"); #endif @@ -337,10 +339,11 @@ showjob(struct job *jp, int mode) WEXITSTATUS(ps->status)); } else { i = WTERMSIG(ps->status); - if (i > 0 && i < sys_nsig && sys_siglist[i]) - strcpy(statestr, sys_siglist[i]); + sigstr = strsignal(i); + if (sigstr != NULL) + strcpy(statestr, sigstr); else - fmtstr(statestr, 64, "Signal %d", i); + strcpy(statestr, "Unknown signal"); if (WCOREDUMP(ps->status)) strcat(statestr, " (core dumped)"); } @@ -1019,6 +1022,7 @@ dowait(int mode, struct job *job) struct procstat *sp; struct job *jp; struct job *thisjob; + const char *sigstr; int done; int stopped; int sig; @@ -1129,10 +1133,11 @@ dowait(int mode, struct job *job) coredump = WCOREDUMP(sp->status); } if (sig > 0 && sig != SIGINT && sig != SIGPIPE) { - if (sig < sys_nsig && sys_siglist[sig]) - out2str(sys_siglist[sig]); + sigstr = strsignal(sig); + if (sigstr != NULL) + out2str(sigstr); else - outfmt(out2, "Signal %d", sig); + out2str("Unknown signal"); if (coredump) out2str(" (core dumped)"); out2c('\n'); Modified: user/attilio/vmcontention/bin/sh/output.c ============================================================================== --- user/attilio/vmcontention/bin/sh/output.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/bin/sh/output.c Wed Dec 26 08:20:27 2012 (r244694) @@ -239,6 +239,20 @@ freestdout(void) } +int +outiserror(struct output *file) +{ + return (file->flags & OUTPUT_ERR); +} + + +void +outclearerror(struct output *file) +{ + file->flags &= ~OUTPUT_ERR; +} + + void outfmt(struct output *file, const char *fmt, ...) { Modified: user/attilio/vmcontention/bin/sh/output.h ============================================================================== --- user/attilio/vmcontention/bin/sh/output.h Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/bin/sh/output.h Wed Dec 26 08:20:27 2012 (r244694) @@ -66,6 +66,8 @@ void emptyoutbuf(struct output *); void flushall(void); void flushout(struct output *); void freestdout(void); +int outiserror(struct output *); +void outclearerror(struct output *); void outfmt(struct output *, const char *, ...) __printflike(2, 3); void out1fmt(const char *, ...) __printflike(1, 2); void out2fmt_flush(const char *, ...) __printflike(1, 2); Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.c Wed Dec 26 08:20:27 2012 (r244694) @@ -61,14 +61,16 @@ #undef verify #include <libzfs.h> -#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \ - zio_compress_table[(idx)].ci_name : "UNKNOWN") -#define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \ - zio_checksum_table[(idx)].ci_name : "UNKNOWN") -#define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \ - dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \ - dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN") -#define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : DMU_OT_NUMTYPES) +#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \ + zio_compress_table[(idx)].ci_name : "UNKNOWN") +#define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \ + zio_checksum_table[(idx)].ci_name : "UNKNOWN") +#define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \ + dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \ + dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN") +#define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : \ + (((idx) == DMU_OTN_ZAP_DATA || (idx) == DMU_OTN_ZAP_METADATA) ? \ + DMU_OT_ZAP_OTHER : DMU_OT_NUMTYPES)) #ifndef lint extern int zfs_recover; @@ -3194,7 +3196,13 @@ main(int argc, char **argv) argv[i], strerror(errno)); } } - (os != NULL) ? dump_dir(os) : dump_zpool(spa); + if (os != NULL) { + dump_dir(os); + } else if (zopt_objects > 0 && !dump_opt['m']) { + dump_dir(spa->spa_meta_objset); + } else { + dump_zpool(spa); + } } else { flagbits['b'] = ZDB_FLAG_PRINT_BLKPTR; flagbits['c'] = ZDB_FLAG_CHECKSUM; Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Wed Dec 26 08:20:27 2012 (r244694) @@ -727,7 +727,7 @@ send_iterate_fs(zfs_handle_t *zhp, void sd->parent_fromsnap_guid = 0; VERIFY(0 == nvlist_alloc(&sd->parent_snaps, NV_UNIQUE_NAME, 0)); VERIFY(0 == nvlist_alloc(&sd->snapprops, NV_UNIQUE_NAME, 0)); - (void) zfs_iter_snapshots(zhp, B_FALSE, send_iterate_snap, sd); + (void) zfs_iter_snapshots_sorted(zhp, send_iterate_snap, sd); VERIFY(0 == nvlist_add_nvlist(nvfs, "snaps", sd->parent_snaps)); VERIFY(0 == nvlist_add_nvlist(nvfs, "snapprops", sd->snapprops)); nvlist_free(sd->parent_snaps); @@ -1945,11 +1945,12 @@ recv_incremental_replication(libzfs_hand recvflags_t *flags, nvlist_t *stream_nv, avl_tree_t *stream_avl, nvlist_t *renamed) { - nvlist_t *local_nv; + nvlist_t *local_nv, *deleted = NULL; avl_tree_t *local_avl; nvpair_t *fselem, *nextfselem; char *fromsnap; char newname[ZFS_MAXNAMELEN]; + char guidname[32]; int error; boolean_t needagain, progress, recursive; char *s1, *s2; @@ -1965,6 +1966,8 @@ recv_incremental_replication(libzfs_hand again: needagain = progress = B_FALSE; + VERIFY(0 == nvlist_alloc(&deleted, NV_UNIQUE_NAME, 0)); + if ((error = gather_nvlist(hdl, tofs, fromsnap, NULL, recursive, &local_nv, &local_avl)) != 0) return (error); @@ -2079,6 +2082,8 @@ again: needagain = B_TRUE; else progress = B_TRUE; + sprintf(guidname, "%lu", thisguid); + nvlist_add_boolean(deleted, guidname); continue; } @@ -2134,6 +2139,8 @@ again: needagain = B_TRUE; else progress = B_TRUE; + sprintf(guidname, "%lu", parent_fromsnap_guid); + nvlist_add_boolean(deleted, guidname); continue; } @@ -2156,6 +2163,24 @@ again: s2 = strrchr(stream_fsname, '/'); /* + * Check if we're going to rename based on parent guid change + * and the current parent guid was also deleted. If it was then + * rename will fail and is likely unneeded, so avoid this and + * force an early retry to determine the new + * parent_fromsnap_guid. + */ + if (stream_parent_fromsnap_guid != 0 && + parent_fromsnap_guid != 0 && + stream_parent_fromsnap_guid != parent_fromsnap_guid) { + sprintf(guidname, "%lu", parent_fromsnap_guid); + if (nvlist_exists(deleted, guidname)) { + progress = B_TRUE; + needagain = B_TRUE; + goto doagain; + } + } + + /* * Check for rename. If the exact receive path is specified, it * does not count as a rename, but we still need to check the * datasets beneath it. @@ -2209,8 +2234,10 @@ again: } } +doagain: fsavl_destroy(local_avl); nvlist_free(local_nv); + nvlist_free(deleted); if (needagain && progress) { /* do another pass to fix up temporary names */ Modified: user/attilio/vmcontention/contrib/binutils/bfd/elflink.c ============================================================================== --- user/attilio/vmcontention/contrib/binutils/bfd/elflink.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/binutils/bfd/elflink.c Wed Dec 26 08:20:27 2012 (r244694) @@ -10584,6 +10584,7 @@ elf_gc_sweep (bfd *abfd, struct bfd_link { /* Keep debug and special sections. */ if ((o->flags & (SEC_DEBUGGING | SEC_LINKER_CREATED)) != 0 + || elf_section_data (o)->this_hdr.sh_type == SHT_NOTE || (o->flags & (SEC_ALLOC | SEC_LOAD | SEC_RELOC)) == 0) o->gc_mark = 1; Modified: user/attilio/vmcontention/contrib/binutils/gas/config/tc-arm.c ============================================================================== --- user/attilio/vmcontention/contrib/binutils/gas/config/tc-arm.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/binutils/gas/config/tc-arm.c Wed Dec 26 08:20:27 2012 (r244694) @@ -20107,6 +20107,7 @@ static const struct arm_option_cpu_value {"softvfp", FPU_ARCH_VFP}, {"softvfp+vfp", FPU_ARCH_VFP_V2}, {"vfp", FPU_ARCH_VFP_V2}, + {"vfpv2", FPU_ARCH_VFP_V2}, {"vfp9", FPU_ARCH_VFP_V2}, {"vfp3", FPU_ARCH_VFP_V3}, {"vfpv3", FPU_ARCH_VFP_V3}, Modified: user/attilio/vmcontention/contrib/gcc/config/arm/arm.h ============================================================================== --- user/attilio/vmcontention/contrib/gcc/config/arm/arm.h Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/gcc/config/arm/arm.h Wed Dec 26 08:20:27 2012 (r244694) @@ -1866,8 +1866,10 @@ typedef struct # define DTOR_LIST_BEGIN asm (ARM_EABI_DTORS_SECTION_OP) # define DTOR_LIST_END /* empty */ # else /* !defined (__ARM_EABI__) */ +# ifndef __clang__ # define CTORS_SECTION_ASM_OP ARM_CTORS_SECTION_OP # define DTORS_SECTION_ASM_OP ARM_DTORS_SECTION_OP +# endif # endif /* !defined (__ARM_EABI__) */ #endif /* !defined (IN_LIBCC2) */ Modified: user/attilio/vmcontention/contrib/gcc/longlong.h ============================================================================== --- user/attilio/vmcontention/contrib/gcc/longlong.h Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/gcc/longlong.h Wed Dec 26 08:20:27 2012 (r244694) @@ -205,7 +205,7 @@ UDItype __umulsidi3 (USItype, USItype); "rI" ((USItype) (bl)) __CLOBBER_CC) #define umul_ppmm(xh, xl, a, b) \ {register USItype __t0, __t1, __t2; \ - __asm__ ("%@ Inlined umul_ppmm\n" \ + __asm__ ("/* Inlined umul_ppmm */\n" \ " mov %2, %5, lsr #16\n" \ " mov %0, %6, lsr #16\n" \ " bic %3, %5, %2, lsl #16\n" \ Modified: user/attilio/vmcontention/contrib/gdb/gdb/dwarf2read.c ============================================================================== --- user/attilio/vmcontention/contrib/gdb/gdb/dwarf2read.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/gdb/gdb/dwarf2read.c Wed Dec 26 08:20:27 2012 (r244694) @@ -834,6 +834,8 @@ static void read_tag_const_type (struct static void read_tag_volatile_type (struct die_info *, struct dwarf2_cu *); +static void read_tag_restrict_type (struct die_info *, struct dwarf2_cu *); + static void read_tag_string_type (struct die_info *, struct dwarf2_cu *); static void read_subroutine_type (struct die_info *, struct dwarf2_cu *); @@ -3729,7 +3731,8 @@ read_tag_const_type (struct die_info *di } base_type = die_type (die, cu); - die->type = make_cv_type (1, TYPE_VOLATILE (base_type), base_type, 0); + die->type = make_cvr_type (1, TYPE_VOLATILE (base_type), + TYPE_RESTRICT (base_type), base_type, 0); } static void @@ -3743,7 +3746,23 @@ read_tag_volatile_type (struct die_info } base_type = die_type (die, cu); - die->type = make_cv_type (TYPE_CONST (base_type), 1, base_type, 0); + die->type = make_cvr_type (TYPE_CONST (base_type), 1, + TYPE_RESTRICT (base_type), base_type, 0); +} + +static void +read_tag_restrict_type (struct die_info *die, struct dwarf2_cu *cu) +{ + struct type *base_type; + + if (die->type) + { + return; + } + + base_type = die_type (die, cu); + die->type = make_cvr_type (TYPE_CONST (base_type), TYPE_VOLATILE (base_type), + 1, base_type, 0); } /* Extract all information from a DW_TAG_string_type DIE and add to @@ -6086,6 +6105,9 @@ read_type_die (struct die_info *die, str case DW_TAG_volatile_type: read_tag_volatile_type (die, cu); break; + case DW_TAG_restrict_type: + read_tag_restrict_type (die, cu); + break; case DW_TAG_string_type: read_tag_string_type (die, cu); break; Modified: user/attilio/vmcontention/contrib/gdb/gdb/gdbtypes.c ============================================================================== --- user/attilio/vmcontention/contrib/gdb/gdb/gdbtypes.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/gdb/gdb/gdbtypes.c Wed Dec 26 08:20:27 2012 (r244694) @@ -502,7 +502,8 @@ make_type_with_address_space (struct typ We allocate new memory if needed. */ struct type * -make_cv_type (int cnst, int voltl, struct type *type, struct type **typeptr) +make_cvr_type (int cnst, int voltl, int restrct, struct type *type, + struct type **typeptr) { struct type *ntype; /* New type */ struct type *tmp_type = type; /* tmp type */ @@ -517,6 +518,9 @@ make_cv_type (int cnst, int voltl, struc if (voltl) new_flags |= TYPE_FLAG_VOLATILE; + if (restrct) + new_flags |= TYPE_FLAG_RESTRICT; + if (typeptr && *typeptr != NULL) { /* Objfile is per-core-type. This const-qualified type had best @@ -1371,7 +1375,7 @@ struct type * check_typedef (struct type *type) { struct type *orig_type = type; - int is_const, is_volatile; + int is_const, is_volatile, is_restrict; while (TYPE_CODE (type) == TYPE_CODE_TYPEDEF) { @@ -1407,6 +1411,7 @@ check_typedef (struct type *type) is_const = TYPE_CONST (type); is_volatile = TYPE_VOLATILE (type); + is_restrict = TYPE_RESTRICT (type); /* If this is a struct/class/union with no fields, then check whether a full definition exists somewhere else. This is for systems where a @@ -1424,7 +1429,7 @@ check_typedef (struct type *type) } newtype = lookup_transparent_type (name); if (newtype) - make_cv_type (is_const, is_volatile, newtype, &type); + make_cvr_type (is_const, is_volatile, is_restrict, newtype, &type); } /* Otherwise, rely on the stub flag being set for opaque/stubbed types */ else if (TYPE_STUB (type) && !currently_reading_symtab) @@ -1442,7 +1447,8 @@ check_typedef (struct type *type) } sym = lookup_symbol (name, 0, STRUCT_DOMAIN, 0, (struct symtab **) NULL); if (sym) - make_cv_type (is_const, is_volatile, SYMBOL_TYPE (sym), &type); + make_cvr_type (is_const, is_volatile, is_restrict, SYMBOL_TYPE (sym), + &type); } if (TYPE_TARGET_STUB (type)) Modified: user/attilio/vmcontention/contrib/gdb/gdb/gdbtypes.h ============================================================================== --- user/attilio/vmcontention/contrib/gdb/gdb/gdbtypes.h Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/gdb/gdb/gdbtypes.h Wed Dec 26 08:20:27 2012 (r244694) @@ -273,6 +273,13 @@ enum type_code #define TYPE_ADDRESS_CLASS_ALL(t) (TYPE_INSTANCE_FLAGS(t) \ & TYPE_FLAG_ADDRESS_CLASS_ALL) +/* Restrict type. If this is set, the corresponding type has a + * restrict modifier. + */ + +#define TYPE_FLAG_RESTRICT (1 << 17) +#define TYPE_RESTRICT(t) (TYPE_INSTANCE_FLAGS (t) & TYPE_FLAG_RESTRICT) + /* Array bound type. */ enum array_bound_type { @@ -1099,7 +1106,8 @@ extern struct type *lookup_reference_typ extern struct type *make_reference_type (struct type *, struct type **); -extern struct type *make_cv_type (int, int, struct type *, struct type **); +extern struct type *make_cvr_type (int, int, int, struct type *, + struct type **); extern void replace_type (struct type *, struct type *); Modified: user/attilio/vmcontention/contrib/gdb/gdb/hpread.c ============================================================================== --- user/attilio/vmcontention/contrib/gdb/gdb/hpread.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/gdb/gdb/hpread.c Wed Dec 26 08:20:27 2012 (r244694) @@ -4939,8 +4939,9 @@ hpread_type_lookup (dnttpointer hp_type, * "m_void" modifiers? Is static_flag really needed here? * (m_static used for methods of classes, elsewhere). */ - tmp_type = make_cv_type (dn_bufp->dmodifier.m_const, + tmp_type = make_cvr_type (dn_bufp->dmodifier.m_const, dn_bufp->dmodifier.m_volatile, + 0, hpread_type_lookup (dn_bufp->dmodifier.type, objfile), 0); return tmp_type; Modified: user/attilio/vmcontention/contrib/gdb/gdb/parse.c ============================================================================== --- user/attilio/vmcontention/contrib/gdb/gdb/parse.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/gdb/gdb/parse.c Wed Dec 26 08:20:27 2012 (r244694) @@ -1167,13 +1167,15 @@ follow_types (struct type *follow_type) case tp_end: done = 1; if (make_const) - follow_type = make_cv_type (make_const, - TYPE_VOLATILE (follow_type), - follow_type, 0); + follow_type = make_cvr_type (make_const, + TYPE_VOLATILE (follow_type), + TYPE_RESTRICT (follow_type), + follow_type, 0); if (make_volatile) - follow_type = make_cv_type (TYPE_CONST (follow_type), - make_volatile, - follow_type, 0); + follow_type = make_cvr_type (TYPE_CONST (follow_type), + make_volatile, + TYPE_RESTRICT (follow_type), + follow_type, 0); if (make_addr_space) follow_type = make_type_with_address_space (follow_type, make_addr_space); @@ -1192,13 +1194,15 @@ follow_types (struct type *follow_type) case tp_pointer: follow_type = lookup_pointer_type (follow_type); if (make_const) - follow_type = make_cv_type (make_const, - TYPE_VOLATILE (follow_type), - follow_type, 0); + follow_type = make_cvr_type (make_const, + TYPE_VOLATILE (follow_type), + TYPE_RESTRICT (follow_type), + follow_type, 0); if (make_volatile) - follow_type = make_cv_type (TYPE_CONST (follow_type), - make_volatile, - follow_type, 0); + follow_type = make_cvr_type (TYPE_CONST (follow_type), + make_volatile, + TYPE_RESTRICT (follow_type), + follow_type, 0); if (make_addr_space) follow_type = make_type_with_address_space (follow_type, make_addr_space); @@ -1208,13 +1212,15 @@ follow_types (struct type *follow_type) case tp_reference: follow_type = lookup_reference_type (follow_type); if (make_const) - follow_type = make_cv_type (make_const, - TYPE_VOLATILE (follow_type), - follow_type, 0); + follow_type = make_cvr_type (make_const, + TYPE_VOLATILE (follow_type), + TYPE_RESTRICT (follow_type), + follow_type, 0); if (make_volatile) - follow_type = make_cv_type (TYPE_CONST (follow_type), - make_volatile, - follow_type, 0); + follow_type = make_cvr_type (TYPE_CONST (follow_type), + make_volatile, + TYPE_RESTRICT (follow_type), + follow_type, 0); if (make_addr_space) follow_type = make_type_with_address_space (follow_type, make_addr_space); Modified: user/attilio/vmcontention/contrib/gdb/gdb/stabsread.c ============================================================================== --- user/attilio/vmcontention/contrib/gdb/gdb/stabsread.c Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/gdb/gdb/stabsread.c Wed Dec 26 08:20:27 2012 (r244694) @@ -1750,13 +1750,13 @@ again: case 'k': /* Const qualifier on some type (Sun) */ type = read_type (pp, objfile); - type = make_cv_type (1, TYPE_VOLATILE (type), type, + type = make_cvr_type (1, TYPE_VOLATILE (type), TYPE_RESTRICT(type), type, dbx_lookup_type (typenums)); break; case 'B': /* Volatile qual on some type (Sun) */ type = read_type (pp, objfile); - type = make_cv_type (TYPE_CONST (type), 1, type, + type = make_cvr_type (TYPE_CONST (type), 1, TYPE_RESTRICT(type), type, dbx_lookup_type (typenums)); break; Modified: user/attilio/vmcontention/contrib/libstdc++/include/std/std_limits.h ============================================================================== --- user/attilio/vmcontention/contrib/libstdc++/include/std/std_limits.h Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/libstdc++/include/std/std_limits.h Wed Dec 26 08:20:27 2012 (r244694) @@ -134,10 +134,11 @@ #define __glibcxx_signed(T) ((T)(-1) < 0) #define __glibcxx_min(T) \ - (__glibcxx_signed (T) ? (T)1 << __glibcxx_digits (T) : (T)0) + (__glibcxx_signed (T) ? (((T)1 << (__glibcxx_digits (T) - 1)) << 1) : (T)0) #define __glibcxx_max(T) \ - (__glibcxx_signed (T) ? ((T)1 << __glibcxx_digits (T)) - 1 : ~(T)0) + (__glibcxx_signed (T) ? \ + (((((T)1 << (__glibcxx_digits (T) - 1)) - 1) << 1) + 1) : ~(T)0) #define __glibcxx_digits(T) \ (sizeof(T) * __CHAR_BIT__ - __glibcxx_signed (T)) Modified: user/attilio/vmcontention/contrib/llvm/include/llvm/MC/MCExpr.h ============================================================================== --- user/attilio/vmcontention/contrib/llvm/include/llvm/MC/MCExpr.h Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/include/llvm/MC/MCExpr.h Wed Dec 26 08:20:27 2012 (r244694) @@ -197,7 +197,11 @@ public: VK_Mips_GOT_PAGE, VK_Mips_GOT_OFST, VK_Mips_HIGHER, - VK_Mips_HIGHEST + VK_Mips_HIGHEST, + VK_Mips_GOT_HI16, + VK_Mips_GOT_LO16, + VK_Mips_CALL_HI16, + VK_Mips_CALL_LO16 }; private: Modified: user/attilio/vmcontention/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp Wed Dec 26 08:20:27 2012 (r244694) @@ -346,7 +346,7 @@ uint8_t *RuntimeDyldImpl::createStubFunc uint32_t *StubAddr = (uint32_t*)Addr; *StubAddr = 0xe51ff004; // ldr pc,<label> return (uint8_t*)++StubAddr; - } else if (Arch == Triple::mipsel) { + } else if (Arch == Triple::mipsel || Arch == Triple::mips) { uint32_t *StubAddr = (uint32_t*)Addr; // 0: 3c190000 lui t9,%hi(addr). // 4: 27390000 addiu t9,t9,%lo(addr). Modified: user/attilio/vmcontention/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp Wed Dec 26 08:20:27 2012 (r244694) @@ -676,7 +676,8 @@ void RuntimeDyldELF::processRelocationRe RelType, 0); Section.StubOffset += getMaxStubSize(); } - } else if (Arch == Triple::mipsel && RelType == ELF::R_MIPS_26) { + } else if ((Arch == Triple::mipsel || Arch == Triple::mips) && + RelType == ELF::R_MIPS_26) { // This is an Mips branch relocation, need to use a stub function. DEBUG(dbgs() << "\t\tThis is a Mips branch relocation."); SectionEntry &Section = Sections[Rel.SectionID]; Modified: user/attilio/vmcontention/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h Wed Dec 26 08:20:27 2012 (r244694) @@ -168,7 +168,7 @@ protected: inline unsigned getMaxStubSize() { if (Arch == Triple::arm || Arch == Triple::thumb) return 8; // 32-bit instruction and 32-bit address - else if (Arch == Triple::mipsel) + else if (Arch == Triple::mipsel || Arch == Triple::mips) return 16; else if (Arch == Triple::ppc64) return 44; Modified: user/attilio/vmcontention/contrib/llvm/lib/MC/MCExpr.cpp ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/MC/MCExpr.cpp Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/lib/MC/MCExpr.cpp Wed Dec 26 08:20:27 2012 (r244694) @@ -229,6 +229,10 @@ StringRef MCSymbolRefExpr::getVariantKin case VK_Mips_GOT_OFST: return "GOT_OFST"; case VK_Mips_HIGHER: return "HIGHER"; case VK_Mips_HIGHEST: return "HIGHEST"; + case VK_Mips_GOT_HI16: return "GOT_HI16"; + case VK_Mips_GOT_LO16: return "GOT_LO16"; + case VK_Mips_CALL_HI16: return "CALL_HI16"; + case VK_Mips_CALL_LO16: return "CALL_LO16"; } llvm_unreachable("Invalid variant kind"); } Modified: user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp Wed Dec 26 08:20:27 2012 (r244694) @@ -128,6 +128,10 @@ static void printExpr(const MCExpr *Expr case MCSymbolRefExpr::VK_Mips_GOT_OFST: OS << "%got_ofst("; break; case MCSymbolRefExpr::VK_Mips_HIGHER: OS << "%higher("; break; case MCSymbolRefExpr::VK_Mips_HIGHEST: OS << "%highest("; break; + case MCSymbolRefExpr::VK_Mips_GOT_HI16: OS << "%got_hi("; break; + case MCSymbolRefExpr::VK_Mips_GOT_LO16: OS << "%got_lo("; break; + case MCSymbolRefExpr::VK_Mips_CALL_HI16: OS << "%call_hi("; break; + case MCSymbolRefExpr::VK_Mips_CALL_LO16: OS << "%call_lo("; break; } OS << SRE->getSymbol(); Modified: user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp Wed Dec 26 08:20:27 2012 (r244694) @@ -42,6 +42,8 @@ static unsigned adjustFixupValue(unsigne case Mips::fixup_Mips_GOT_PAGE: case Mips::fixup_Mips_GOT_OFST: case Mips::fixup_Mips_GOT_DISP: + case Mips::fixup_Mips_GOT_LO16: + case Mips::fixup_Mips_CALL_LO16: break; case Mips::fixup_Mips_PC16: // So far we are only using this type for branches. @@ -60,6 +62,8 @@ static unsigned adjustFixupValue(unsigne break; case Mips::fixup_Mips_HI16: case Mips::fixup_Mips_GOT_Local: + case Mips::fixup_Mips_GOT_HI16: + case Mips::fixup_Mips_CALL_HI16: // Get the 2nd 16-bits. Also add 1 if bit 15 is 1. Value = ((Value + 0x8000) >> 16) & 0xffff; break; @@ -179,7 +183,11 @@ public: { "fixup_Mips_GOT_OFST", 0, 16, 0 }, { "fixup_Mips_GOT_DISP", 0, 16, 0 }, { "fixup_Mips_HIGHER", 0, 16, 0 }, - { "fixup_Mips_HIGHEST", 0, 16, 0 } + { "fixup_Mips_HIGHEST", 0, 16, 0 }, + { "fixup_Mips_GOT_HI16", 0, 16, 0 }, + { "fixup_Mips_GOT_LO16", 0, 16, 0 }, + { "fixup_Mips_CALL_HI16", 0, 16, 0 }, + { "fixup_Mips_CALL_LO16", 0, 16, 0 } }; if (Kind < FirstTargetFixupKind) Modified: user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h Wed Dec 26 08:20:27 2012 (r244694) @@ -84,7 +84,13 @@ namespace MipsII { /// MO_HIGHER/HIGHEST - Represents the highest or higher half word of a /// 64-bit symbol address. MO_HIGHER, - MO_HIGHEST + MO_HIGHEST, + + /// MO_GOT_HI16/LO16, MO_CALL_HI16/LO16 - Relocations used for large GOTs. + MO_GOT_HI16, + MO_GOT_LO16, + MO_CALL_HI16, + MO_CALL_LO16 }; enum { Modified: user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp Wed Dec 26 08:20:27 2012 (r244694) @@ -179,6 +179,18 @@ unsigned MipsELFObjectWriter::GetRelocTy case Mips::fixup_Mips_HIGHEST: Type = ELF::R_MIPS_HIGHEST; break; + case Mips::fixup_Mips_GOT_HI16: + Type = ELF::R_MIPS_GOT_HI16; + break; + case Mips::fixup_Mips_GOT_LO16: + Type = ELF::R_MIPS_GOT_LO16; + break; + case Mips::fixup_Mips_CALL_HI16: + Type = ELF::R_MIPS_CALL_HI16; + break; + case Mips::fixup_Mips_CALL_LO16: + Type = ELF::R_MIPS_CALL_LO16; + break; } return Type; } Modified: user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h Wed Dec 26 08:20:27 2012 (r244694) @@ -116,6 +116,18 @@ namespace Mips { // resulting in - R_MIPS_HIGHEST fixup_Mips_HIGHEST, + // resulting in - R_MIPS_GOT_HI16 + fixup_Mips_GOT_HI16, + + // resulting in - R_MIPS_GOT_LO16 + fixup_Mips_GOT_LO16, + + // resulting in - R_MIPS_CALL_HI16 + fixup_Mips_CALL_HI16, + + // resulting in - R_MIPS_CALL_LO16 + fixup_Mips_CALL_LO16, + // Marker LastTargetFixupKind, NumTargetFixupKinds = LastTargetFixupKind - FirstTargetFixupKind Modified: user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp Wed Dec 26 08:20:27 2012 (r244694) @@ -287,6 +287,18 @@ getMachineOpValue(const MCInst &MI, cons case MCSymbolRefExpr::VK_Mips_HIGHEST: FixupKind = Mips::fixup_Mips_HIGHEST; break; + case MCSymbolRefExpr::VK_Mips_GOT_HI16: + FixupKind = Mips::fixup_Mips_GOT_HI16; + break; + case MCSymbolRefExpr::VK_Mips_GOT_LO16: + FixupKind = Mips::fixup_Mips_GOT_LO16; + break; + case MCSymbolRefExpr::VK_Mips_CALL_HI16: + FixupKind = Mips::fixup_Mips_CALL_HI16; + break; + case MCSymbolRefExpr::VK_Mips_CALL_LO16: + FixupKind = Mips::fixup_Mips_CALL_LO16; + break; } // switch Fixups.push_back(MCFixup::Create(0, MO.getExpr(), MCFixupKind(FixupKind))); Modified: user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td Wed Dec 26 08:20:27 2012 (r244694) @@ -255,6 +255,7 @@ def : MipsPat<(MipsHi tblockaddress:$in) def : MipsPat<(MipsHi tjumptable:$in), (LUi64 tjumptable:$in)>; def : MipsPat<(MipsHi tconstpool:$in), (LUi64 tconstpool:$in)>; def : MipsPat<(MipsHi tglobaltlsaddr:$in), (LUi64 tglobaltlsaddr:$in)>; +def : MipsPat<(MipsHi texternalsym:$in), (LUi64 texternalsym:$in)>; def : MipsPat<(MipsLo tglobaladdr:$in), (DADDiu ZERO_64, tglobaladdr:$in)>; def : MipsPat<(MipsLo tblockaddress:$in), (DADDiu ZERO_64, tblockaddress:$in)>; @@ -262,6 +263,7 @@ def : MipsPat<(MipsLo tjumptable:$in), ( def : MipsPat<(MipsLo tconstpool:$in), (DADDiu ZERO_64, tconstpool:$in)>; def : MipsPat<(MipsLo tglobaltlsaddr:$in), (DADDiu ZERO_64, tglobaltlsaddr:$in)>; +def : MipsPat<(MipsLo texternalsym:$in), (DADDiu ZERO_64, texternalsym:$in)>; def : MipsPat<(add CPU64Regs:$hi, (MipsLo tglobaladdr:$lo)), (DADDiu CPU64Regs:$hi, tglobaladdr:$lo)>; Modified: user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp Wed Dec 26 05:39:42 2012 (r244693) +++ user/attilio/vmcontention/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp Wed Dec 26 08:20:27 2012 (r244694) @@ -85,7 +85,7 @@ class MipsCodeEmitter : public MachineFu private: - void emitWordLE(unsigned Word); + void emitWord(unsigned Word); /// Routines that handle operands which add machine relocations which are /// fixed up by the relocation stage. @@ -112,12 +112,6 @@ class MipsCodeEmitter : public MachineFu unsigned getSizeExtEncoding(const MachineInstr &MI, unsigned OpNo) const; unsigned getSizeInsEncoding(const MachineInstr &MI, unsigned OpNo) const; - int emitULW(const MachineInstr &MI); - int emitUSW(const MachineInstr &MI); - int emitULH(const MachineInstr &MI); - int emitULHu(const MachineInstr &MI); - int emitUSH(const MachineInstr &MI); - void emitGlobalAddressUnaligned(const GlobalValue *GV, unsigned Reloc, int Offset) const; }; @@ -133,7 +127,7 @@ bool MipsCodeEmitter::runOnMachineFuncti MCPEs = &MF.getConstantPool()->getConstants(); MJTEs = 0; if (MF.getJumpTableInfo()) MJTEs = &MF.getJumpTableInfo()->getJumpTables(); - JTI->Initialize(MF, IsPIC); + JTI->Initialize(MF, IsPIC, Subtarget->isLittle()); MCE.setModuleInfo(&getAnalysis<MachineModuleInfo> ()); do { @@ -271,103 +265,6 @@ void MipsCodeEmitter::emitMachineBasicBl Reloc, BB)); } -int MipsCodeEmitter::emitUSW(const MachineInstr &MI) { - unsigned src = getMachineOpValue(MI, MI.getOperand(0)); - unsigned base = getMachineOpValue(MI, MI.getOperand(1)); - unsigned offset = getMachineOpValue(MI, MI.getOperand(2)); - // swr src, offset(base) - // swl src, offset+3(base) - MCE.emitWordLE( - (0x2e << 26) | (base << 21) | (src << 16) | (offset & 0xffff)); - MCE.emitWordLE( - (0x2a << 26) | (base << 21) | (src << 16) | ((offset+3) & 0xffff)); - return 2; -} - -int MipsCodeEmitter::emitULW(const MachineInstr &MI) { - unsigned dst = getMachineOpValue(MI, MI.getOperand(0)); - unsigned base = getMachineOpValue(MI, MI.getOperand(1)); - unsigned offset = getMachineOpValue(MI, MI.getOperand(2)); - unsigned at = 1; - if (dst != base) { - // lwr dst, offset(base) - // lwl dst, offset+3(base) - MCE.emitWordLE( - (0x26 << 26) | (base << 21) | (dst << 16) | (offset & 0xffff)); - MCE.emitWordLE( - (0x22 << 26) | (base << 21) | (dst << 16) | ((offset+3) & 0xffff)); - return 2; - } else { - // lwr at, offset(base) - // lwl at, offset+3(base) - // addu dst, at, $zero - MCE.emitWordLE( - (0x26 << 26) | (base << 21) | (at << 16) | (offset & 0xffff)); - MCE.emitWordLE( - (0x22 << 26) | (base << 21) | (at << 16) | ((offset+3) & 0xffff)); - MCE.emitWordLE( - (0x0 << 26) | (at << 21) | (0x0 << 16) | (dst << 11) | (0x0 << 6) | 0x21); - return 3; - } -} - -int MipsCodeEmitter::emitUSH(const MachineInstr &MI) { - unsigned src = getMachineOpValue(MI, MI.getOperand(0)); - unsigned base = getMachineOpValue(MI, MI.getOperand(1)); - unsigned offset = getMachineOpValue(MI, MI.getOperand(2)); - unsigned at = 1; - // sb src, offset(base) - // srl at,src,8 - // sb at, offset+1(base) - MCE.emitWordLE( - (0x28 << 26) | (base << 21) | (src << 16) | (offset & 0xffff)); - MCE.emitWordLE( - (0x0 << 26) | (0x0 << 21) | (src << 16) | (at << 11) | (0x8 << 6) | 0x2); - MCE.emitWordLE( - (0x28 << 26) | (base << 21) | (at << 16) | ((offset+1) & 0xffff)); - return 3; -} - -int MipsCodeEmitter::emitULH(const MachineInstr &MI) { - unsigned dst = getMachineOpValue(MI, MI.getOperand(0)); - unsigned base = getMachineOpValue(MI, MI.getOperand(1)); - unsigned offset = getMachineOpValue(MI, MI.getOperand(2)); - unsigned at = 1; - // lbu at, offset(base) - // lb dst, offset+1(base) - // sll dst,dst,8 - // or dst,dst,at - MCE.emitWordLE( - (0x24 << 26) | (base << 21) | (at << 16) | (offset & 0xffff)); - MCE.emitWordLE( - (0x20 << 26) | (base << 21) | (dst << 16) | ((offset+1) & 0xffff)); - MCE.emitWordLE( - (0x0 << 26) | (0x0 << 21) | (dst << 16) | (dst << 11) | (0x8 << 6) | 0x0); - MCE.emitWordLE( - (0x0 << 26) | (dst << 21) | (at << 16) | (dst << 11) | (0x0 << 6) | 0x25); - return 4; -} - -int MipsCodeEmitter::emitULHu(const MachineInstr &MI) { - unsigned dst = getMachineOpValue(MI, MI.getOperand(0)); - unsigned base = getMachineOpValue(MI, MI.getOperand(1)); - unsigned offset = getMachineOpValue(MI, MI.getOperand(2)); - unsigned at = 1; - // lbu at, offset(base) - // lbu dst, offset+1(base) - // sll dst,dst,8 - // or dst,dst,at - MCE.emitWordLE( - (0x24 << 26) | (base << 21) | (at << 16) | (offset & 0xffff)); - MCE.emitWordLE( - (0x24 << 26) | (base << 21) | (dst << 16) | ((offset+1) & 0xffff)); - MCE.emitWordLE( - (0x0 << 26) | (0x0 << 21) | (dst << 16) | (dst << 11) | (0x8 << 6) | 0x0); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212260820.qBQ8KSj7028244>