svn commit: r285802 - in projects/clang-trunk: . bin/dd bin/ls bin/ps bin/sh bin/stty cddl/contrib/opensolaris/cmd/lockstat contrib/sqlite3 crypto/openssh etc etc/defaults gnu/lib gnu/usr.bin lib/l...

Dimitry Andric dim at FreeBSD.org
Wed Jul 22 19:55:47 UTC 2015 

Author: dim
Date: Wed Jul 22 19:55:32 2015
New Revision: 285802
URL: https://svnweb.freebsd.org/changeset/base/285802

Log:
  Merge ^/head r285341 through r285792.

Added:
  projects/clang-trunk/lib/libc/aarch64/gen/_ctx_start.S
     - copied unchanged from r285792, head/lib/libc/aarch64/gen/_ctx_start.S
  projects/clang-trunk/lib/libc/aarch64/gen/makecontext.c
     - copied unchanged from r285792, head/lib/libc/aarch64/gen/makecontext.c
  projects/clang-trunk/lib/libc/sys/numa_getaffinity.2
     - copied unchanged from r285792, head/lib/libc/sys/numa_getaffinity.2
  projects/clang-trunk/release/scripts/box.ovf
     - copied unchanged from r285792, head/release/scripts/box.ovf
  projects/clang-trunk/release/tools/vagrant-virtualbox.conf
     - copied unchanged from r285792, head/release/tools/vagrant-virtualbox.conf
  projects/clang-trunk/release/tools/vagrant-vmware.conf
     - copied unchanged from r285792, head/release/tools/vagrant-vmware.conf
  projects/clang-trunk/share/man/man4/numa.4
     - copied unchanged from r285792, head/share/man/man4/numa.4
  projects/clang-trunk/sys/amd64/cloudabi64/
     - copied from r285792, head/sys/amd64/cloudabi64/
  projects/clang-trunk/sys/arm/include/atomic-v4.h
     - copied unchanged from r285792, head/sys/arm/include/atomic-v4.h
  projects/clang-trunk/sys/arm/include/atomic-v6.h
     - copied unchanged from r285792, head/sys/arm/include/atomic-v6.h
  projects/clang-trunk/sys/arm64/acpica/pci_cfgreg.c
     - copied unchanged from r285792, head/sys/arm64/acpica/pci_cfgreg.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_errno.c
     - copied unchanged from r285792, head/sys/compat/cloudabi/cloudabi_errno.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_util.h
     - copied unchanged from r285792, head/sys/compat/cloudabi/cloudabi_util.h
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_util.h
     - copied unchanged from r285792, head/sys/compat/cloudabi64/cloudabi64_util.h
  projects/clang-trunk/sys/dev/cxgbe/firmware/t4fw-1.14.2.0.bin.uu
     - copied unchanged from r285792, head/sys/dev/cxgbe/firmware/t4fw-1.14.2.0.bin.uu
  projects/clang-trunk/sys/dev/cxgbe/firmware/t5fw-1.14.2.0.bin.uu
     - copied unchanged from r285792, head/sys/dev/cxgbe/firmware/t5fw-1.14.2.0.bin.uu
  projects/clang-trunk/sys/dev/pms/
     - copied from r285792, head/sys/dev/pms/
  projects/clang-trunk/sys/dev/vt/logo/logo_beastie.c
     - copied unchanged from r285792, head/sys/dev/vt/logo/logo_beastie.c
  projects/clang-trunk/sys/dev/vt/vt_cpulogos.c
     - copied unchanged from r285792, head/sys/dev/vt/vt_cpulogos.c
  projects/clang-trunk/sys/kern/kern_numa.c
     - copied unchanged from r285792, head/sys/kern/kern_numa.c
  projects/clang-trunk/sys/modules/cloudabi/
     - copied from r285792, head/sys/modules/cloudabi/
  projects/clang-trunk/sys/modules/cloudabi64/
     - copied from r285792, head/sys/modules/cloudabi64/
  projects/clang-trunk/sys/modules/pms/
     - copied from r285792, head/sys/modules/pms/
  projects/clang-trunk/sys/sys/_vm_domain.h
     - copied unchanged from r285792, head/sys/sys/_vm_domain.h
  projects/clang-trunk/sys/sys/numa.h
     - copied unchanged from r285792, head/sys/sys/numa.h
  projects/clang-trunk/sys/vm/vm_domain.c
     - copied unchanged from r285792, head/sys/vm/vm_domain.c
  projects/clang-trunk/sys/vm/vm_domain.h
     - copied unchanged from r285792, head/sys/vm/vm_domain.h
  projects/clang-trunk/usr.bin/numactl/
     - copied from r285792, head/usr.bin/numactl/
Deleted:
  projects/clang-trunk/lib/libarchive/libarchive.pc
  projects/clang-trunk/lib/libmd/sha256.h
  projects/clang-trunk/lib/libmd/sha256c.c
  projects/clang-trunk/sys/cddl/dev/lockstat/
  projects/clang-trunk/sys/dev/cxgbe/firmware/t4fw-1.11.27.0.bin.uu
  projects/clang-trunk/sys/dev/cxgbe/firmware/t5fw-1.11.27.0.bin.uu
  projects/clang-trunk/sys/modules/dtrace/lockstat/
  projects/clang-trunk/usr.sbin/pw/fileupd.c
Modified:
  projects/clang-trunk/ObsoleteFiles.inc
  projects/clang-trunk/UPDATING
  projects/clang-trunk/bin/dd/dd.1
  projects/clang-trunk/bin/ls/Makefile
  projects/clang-trunk/bin/ls/ls.c
  projects/clang-trunk/bin/ls/ls.h
  projects/clang-trunk/bin/ls/print.c
  projects/clang-trunk/bin/ps/ps.1
  projects/clang-trunk/bin/sh/sh.1
  projects/clang-trunk/bin/stty/stty.c
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
  projects/clang-trunk/contrib/sqlite3/sqlite3.c
  projects/clang-trunk/crypto/openssh/ssh.c
  projects/clang-trunk/etc/defaults/periodic.conf
  projects/clang-trunk/etc/devd.conf
  projects/clang-trunk/gnu/lib/Makefile
  projects/clang-trunk/gnu/usr.bin/Makefile
  projects/clang-trunk/lib/libarchive/Makefile
  projects/clang-trunk/lib/libc/aarch64/Symbol.map
  projects/clang-trunk/lib/libc/aarch64/gen/Makefile.inc
  projects/clang-trunk/lib/libc/gen/syslog.3
  projects/clang-trunk/lib/libc/gen/wordexp.3
  projects/clang-trunk/lib/libc/sys/Makefile.inc
  projects/clang-trunk/lib/libc/sys/Symbol.map
  projects/clang-trunk/lib/libc/sys/madvise.2
  projects/clang-trunk/lib/libc/sys/wait.2
  projects/clang-trunk/lib/libc/tests/sys/Makefile
  projects/clang-trunk/lib/libkvm/kvm_proc.c
  projects/clang-trunk/lib/libmd/Makefile
  projects/clang-trunk/lib/libusb/libusb20_desc.c
  projects/clang-trunk/lib/msun/man/cacos.3
  projects/clang-trunk/release/Makefile.vagrant
  projects/clang-trunk/release/Makefile.vm
  projects/clang-trunk/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/clang-trunk/release/doc/share/xml/sponsor.ent
  projects/clang-trunk/release/picobsd/build/picobsd
  projects/clang-trunk/release/scripts/atlas-upload.sh
  projects/clang-trunk/release/tools/arm.subr
  projects/clang-trunk/release/tools/vagrant.conf
  projects/clang-trunk/sbin/devd/devd.conf.5
  projects/clang-trunk/sbin/geom/class/multipath/gmultipath.8
  projects/clang-trunk/sbin/geom/class/part/geom_part.c
  projects/clang-trunk/sbin/geom/class/part/gpart.8
  projects/clang-trunk/sbin/ggate/ggatec/ggatec.8
  projects/clang-trunk/sbin/ggate/ggatec/ggatec.c
  projects/clang-trunk/sbin/ggate/ggated/ggated.8
  projects/clang-trunk/sbin/ggate/ggated/ggated.c
  projects/clang-trunk/sbin/ggate/ggatel/ggatel.8
  projects/clang-trunk/sbin/ggate/ggatel/ggatel.c
  projects/clang-trunk/sbin/newfs/newfs.8
  projects/clang-trunk/sbin/pfctl/pfctl.c
  projects/clang-trunk/share/man/man4/Makefile
  projects/clang-trunk/share/man/man4/ctl.4
  projects/clang-trunk/share/man/man4/iscsi.4
  projects/clang-trunk/share/man/man4/proto.4
  projects/clang-trunk/share/man/man4/random.4
  projects/clang-trunk/share/man/man9/Makefile
  projects/clang-trunk/share/man/man9/crypto.9
  projects/clang-trunk/share/man/man9/nv.9
  projects/clang-trunk/share/man/man9/random.9
  projects/clang-trunk/share/man/man9/random_harvest.9
  projects/clang-trunk/sys/amd64/amd64/db_trace.c
  projects/clang-trunk/sys/amd64/amd64/machdep.c
  projects/clang-trunk/sys/amd64/amd64/stack_machdep.c
  projects/clang-trunk/sys/amd64/conf/GENERIC
  projects/clang-trunk/sys/amd64/conf/NOTES
  projects/clang-trunk/sys/arm/allwinner/a10_gpio.c
  projects/clang-trunk/sys/arm/arm/machdep.c
  projects/clang-trunk/sys/arm/arm/trap-v6.c
  projects/clang-trunk/sys/arm/at91/at91_machdep.c
  projects/clang-trunk/sys/arm/cavium/cns11xx/econa_machdep.c
  projects/clang-trunk/sys/arm/conf/BEAGLEBONE
  projects/clang-trunk/sys/arm/conf/NOTES
  projects/clang-trunk/sys/arm/conf/std.armv6
  projects/clang-trunk/sys/arm/include/atomic.h
  projects/clang-trunk/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
  projects/clang-trunk/sys/arm/xscale/i80321/ep80219_machdep.c
  projects/clang-trunk/sys/arm/xscale/i80321/iq31244_machdep.c
  projects/clang-trunk/sys/arm/xscale/i8134x/crb_machdep.c
  projects/clang-trunk/sys/arm/xscale/ixp425/avila_machdep.c
  projects/clang-trunk/sys/arm/xscale/pxa/pxa_machdep.c
  projects/clang-trunk/sys/arm64/arm64/cpufunc_asm.S
  projects/clang-trunk/sys/arm64/arm64/gic_fdt.c
  projects/clang-trunk/sys/arm64/arm64/gic_v3_its.c
  projects/clang-trunk/sys/arm64/arm64/gic_v3_var.h
  projects/clang-trunk/sys/arm64/arm64/intr_machdep.c
  projects/clang-trunk/sys/arm64/arm64/locore.S
  projects/clang-trunk/sys/arm64/arm64/mp_machdep.c
  projects/clang-trunk/sys/arm64/arm64/pmap.c
  projects/clang-trunk/sys/arm64/arm64/swtch.S
  projects/clang-trunk/sys/arm64/conf/GENERIC
  projects/clang-trunk/sys/arm64/include/armreg.h
  projects/clang-trunk/sys/arm64/include/cpu.h
  projects/clang-trunk/sys/arm64/include/pci_cfgreg.h
  projects/clang-trunk/sys/arm64/include/pte.h
  projects/clang-trunk/sys/arm64/include/vmparam.h
  projects/clang-trunk/sys/boot/arm/ixp425/boot2/arm_init.S
  projects/clang-trunk/sys/boot/arm/ixp425/boot2/ixp425_board.c
  projects/clang-trunk/sys/boot/arm/ixp425/boot2/lib.h
  projects/clang-trunk/sys/cam/ctl/ctl_backend_block.c
  projects/clang-trunk/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c
  projects/clang-trunk/sys/cddl/compat/opensolaris/sys/proc.h
  projects/clang-trunk/sys/cddl/compat/opensolaris/sys/vnode.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c
  projects/clang-trunk/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
  projects/clang-trunk/sys/cddl/dev/dtrace/i386/dtrace_isa.c
  projects/clang-trunk/sys/cddl/dev/fbt/fbt.c
  projects/clang-trunk/sys/cddl/dev/sdt/sdt.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_clock.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_fd.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_file.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_mem.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_proc.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_random.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_sock.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_thread.c
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_fd.c
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_proto.h
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_syscall.h
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_syscalls.c
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_sysent.c
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_systrace_args.c
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_thread.c
  projects/clang-trunk/sys/compat/cloudabi64/syscalls.master
  projects/clang-trunk/sys/compat/freebsd32/freebsd32_syscall.h
  projects/clang-trunk/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/clang-trunk/sys/compat/freebsd32/freebsd32_sysent.c
  projects/clang-trunk/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/clang-trunk/sys/compat/freebsd32/syscalls.master
  projects/clang-trunk/sys/compat/linprocfs/linprocfs.c
  projects/clang-trunk/sys/compat/linsysfs/linsysfs.c
  projects/clang-trunk/sys/compat/linux/linux_fork.c
  projects/clang-trunk/sys/compat/linux/linux_misc.c
  projects/clang-trunk/sys/compat/ndis/subr_ndis.c
  projects/clang-trunk/sys/compat/svr4/svr4_misc.c
  projects/clang-trunk/sys/conf/NOTES
  projects/clang-trunk/sys/conf/files
  projects/clang-trunk/sys/conf/files.amd64
  projects/clang-trunk/sys/conf/files.arm64
  projects/clang-trunk/sys/contrib/cloudabi/syscalldefs_md.h
  projects/clang-trunk/sys/contrib/cloudabi/syscalldefs_mi.h
  projects/clang-trunk/sys/crypto/sha2/sha256.h
  projects/clang-trunk/sys/crypto/sha2/sha256c.c
  projects/clang-trunk/sys/ddb/db_examine.c
  projects/clang-trunk/sys/ddb/db_main.c
  projects/clang-trunk/sys/ddb/db_print.c
  projects/clang-trunk/sys/ddb/db_ps.c
  projects/clang-trunk/sys/ddb/db_sym.c
  projects/clang-trunk/sys/dev/ahci/ahci.c
  projects/clang-trunk/sys/dev/ahci/ahci.h
  projects/clang-trunk/sys/dev/ahci/ahci_pci.c
  projects/clang-trunk/sys/dev/bwn/if_bwn.c
  projects/clang-trunk/sys/dev/cxgbe/adapter.h
  projects/clang-trunk/sys/dev/cxgbe/common/t4_hw.c
  projects/clang-trunk/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt
  projects/clang-trunk/sys/dev/cxgbe/firmware/t4fw_interface.h
  projects/clang-trunk/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
  projects/clang-trunk/sys/dev/cxgbe/t4_main.c
  projects/clang-trunk/sys/dev/cxgbe/t4_netmap.c
  projects/clang-trunk/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/clang-trunk/sys/dev/e1000/e1000_regs.h
  projects/clang-trunk/sys/dev/e1000/if_em.c
  projects/clang-trunk/sys/dev/e1000/if_igb.c
  projects/clang-trunk/sys/dev/e1000/if_lem.c
  projects/clang-trunk/sys/dev/gpio/gpiobus.c
  projects/clang-trunk/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/clang-trunk/sys/dev/ichwd/ichwd.c
  projects/clang-trunk/sys/dev/isp/isp.c
  projects/clang-trunk/sys/dev/isp/isp_freebsd.c
  projects/clang-trunk/sys/dev/isp/isp_library.c
  projects/clang-trunk/sys/dev/isp/isp_library.h
  projects/clang-trunk/sys/dev/isp/isp_target.h
  projects/clang-trunk/sys/dev/isp/ispvar.h
  projects/clang-trunk/sys/dev/ixgbe/if_ix.c
  projects/clang-trunk/sys/dev/ixgbe/if_ixv.c
  projects/clang-trunk/sys/dev/ixgbe/ix_txrx.c
  projects/clang-trunk/sys/dev/ixgbe/ixgbe.h
  projects/clang-trunk/sys/dev/ixgbe/ixgbe_vf.c
  projects/clang-trunk/sys/dev/ixl/if_ixl.c
  projects/clang-trunk/sys/dev/mmc/mmc.c
  projects/clang-trunk/sys/dev/netmap/if_em_netmap.h
  projects/clang-trunk/sys/dev/netmap/if_igb_netmap.h
  projects/clang-trunk/sys/dev/netmap/if_ixl_netmap.h
  projects/clang-trunk/sys/dev/netmap/if_lem_netmap.h
  projects/clang-trunk/sys/dev/netmap/if_re_netmap.h
  projects/clang-trunk/sys/dev/netmap/if_vtnet_netmap.h
  projects/clang-trunk/sys/dev/netmap/ixgbe_netmap.h
  projects/clang-trunk/sys/dev/netmap/netmap.c
  projects/clang-trunk/sys/dev/netmap/netmap_freebsd.c
  projects/clang-trunk/sys/dev/netmap/netmap_generic.c
  projects/clang-trunk/sys/dev/netmap/netmap_kern.h
  projects/clang-trunk/sys/dev/netmap/netmap_mem2.c
  projects/clang-trunk/sys/dev/netmap/netmap_mem2.h
  projects/clang-trunk/sys/dev/netmap/netmap_monitor.c
  projects/clang-trunk/sys/dev/netmap/netmap_pipe.c
  projects/clang-trunk/sys/dev/netmap/netmap_vale.c
  projects/clang-trunk/sys/dev/nvd/nvd.c
  projects/clang-trunk/sys/dev/ofw/ofw_bus_subr.c
  projects/clang-trunk/sys/dev/pci/pcireg.h
  projects/clang-trunk/sys/dev/proto/proto.h
  projects/clang-trunk/sys/dev/proto/proto_bus_isa.c
  projects/clang-trunk/sys/dev/proto/proto_bus_pci.c
  projects/clang-trunk/sys/dev/proto/proto_core.c
  projects/clang-trunk/sys/dev/random/build.sh
  projects/clang-trunk/sys/dev/random/fortuna.c
  projects/clang-trunk/sys/dev/random/hash.h
  projects/clang-trunk/sys/dev/random/random_harvestq.c
  projects/clang-trunk/sys/dev/random/randomdev.c
  projects/clang-trunk/sys/dev/random/randomdev.h
  projects/clang-trunk/sys/dev/random/unit_test.c
  projects/clang-trunk/sys/dev/random/unit_test.h
  projects/clang-trunk/sys/dev/random/yarrow.c
  projects/clang-trunk/sys/dev/re/if_re.c
  projects/clang-trunk/sys/dev/sound/pci/hda/hdaa_patches.c
  projects/clang-trunk/sys/dev/uart/uart_core.c
  projects/clang-trunk/sys/dev/usb/controller/dwc_otg.c
  projects/clang-trunk/sys/dev/usb/controller/dwc_otg.h
  projects/clang-trunk/sys/dev/usb/controller/dwc_otgreg.h
  projects/clang-trunk/sys/dev/virtio/network/if_vtnet.c
  projects/clang-trunk/sys/dev/vt/vt.h
  projects/clang-trunk/sys/dev/vt/vt_core.c
  projects/clang-trunk/sys/dev/xen/blkback/blkback.c
  projects/clang-trunk/sys/fs/procfs/procfs_ctl.c
  projects/clang-trunk/sys/fs/procfs/procfs_ioctl.c
  projects/clang-trunk/sys/geom/eli/g_eli.c
  projects/clang-trunk/sys/geom/part/g_part_gpt.c
  projects/clang-trunk/sys/i386/conf/GENERIC
  projects/clang-trunk/sys/i386/conf/NOTES
  projects/clang-trunk/sys/i386/i386/db_trace.c
  projects/clang-trunk/sys/i386/i386/machdep.c
  projects/clang-trunk/sys/i386/i386/mp_machdep.c
  projects/clang-trunk/sys/i386/i386/stack_machdep.c
  projects/clang-trunk/sys/i386/include/frame.h
  projects/clang-trunk/sys/i386/include/smp.h
  projects/clang-trunk/sys/i386/isa/npx.c
  projects/clang-trunk/sys/kern/imgact_elf.c
  projects/clang-trunk/sys/kern/init_main.c
  projects/clang-trunk/sys/kern/init_sysent.c
  projects/clang-trunk/sys/kern/kern_clocksource.c
  projects/clang-trunk/sys/kern/kern_descrip.c
  projects/clang-trunk/sys/kern/kern_event.c
  projects/clang-trunk/sys/kern/kern_exec.c
  projects/clang-trunk/sys/kern/kern_exit.c
  projects/clang-trunk/sys/kern/kern_fork.c
  projects/clang-trunk/sys/kern/kern_intr.c
  projects/clang-trunk/sys/kern/kern_jail.c
  projects/clang-trunk/sys/kern/kern_kthread.c
  projects/clang-trunk/sys/kern/kern_lockstat.c
  projects/clang-trunk/sys/kern/kern_mutex.c
  projects/clang-trunk/sys/kern/kern_ntptime.c
  projects/clang-trunk/sys/kern/kern_proc.c
  projects/clang-trunk/sys/kern/kern_prot.c
  projects/clang-trunk/sys/kern/kern_resource.c
  projects/clang-trunk/sys/kern/kern_rwlock.c
  projects/clang-trunk/sys/kern/kern_sig.c
  projects/clang-trunk/sys/kern/kern_sx.c
  projects/clang-trunk/sys/kern/kern_thr.c
  projects/clang-trunk/sys/kern/kern_thread.c
  projects/clang-trunk/sys/kern/sched_ule.c
  projects/clang-trunk/sys/kern/subr_firmware.c
  projects/clang-trunk/sys/kern/subr_smp.c
  projects/clang-trunk/sys/kern/subr_trap.c
  projects/clang-trunk/sys/kern/sys_pipe.c
  projects/clang-trunk/sys/kern/sys_procdesc.c
  projects/clang-trunk/sys/kern/sys_process.c
  projects/clang-trunk/sys/kern/syscalls.c
  projects/clang-trunk/sys/kern/syscalls.master
  projects/clang-trunk/sys/kern/systrace_args.c
  projects/clang-trunk/sys/kern/uipc_debug.c
  projects/clang-trunk/sys/kern/uipc_socket.c
  projects/clang-trunk/sys/kern/uipc_usrreq.c
  projects/clang-trunk/sys/kern/vfs_bio.c
  projects/clang-trunk/sys/kern/vfs_cache.c
  projects/clang-trunk/sys/kern/vfs_hash.c
  projects/clang-trunk/sys/kern/vfs_subr.c
  projects/clang-trunk/sys/kern/vfs_syscalls.c
  projects/clang-trunk/sys/mips/atheros/ar71xx_machdep.c
  projects/clang-trunk/sys/modules/Makefile
  projects/clang-trunk/sys/modules/cxgbe/t4_firmware/Makefile
  projects/clang-trunk/sys/modules/cxgbe/t5_firmware/Makefile
  projects/clang-trunk/sys/modules/dtrace/Makefile
  projects/clang-trunk/sys/modules/dtrace/Makefile.inc
  projects/clang-trunk/sys/modules/dtrace/dtraceall/dtraceall.c
  projects/clang-trunk/sys/net/if.c
  projects/clang-trunk/sys/net/if_tun.c
  projects/clang-trunk/sys/net/netmap.h
  projects/clang-trunk/sys/net/netmap_user.h
  projects/clang-trunk/sys/netgraph/ng_iface.c
  projects/clang-trunk/sys/netinet/ip.h
  projects/clang-trunk/sys/netinet/ip_var.h
  projects/clang-trunk/sys/netinet/sctp_indata.c
  projects/clang-trunk/sys/netinet/sctp_input.c
  projects/clang-trunk/sys/netinet/sctp_output.c
  projects/clang-trunk/sys/netinet/sctp_output.h
  projects/clang-trunk/sys/netinet/sctp_structs.h
  projects/clang-trunk/sys/netinet/sctp_usrreq.c
  projects/clang-trunk/sys/netinet/sctputil.c
  projects/clang-trunk/sys/netinet/tcp_input.c
  projects/clang-trunk/sys/netinet/tcp_output.c
  projects/clang-trunk/sys/netinet/udp_usrreq.c
  projects/clang-trunk/sys/netinet6/in6.c
  projects/clang-trunk/sys/netinet6/nd6.c
  projects/clang-trunk/sys/netinet6/udp6_usrreq.c
  projects/clang-trunk/sys/netipsec/ipsec.h
  projects/clang-trunk/sys/netipsec/ipsec_input.c
  projects/clang-trunk/sys/netipsec/xform_esp.c
  projects/clang-trunk/sys/netpfil/ipfw/dn_heap.c
  projects/clang-trunk/sys/netpfil/ipfw/dn_sched_qfq.c
  projects/clang-trunk/sys/netpfil/ipfw/ip_dn_io.c
  projects/clang-trunk/sys/netpfil/ipfw/ip_fw2.c
  projects/clang-trunk/sys/netpfil/ipfw/ip_fw_private.h
  projects/clang-trunk/sys/netpfil/ipfw/test/dn_test.h
  projects/clang-trunk/sys/netpfil/ipfw/test/main.c
  projects/clang-trunk/sys/opencrypto/cryptodev.h
  projects/clang-trunk/sys/opencrypto/xform.c
  projects/clang-trunk/sys/pc98/conf/GENERIC
  projects/clang-trunk/sys/powerpc/aim/trap_subr64.S
  projects/clang-trunk/sys/powerpc/booke/pmap.c
  projects/clang-trunk/sys/powerpc/conf/GENERIC
  projects/clang-trunk/sys/powerpc/conf/NOTES
  projects/clang-trunk/sys/powerpc/include/cpu.h
  projects/clang-trunk/sys/sparc64/conf/GENERIC
  projects/clang-trunk/sys/sparc64/sparc64/exception.S
  projects/clang-trunk/sys/sparc64/sparc64/stack_machdep.c
  projects/clang-trunk/sys/sparc64/sparc64/support.S
  projects/clang-trunk/sys/sys/domain.h
  projects/clang-trunk/sys/sys/filedesc.h
  projects/clang-trunk/sys/sys/imgact.h
  projects/clang-trunk/sys/sys/jail.h
  projects/clang-trunk/sys/sys/lockmgr.h
  projects/clang-trunk/sys/sys/lockstat.h
  projects/clang-trunk/sys/sys/mutex.h
  projects/clang-trunk/sys/sys/proc.h
  projects/clang-trunk/sys/sys/random.h
  projects/clang-trunk/sys/sys/resourcevar.h
  projects/clang-trunk/sys/sys/rwlock.h
  projects/clang-trunk/sys/sys/sx.h
  projects/clang-trunk/sys/sys/syscall.h
  projects/clang-trunk/sys/sys/syscall.mk
  projects/clang-trunk/sys/sys/syscallsubr.h
  projects/clang-trunk/sys/sys/sysent.h
  projects/clang-trunk/sys/sys/sysproto.h
  projects/clang-trunk/sys/sys/ucred.h
  projects/clang-trunk/sys/sys/unpcb.h
  projects/clang-trunk/sys/sys/vnode.h
  projects/clang-trunk/sys/sys/wait.h
  projects/clang-trunk/sys/ufs/ffs/ffs_alloc.c
  projects/clang-trunk/sys/vm/vm_phys.c
  projects/clang-trunk/sys/vm/vm_phys.h
  projects/clang-trunk/sys/x86/iommu/intel_idpgtbl.c
  projects/clang-trunk/sys/x86/x86/local_apic.c
  projects/clang-trunk/sys/x86/xen/pv.c
  projects/clang-trunk/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang-trunk/tools/regression/lib/libc/nss/test-getaddr.c
  projects/clang-trunk/usr.bin/Makefile
  projects/clang-trunk/usr.bin/c99/c99.1
  projects/clang-trunk/usr.bin/calendar/io.c
  projects/clang-trunk/usr.bin/last/last.c
  projects/clang-trunk/usr.bin/ministat/ministat.c
  projects/clang-trunk/usr.bin/netstat/main.c
  projects/clang-trunk/usr.bin/netstat/pfkey.c
  projects/clang-trunk/usr.bin/patch/backupfile.c
  projects/clang-trunk/usr.bin/patch/patch.1
  projects/clang-trunk/usr.bin/patch/patch.c
  projects/clang-trunk/usr.bin/rctl/rctl.8
  projects/clang-trunk/usr.bin/sockstat/sockstat.1
  projects/clang-trunk/usr.bin/sockstat/sockstat.c
  projects/clang-trunk/usr.bin/w/w.c
  projects/clang-trunk/usr.bin/xargs/xargs.c
  projects/clang-trunk/usr.sbin/bsdinstall/partedit/gpart_ops.c
  projects/clang-trunk/usr.sbin/bsdinstall/partedit/part_wizard.c
  projects/clang-trunk/usr.sbin/bsdinstall/partedit/partedit.c
  projects/clang-trunk/usr.sbin/bsdinstall/partedit/partedit.h
  projects/clang-trunk/usr.sbin/bsdinstall/scripts/auto
  projects/clang-trunk/usr.sbin/bsdinstall/scripts/zfsboot
  projects/clang-trunk/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c
  projects/clang-trunk/usr.sbin/ctladm/ctladm.c
  projects/clang-trunk/usr.sbin/devctl/devctl.8
  projects/clang-trunk/usr.sbin/fstyp/fstyp.8
  projects/clang-trunk/usr.sbin/fstyp/geli.c
  projects/clang-trunk/usr.sbin/fstyp/zfs.c
  projects/clang-trunk/usr.sbin/jail/jail.8
  projects/clang-trunk/usr.sbin/jexec/jexec.8
  projects/clang-trunk/usr.sbin/jexec/jexec.c
  projects/clang-trunk/usr.sbin/ntp/config.h
  projects/clang-trunk/usr.sbin/ntp/scripts/mkver
  projects/clang-trunk/usr.sbin/pw/Makefile
  projects/clang-trunk/usr.sbin/pw/cpdir.c
  projects/clang-trunk/usr.sbin/pw/pw.c
  projects/clang-trunk/usr.sbin/pw/pw.h
  projects/clang-trunk/usr.sbin/pw/pw_conf.c
  projects/clang-trunk/usr.sbin/pw/pw_group.c
  projects/clang-trunk/usr.sbin/pw/pw_user.c
  projects/clang-trunk/usr.sbin/pw/pwupd.h
  projects/clang-trunk/usr.sbin/pw/rm_r.c
  projects/clang-trunk/usr.sbin/pw/tests/helper_functions.shin
  projects/clang-trunk/usr.sbin/pw/tests/pw_groupmod.sh
  projects/clang-trunk/usr.sbin/pw/tests/pw_useradd.sh
  projects/clang-trunk/usr.sbin/pw/tests/pw_userdel.sh
  projects/clang-trunk/usr.sbin/uefisign/uefisign.8
  projects/clang-trunk/usr.sbin/ypbind/ypbind.c
Directory Properties:
  projects/clang-trunk/   (props changed)
  projects/clang-trunk/cddl/   (props changed)
  projects/clang-trunk/cddl/contrib/opensolaris/   (props changed)
  projects/clang-trunk/contrib/sqlite3/   (props changed)
  projects/clang-trunk/crypto/openssh/   (props changed)
  projects/clang-trunk/etc/   (props changed)
  projects/clang-trunk/gnu/lib/   (props changed)
  projects/clang-trunk/lib/libc/   (props changed)
  projects/clang-trunk/sbin/   (props changed)
  projects/clang-trunk/share/   (props changed)
  projects/clang-trunk/share/man/man4/   (props changed)
  projects/clang-trunk/sys/   (props changed)
  projects/clang-trunk/sys/boot/   (props changed)
  projects/clang-trunk/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang-trunk/sys/conf/   (props changed)
  projects/clang-trunk/sys/dev/hyperv/   (props changed)
  projects/clang-trunk/usr.bin/calendar/   (props changed)
  projects/clang-trunk/usr.sbin/jail/   (props changed)

Modified: projects/clang-trunk/ObsoleteFiles.inc
==============================================================================
--- projects/clang-trunk/ObsoleteFiles.inc	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/ObsoleteFiles.inc	Wed Jul 22 19:55:32 2015	(r285802)
@@ -99,6 +99,8 @@ OLD_FILES+=usr/lib/clang/3.6.1/lib/freeb
 OLD_DIRS+=usr/lib/clang/3.6.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.6.1/lib
 OLD_DIRS+=usr/lib/clang/3.6.1
+# 20150719: Remove libarchive.pc
+OLD_FILES+=usr/libdata/pkgconfig/libarchive.pc
 # 20150705: Rename DTrace provider man pages.
 OLD_FILES+=usr/share/man/man4/dtrace-io.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-ip.4.gz

Modified: projects/clang-trunk/UPDATING
==============================================================================
--- projects/clang-trunk/UPDATING	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/UPDATING	Wed Jul 22 19:55:32 2015	(r285802)
@@ -92,7 +92,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 20150616:
 	FreeBSD's old make (fmake) has been removed from the system. It is
 	available as the devel/fmake port or via pkg install fmake.
-	
+
 20150615:
 	The fix for the issue described in the 20150614 sendmail entry
 	below has been been committed in revision 284436.  The work
@@ -115,7 +115,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	this interoperability, sendmail can be configured to use a
 	2048 bit DH parameter by:
 
-	1. Edit /etc/mail/`hostname`.mc 
+	1. Edit /etc/mail/`hostname`.mc
 	2. If a setting for confDH_PARAMETERS does not exist or
 	   exists and is set to a string beginning with '5',
 	   replace it with '2'.
@@ -228,7 +228,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	using a local socket.  Users who have already enabled the
 	local_unbound service should regenerate their configuration
 	by running "service local_unbound setup" as root.
-	
+
 20150102:
 	The GNU texinfo and GNU info pages have been removed.
 	To be able to view GNU info pages please install texinfo from ports.
@@ -619,7 +619,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	The GNU Compiler Collection and C++ standard library (libstdc++)
 	are no longer built by default on platforms where clang is the system
 	compiler.  You can enable them with the WITH_GCC and WITH_GNUCXX
-	options in src.conf.  
+	options in src.conf.
 
 20130905:
 	The PROCDESC kernel option is now part of the GENERIC kernel
@@ -973,7 +973,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 20120727:
 	The sparc64 ZFS loader has been changed to no longer try to auto-
 	detect ZFS providers based on diskN aliases but now requires these
-	to be explicitly listed in the OFW boot-device environment variable. 
+	to be explicitly listed in the OFW boot-device environment variable.
 
 20120712:
 	The OpenSSL has been upgraded to 1.0.1c.  Any binaries requiring

Modified: projects/clang-trunk/bin/dd/dd.1
==============================================================================
--- projects/clang-trunk/bin/dd/dd.1	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/bin/dd/dd.1	Wed Jul 22 19:55:32 2015	(r285802)
@@ -416,6 +416,7 @@ if necessary, to a 1MiB boundary:
 .Sh SEE ALSO
 .Xr cp 1 ,
 .Xr mt 1 ,
+.Xr recoverdisk 1 ,
 .Xr tr 1 ,
 .Xr geom 4
 .Sh STANDARDS

Modified: projects/clang-trunk/bin/ls/Makefile
==============================================================================
--- projects/clang-trunk/bin/ls/Makefile	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/bin/ls/Makefile	Wed Jul 22 19:55:32 2015	(r285802)
@@ -5,12 +5,12 @@
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
-LIBADD=	util
+LIBADD=	util xo
 
 .if !defined(RELEASE_CRUNCH) && \
 	${MK_LS_COLORS} != no
 CFLAGS+= -DCOLORLS
-LIBADD+=	termcapw xo
+LIBADD+=	termcapw
 .endif
 
 .include <bsd.prog.mk>

Modified: projects/clang-trunk/bin/ls/ls.c
==============================================================================
--- projects/clang-trunk/bin/ls/ls.c	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/bin/ls/ls.c	Wed Jul 22 19:55:32 2015	(r285802)
@@ -119,7 +119,7 @@ static int f_nofollow;		/* don't follow 
        int f_nonprint;		/* show unprintables as ? */
 static int f_nosort;		/* don't sort output */
        int f_notabs;		/* don't use tab-separated multi-col output */
-static int f_numericonly;	/* don't convert uid/gid to name */
+       int f_numericonly;	/* don't convert uid/gid to name */
        int f_octal;		/* show unprintables as \xxx */
        int f_octal_escape;	/* like f_octal but use C escapes if possible */
 static int f_recursive;		/* ls subdirectories also */
@@ -158,6 +158,7 @@ main(int argc, char *argv[])
 	struct winsize win;
 	int ch, fts_options, notused;
 	char *p;
+	const char *errstr = NULL;
 #ifdef COLORLS
 	char termcapbuf[1024];	/* termcap definition buffer */
 	char tcapbuf[512];	/* capability buffer */
@@ -170,7 +171,7 @@ main(int argc, char *argv[])
 	if (isatty(STDOUT_FILENO)) {
 		termwidth = 80;
 		if ((p = getenv("COLUMNS")) != NULL && *p != '\0')
-			termwidth = atoi(p);
+			termwidth = strtonum(p, 0, INT_MAX, &errstr);
 		else if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) != -1 &&
 		    win.ws_col > 0)
 			termwidth = win.ws_col;
@@ -180,9 +181,12 @@ main(int argc, char *argv[])
 		/* retrieve environment variable, in case of explicit -C */
 		p = getenv("COLUMNS");
 		if (p)
-			termwidth = atoi(p);
+			termwidth = strtonum(p, 0, INT_MAX, &errstr);
 	}
 
+	if (errstr)
+		termwidth = 80;
+
 	fts_options = FTS_PHYSICAL;
 	if (getenv("LS_SAMESORT"))
 		f_samesort = 1;
@@ -191,6 +195,7 @@ main(int argc, char *argv[])
 	if (argc < 0)
 		return (1);
 	xo_set_flags(NULL, XOF_COLUMNS);
+	xo_set_version(LS_XO_VERSION);
 
 	while ((ch = getopt(argc, argv,
 	    "1ABCD:FGHILPRSTUWXZabcdfghiklmnopqrstuwxy,")) != -1) {

Modified: projects/clang-trunk/bin/ls/ls.h
==============================================================================
--- projects/clang-trunk/bin/ls/ls.h	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/bin/ls/ls.h	Wed Jul 22 19:55:32 2015	(r285802)
@@ -37,6 +37,8 @@
 
 #define HUMANVALSTR_LEN	5
 
+#define LS_XO_VERSION	"1"
+
 extern long blocksize;		/* block size units */
 
 extern int f_accesstime;	/* use time of last access */
@@ -58,6 +60,7 @@ extern int f_statustime;	/* use time of 
 extern int f_thousands;		/* show file sizes with thousands separators */
 extern char *f_timeformat;	/* user-specified time format */
 extern int f_notabs;		/* don't use tab-separated multi-col output */
+extern int f_numericonly;	/* don't convert uid/gid to name */
 extern int f_type;		/* add type character for non-regular files */
 #ifdef COLORLS
 extern int f_color;		/* add type in color for non-regular files */

Modified: projects/clang-trunk/bin/ls/print.c
==============================================================================
--- projects/clang-trunk/bin/ls/print.c	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/bin/ls/print.c	Wed Jul 22 19:55:32 2015	(r285802)
@@ -171,7 +171,7 @@ printlong(const DISPLAY *dp)
 
 	xo_open_list("entry");
 	for (p = dp->list; p; p = p->fts_link) {
-		char *name;
+		char *name, *type;
 		if (IS_NOPRINT(p))
 			continue;
 		xo_open_instance("entry");
@@ -180,22 +180,46 @@ printlong(const DISPLAY *dp)
 		if (name)
 		    xo_emit("{ke:name/%hs}", name);
 		if (f_inode)
-			xo_emit("{:inode/%*ju} ",
+			xo_emit("{t:inode/%*ju} ",
 			    dp->s_inode, (uintmax_t)sp->st_ino);
 		if (f_size)
-			xo_emit("{:blocks/%*jd} ",
+			xo_emit("{t:blocks/%*jd} ",
 			    dp->s_block, howmany(sp->st_blocks, blocksize));
 		strmode(sp->st_mode, buf);
 		aclmode(buf, p);
 		np = p->fts_pointer;
 		xo_attr("value", "%03o", (int) sp->st_mode & ALLPERMS);
-		xo_emit("{t:mode/%s} {:links/%*u} {:user/%-*s}  {:group/%-*s}  ",
-			buf, dp->s_nlink, sp->st_nlink,
-			dp->s_user, np->user, dp->s_group, np->group);
+		if (f_numericonly) {
+			xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*u} {td:user/%-*s}{e:user/%ju}  {td:group/%-*s}{e:group/%ju}  ",
+				buf, (int) sp->st_mode & ALLPERMS, dp->s_nlink, sp->st_nlink,
+				dp->s_user, np->user, sp->st_uid, dp->s_group, np->group, sp->st_gid);
+		} else {
+			xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*u} {t:user/%-*s}  {t:group/%-*s}  ",
+				buf, (int) sp->st_mode & ALLPERMS, dp->s_nlink, sp->st_nlink,
+				dp->s_user, np->user, dp->s_group, np->group);
+		}
+		if (S_ISBLK(sp->st_mode))
+			asprintf(&type, "block");
+		if (S_ISCHR(sp->st_mode))
+			asprintf(&type, "character");
+		if (S_ISDIR(sp->st_mode))
+			asprintf(&type, "directory");
+		if (S_ISFIFO(sp->st_mode))
+			asprintf(&type, "fifo");
+		if (S_ISLNK(sp->st_mode))
+			asprintf(&type, "symlink");
+		if (S_ISREG(sp->st_mode))
+			asprintf(&type, "regular");
+		if (S_ISSOCK(sp->st_mode))
+			asprintf(&type, "socket");
+		if (S_ISWHT(sp->st_mode))
+			asprintf(&type, "whiteout");
+		xo_emit("{e:type/%s}", type);
+		free(type);
 		if (f_flags)
 			xo_emit("{:flags/%-*s} ", dp->s_flags, np->flags);
 		if (f_label)
-			xo_emit("{:label/%-*s} ", dp->s_label, np->label);
+			xo_emit("{t:label/%-*s} ", dp->s_label, np->label);
 		if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode))
 			printdev(dp->s_size, sp->st_rdev);
 		else
@@ -238,6 +262,7 @@ printstream(const DISPLAY *dp)
 	FTSENT *p;
 	int chcnt;
 
+	xo_open_list("entry");
 	for (p = dp->list, chcnt = 0; p; p = p->fts_link) {
 		if (p->fts_number == NO_PRINT)
 			continue;
@@ -247,12 +272,15 @@ printstream(const DISPLAY *dp)
 			xo_emit("\n");
 			chcnt = 0;
 		}
+		xo_open_instance("file");
 		chcnt += printaname(p, dp->s_inode, dp->s_block);
+		xo_close_instance("file");
 		if (p->fts_link) {
 			xo_emit(", ");
 			chcnt += 2;
 		}
 	}
+	xo_close_list("entry");
 	if (chcnt)
 		xo_emit("\n");
 }
@@ -369,10 +397,10 @@ printaname(const FTSENT *p, u_long inode
 	sp = p->fts_statp;
 	chcnt = 0;
 	if (f_inode)
-		chcnt += xo_emit("{:inode/%*ju} ",
+		chcnt += xo_emit("{t:inode/%*ju} ",
 		    (int)inodefield, (uintmax_t)sp->st_ino);
 	if (f_size)
-		chcnt += xo_emit("{:size/%*jd} ",
+		chcnt += xo_emit("{t:size/%*jd} ",
 		    (int)sizefield, howmany(sp->st_blocks, blocksize));
 #ifdef COLORLS
 	if (f_color)
@@ -425,9 +453,11 @@ printtime(const char *field, time_t ftim
 		format = d_first ? "%e %b  %Y" : "%b %e  %Y";
 	strftime(longstring, sizeof(longstring), format, localtime(&ftime));
 
-	snprintf(fmt, sizeof(fmt), "{:%s/%%hs} ", field);
+	snprintf(fmt, sizeof(fmt), "{d:%s/%%hs} ", field);
 	xo_attr("value", "%ld", (long) ftime);
 	xo_emit(fmt, longstring);
+	snprintf(fmt, sizeof(fmt), "{en:%s/%%ld} ", field);
+	xo_emit(fmt, (long) ftime);
 }
 
 static int

Modified: projects/clang-trunk/bin/ps/ps.1
==============================================================================
--- projects/clang-trunk/bin/ps/ps.1	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/bin/ps/ps.1	Wed Jul 22 19:55:32 2015	(r285802)
@@ -738,9 +738,9 @@ Display information on all system proces
 .Xr procstat 1 ,
 .Xr w 1 ,
 .Xr kvm 3 ,
-.Xr libxo 3
+.Xr libxo 3 ,
 .Xr strftime 3 ,
-.Xr xo_parse_args 3
+.Xr xo_parse_args 3 ,
 .Xr mac 4 ,
 .Xr procfs 5 ,
 .Xr pstat 8 ,

Modified: projects/clang-trunk/bin/sh/sh.1
==============================================================================
--- projects/clang-trunk/bin/sh/sh.1	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/bin/sh/sh.1	Wed Jul 22 19:55:32 2015	(r285802)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd April 18, 2015
+.Dd July 11, 2015
 .Dt SH 1
 .Os
 .Sh NAME
@@ -2846,6 +2846,4 @@ The
 utility does not recognize multibyte characters other than UTF-8.
 Splitting using
 .Va IFS
-and the line editing library
-.Xr editline 3
-do not recognize multibyte characters.
+does not recognize multibyte characters.

Modified: projects/clang-trunk/bin/stty/stty.c
==============================================================================
--- projects/clang-trunk/bin/stty/stty.c	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/bin/stty/stty.c	Wed Jul 22 19:55:32 2015	(r285802)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -61,7 +62,7 @@ main(int argc, char *argv[])
 	struct info i;
 	enum FMT fmt;
 	int ch;
-	const char *file;
+	const char *file, *errstr = NULL;
 
 	fmt = NOTSET;
 	i.fd = STDIN_FILENO;
@@ -130,7 +131,9 @@ args:	argc -= optind;
 		if (isdigit(**argv)) {
 			speed_t speed;
 
-			speed = atoi(*argv);
+			speed = strtonum(*argv, 0, UINT_MAX, &errstr);
+			if (errstr)
+				err(1, "speed");
 			cfsetospeed(&i.t, speed);
 			cfsetispeed(&i.t, speed);
 			i.set = 1;

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c	Wed Jul 22 19:55:32 2015	(r285802)
@@ -196,17 +196,17 @@ static ls_event_info_t g_event_info[LS_M
 	    "lockstat:::spin-release", NULL,
 	    "lockstat:::spin-acquire" },
 	{ 'H',	"Lock",	"R/W writer hold",			"nsec",
-	    "lockstat::rw_wunlock:rw-release", NULL,
-	    "lockstat::rw_wlock:rw-acquire" },
+	    "lockstat:::rw-release", "arg1 == 0",
+	    "lockstat:::rw-acquire" },
 	{ 'H',	"Lock",	"R/W reader hold",			"nsec",
-	    "lockstat::rw_runlock:rw-release", NULL,
-	    "lockstat::rw_rlock:rw-acquire" },
+	    "lockstat:::rw-release", "arg1 == 1",
+	    "lockstat:::rw-acquire" },
 	{ 'H',	"Lock",	"SX shared hold",			"nsec",
-	    "lockstat::sx_sunlock:sx-release", NULL,
-	    "lockstat::sx_slock:sx-acquire" },
+	    "lockstat:::sx-release", "arg1 == 0",
+	    "lockstat:::sx-acquire" },
 	{ 'H',	"Lock",	"SX exclusive hold",			"nsec",
-	    "lockstat::sx_xunlock:sx-release", NULL,
-	    "lockstat::sx_xlock:sx-acquire" },
+	    "lockstat:::sx-release", "arg1 == 1",
+	    "lockstat:::sx-acquire" },
 	{ 'H',	"Lock",	"Unknown event (type 38)",		"units"	},
 	{ 'H',	"Lock",	"Unknown event (type 39)",		"units"	},
 	{ 'H',	"Lock",	"Unknown event (type 40)",		"units"	},

Modified: projects/clang-trunk/contrib/sqlite3/sqlite3.c
==============================================================================
--- projects/clang-trunk/contrib/sqlite3/sqlite3.c	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/contrib/sqlite3/sqlite3.c	Wed Jul 22 19:55:32 2015	(r285802)
@@ -49487,9 +49487,9 @@ static void walIndexWriteHdr(Wal *pWal){
   pWal->hdr.isInit = 1;
   pWal->hdr.iVersion = WALINDEX_MAX_VERSION;
   walChecksumBytes(1, (u8*)&pWal->hdr, nCksum, 0, pWal->hdr.aCksum);
-  memcpy((void *)&aHdr[1], (void *)&pWal->hdr, sizeof(WalIndexHdr));
+  memcpy((void *)&aHdr[1], (const void *)&pWal->hdr, sizeof(WalIndexHdr));
   walShmBarrier(pWal);
-  memcpy((void *)&aHdr[0], (void *)&pWal->hdr, sizeof(WalIndexHdr));
+  memcpy((void *)&aHdr[0], (const void *)&pWal->hdr, sizeof(WalIndexHdr));
 }
 
 /*

Modified: projects/clang-trunk/crypto/openssh/ssh.c
==============================================================================
--- projects/clang-trunk/crypto/openssh/ssh.c	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/crypto/openssh/ssh.c	Wed Jul 22 19:55:32 2015	(r285802)
@@ -1001,6 +1001,23 @@ main(int ac, char **av)
 	shorthost[strcspn(thishost, ".")] = '\0';
 	snprintf(portstr, sizeof(portstr), "%d", options.port);
 
+	/* Find canonic host name. */
+	if (strchr(host, '.') == 0) {
+		struct addrinfo hints;
+		struct addrinfo *ai = NULL;
+		int errgai;
+		memset(&hints, 0, sizeof(hints));
+		hints.ai_family = options.address_family;
+		hints.ai_flags = AI_CANONNAME;
+		hints.ai_socktype = SOCK_STREAM;
+		errgai = getaddrinfo(host, NULL, &hints, &ai);
+		if (errgai == 0) {
+			if (ai->ai_canonname != NULL)
+				host = xstrdup(ai->ai_canonname);
+			freeaddrinfo(ai);
+		}
+	}
+
 	if (options.local_command != NULL) {
 		debug3("expanding LocalCommand: %s", options.local_command);
 		cp = options.local_command;

Modified: projects/clang-trunk/etc/defaults/periodic.conf
==============================================================================
--- projects/clang-trunk/etc/defaults/periodic.conf	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/etc/defaults/periodic.conf	Wed Jul 22 19:55:32 2015	(r285802)
@@ -357,8 +357,12 @@ if [ -z "${source_periodic_confs_defined
 			*) return 0 ;;
 			esac
 			;;
+                '')
+                        # Script run manually.
+                        return 0
+                        ;;
 		*)
-			echo "ASSERTION FAILED: Unexpected value for " \
+			echo "ASSERTION FAILED: Unexpected value for" \
 			    "\$PERIODIC: '$PERIODIC'" >&2
 			exit 127
 			;;

Modified: projects/clang-trunk/etc/devd.conf
==============================================================================
--- projects/clang-trunk/etc/devd.conf	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/etc/devd.conf	Wed Jul 22 19:55:32 2015	(r285802)
@@ -296,7 +296,6 @@ detach 10 {
 # Button:          Button pressed (0 for power, 1 for sleep)
 # CMBAT:           ACPI battery events
 # Lid:             Lid state (0 is closed, 1 is open)
-# RCTL:            Resource limits
 # Suspend, Resume: Suspend and resume notification
 # Thermal:         ACPI thermal zone events
 #

Modified: projects/clang-trunk/gnu/lib/Makefile
==============================================================================
--- projects/clang-trunk/gnu/lib/Makefile	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/gnu/lib/Makefile	Wed Jul 22 19:55:32 2015	(r285802)
@@ -16,7 +16,7 @@ SUBDIR+= libssp
 SUBDIR+= tests
 .endif
 
-.if ${MK_GDB} != "no"
+.if ${MK_BINUTILS} != "no" && ${MK_GDB} != "no"
 SUBDIR+=	libreadline
 .endif
 

Modified: projects/clang-trunk/gnu/usr.bin/Makefile
==============================================================================
--- projects/clang-trunk/gnu/usr.bin/Makefile	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/gnu/usr.bin/Makefile	Wed Jul 22 19:55:32 2015	(r285802)
@@ -16,6 +16,8 @@ SUBDIR= ${_binutils} \
 	sdiff \
 	${_tests}
 
+SUBDIR_DEPEND_gdb= ${_binutils}
+
 .if ${MK_CXX} != "no"
 .if ${MK_GCC} != "no"
 _gperf=		gperf
@@ -39,13 +41,14 @@ _tests=		tests
 
 .if ${MK_BINUTILS} != "no"
 _binutils=	binutils
+.if ${MK_GDB} != "no"
+_gdb=		gdb
+.endif
 .endif
+
 .if ${MK_GCC} != "no"
 _cc=		cc
 .endif
-.if ${MK_GDB} != "no"
-_gdb=		gdb
-.endif
 
 SUBDIR_PARALLEL=
 

Modified: projects/clang-trunk/lib/libarchive/Makefile
==============================================================================
--- projects/clang-trunk/lib/libarchive/Makefile	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/lib/libarchive/Makefile	Wed Jul 22 19:55:32 2015	(r285802)
@@ -37,12 +37,6 @@ CFLAGS+=	-DPPMD_32BIT
 .endif
 NO_WCAST_ALIGN.clang=
 
-.ifndef COMPAT_32BIT
-beforeinstall:
-	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${.CURDIR}/libarchive.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-.endif
-
 .PATH: ${LIBARCHIVEDIR}/libarchive
 
 # Headers to be installed in /usr/include

Modified: projects/clang-trunk/lib/libc/aarch64/Symbol.map
==============================================================================
--- projects/clang-trunk/lib/libc/aarch64/Symbol.map	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/lib/libc/aarch64/Symbol.map	Wed Jul 22 19:55:32 2015	(r285802)
@@ -28,6 +28,7 @@ FBSD_1.0 {
 	vfork;
 	brk;
 	sbrk;
+	makecontext;
 };
 
 FBSDprivate_1.0 {
@@ -35,4 +36,5 @@ FBSDprivate_1.0 {
 	_end;
 	curbrk;
 	minbrk;
+	__makecontext;
 };

Modified: projects/clang-trunk/lib/libc/aarch64/gen/Makefile.inc
==============================================================================
--- projects/clang-trunk/lib/libc/aarch64/gen/Makefile.inc	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/lib/libc/aarch64/gen/Makefile.inc	Wed Jul 22 19:55:32 2015	(r285802)
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
-SRCS+=	fabs.S \
+SRCS+=	_ctx_start.S \
+	fabs.S \
 	flt_rounds.c \
 	fpgetmask.c \
 	fpsetmask.c \
 	ldexp.c \
+	makecontext.c \
 	_setjmp.S \
 	_set_tp.c \
 	setjmp.S \

Copied: projects/clang-trunk/lib/libc/aarch64/gen/_ctx_start.S (from r285792, head/lib/libc/aarch64/gen/_ctx_start.S)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang-trunk/lib/libc/aarch64/gen/_ctx_start.S	Wed Jul 22 19:55:32 2015	(r285802, copy of r285792, head/lib/libc/aarch64/gen/_ctx_start.S)
@@ -0,0 +1,38 @@
+/*-
+ * Copyright (c) 2015 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Andrew Turner under
+ * sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ */
+
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
+ENTRY(_ctx_start)
+	blr	x19		/* Call func from makecontext */
+	mov	x0, x20		/* Load ucp saved in makecontext */
+	bl	_C_LABEL(ctx_done)
+	bl	_C_LABEL(abort)
+END(_ctx_start)

Copied: projects/clang-trunk/lib/libc/aarch64/gen/makecontext.c (from r285792, head/lib/libc/aarch64/gen/makecontext.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang-trunk/lib/libc/aarch64/gen/makecontext.c	Wed Jul 22 19:55:32 2015	(r285802, copy of r285792, head/lib/libc/aarch64/gen/makecontext.c)
@@ -0,0 +1,86 @@
+/*-
+ * Copyright (c) 2015 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Andrew Turner under
+ * sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+
+#include <machine/armreg.h>
+
+#include <inttypes.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <ucontext.h>
+
+void _ctx_start(void);
+
+void
+ctx_done(ucontext_t *ucp)
+{       
+	        
+	if (ucp->uc_link == NULL) {
+		exit(0);
+	} else {  
+		setcontext((const ucontext_t *)ucp->uc_link);
+		abort();
+	}                                                      
+}
+   
+__weak_reference(__makecontext, makecontext);
+
+void
+__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
+{
+	struct gpregs *gp;
+	va_list ap;
+	int i;
+
+	/* A valid context is required. */
+	if (ucp == NULL)
+		return;
+
+	if ((argc < 0) || (argc > 8))
+		return;
+
+	gp = &ucp->uc_mcontext.mc_gpregs;
+
+	va_start(ap, argc);
+	/* Pass up to eight arguments in x0-7. */
+	for (i = 0; i < argc && i < 8; i++)
+		gp->gp_x[i] = va_arg(ap, uint64_t);
+	va_end(ap);
+
+	/* Set the stack */
+	gp->gp_sp = STACKALIGN(ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
+	/* Arrange for return via the trampoline code. */
+	gp->gp_elr = (__register_t)_ctx_start;
+	gp->gp_x[19] = (__register_t)func;
+	gp->gp_x[20] = (__register_t)ucp;
+}

Modified: projects/clang-trunk/lib/libc/gen/syslog.3
==============================================================================
--- projects/clang-trunk/lib/libc/gen/syslog.3	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/lib/libc/gen/syslog.3	Wed Jul 22 19:55:32 2015	(r285802)
@@ -28,7 +28,7 @@
 .\"     @(#)syslog.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd December 30, 2004
+.Dd July 21, 2015
 .Dt SYSLOG 3
 .Os
 .Sh NAME
@@ -292,4 +292,4 @@ for later interpolation by
 .Pp
 Always use the proper secure idiom:
 .Pp
-.Dl syslog("%s", string);
+.Dl syslog(priority, "%s", string);

Modified: projects/clang-trunk/lib/libc/gen/wordexp.3
==============================================================================
--- projects/clang-trunk/lib/libc/gen/wordexp.3	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/lib/libc/gen/wordexp.3	Wed Jul 22 19:55:32 2015	(r285802)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 29, 2004
+.Dd July 07, 2015
 .Dt WORDEXP 3
 .Os
 .Sh NAME
@@ -202,5 +202,5 @@ but it does not use the same parser so i
 .Pp
 The current
 .Fn wordexp
-implementation does not recognize multibyte characters, since the
-shell (which it invokes to perform expansions) does not.
+implementation does not recognize multibyte characters other than UTF-8, since
+the shell (which it invokes to perform expansions) does not.

Modified: projects/clang-trunk/lib/libc/sys/Makefile.inc
==============================================================================
--- projects/clang-trunk/lib/libc/sys/Makefile.inc	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/lib/libc/sys/Makefile.inc	Wed Jul 22 19:55:32 2015	(r285802)
@@ -235,6 +235,7 @@ MAN+=	abort2.2 \
 	nanosleep.2 \
 	nfssvc.2 \
 	ntp_adjtime.2 \
+	numa_getaffinity.2 \
 	open.2 \
 	pathconf.2 \
 	pdfork.2 \
@@ -395,6 +396,7 @@ MLINKS+=mount.2 nmount.2 \
 MLINKS+=mq_receive.2 mq_timedreceive.2
 MLINKS+=mq_send.2 mq_timedsend.2
 MLINKS+=ntp_adjtime.2 ntp_gettime.2
+MLINKS+=numa_getaffinity.2 numa_setaffinity.2
 MLINKS+=open.2 openat.2
 MLINKS+=pathconf.2 fpathconf.2
 MLINKS+=pathconf.2 lpathconf.2

Modified: projects/clang-trunk/lib/libc/sys/Symbol.map
==============================================================================
--- projects/clang-trunk/lib/libc/sys/Symbol.map	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/lib/libc/sys/Symbol.map	Wed Jul 22 19:55:32 2015	(r285802)
@@ -400,6 +400,8 @@ FBSD_1.4 {
 	futimens;
 	ppoll;
 	utimensat;
+	numa_setaffinity;
+	numa_getaffinity;
 };
 
 FBSDprivate_1.0 {

Modified: projects/clang-trunk/lib/libc/sys/madvise.2
==============================================================================
--- projects/clang-trunk/lib/libc/sys/madvise.2	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/lib/libc/sys/madvise.2	Wed Jul 22 19:55:32 2015	(r285802)
@@ -28,7 +28,7 @@
 .\"	@(#)madvise.2	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD$
 .\"
-.Dd January 30, 2014
+.Dd July 12, 2015
 .Dt MADVISE 2
 .Os
 .Sh NAME
@@ -79,9 +79,9 @@ pages in from backing store, but quickly
 into the calling process.
 .It Dv MADV_DONTNEED
 Allows the VM system to decrease the in-memory priority
-of pages in the specified range.
-Additionally future references to
-this address range will incur a page fault.
+of pages in the specified address range.
+Consequently, future references to this address range are more likely
+to incur a page fault.
 .It Dv MADV_FREE
 Gives the VM system the freedom to free pages,
 and tells the system that information in the specified page range

Copied: projects/clang-trunk/lib/libc/sys/numa_getaffinity.2 (from r285792, head/lib/libc/sys/numa_getaffinity.2)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang-trunk/lib/libc/sys/numa_getaffinity.2	Wed Jul 22 19:55:32 2015	(r285802, copy of r285792, head/lib/libc/sys/numa_getaffinity.2)
@@ -0,0 +1,197 @@
+.\" Copyright (c) 2008 Christian Brueffer
+.\" Copyright (c) 2008 Jeffrey Roberson
+.\" Copyright (c) 2015 Adrian Chadd
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. 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.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd May 7, 2015
+.Dt NUMA_GETAFFINITY 2
+.Os
+.Sh NAME
+.Nm numa_getaffinity ,
+.Nm numa_setaffinity
+.Nd manage NUMA affinity
+.Sh LIBRARY
+.Lb libc
+.Sh SYNOPSIS
+.In sys/param.h
+.In sys/numa.h
+.Ft int
+.Fn numa_getaffinity "cpuwhich_t which" "id_t id" "struct vm_domain_policy_entry *policy"
+.Ft int
+.Fn numa_setaffinity "cpuwhich_t which" "id_t id" "const struct vm_domain_policy_entry *policy"
+.Sh DESCRIPTION
+.Fn numa_getaffinity
+and
+.Fn numa_setaffinity
+allow the manipulation of NUMA policies available to processes and threads.
+These functions may manipulate NUMA policies that contain many processes
+or affect only a single object.
+.Pp
+Valid values for the
+.Fa which
+argument are documented in
+.Xr cpuset 2 .
+These arguments specify which object set are used.
+Only
+.Dv CPU_WHICH_TID
+and
+.Dv CPU_WHICH_PID
+can be manipulated.
+.Pp
+The
+.Fa policy
+entry contains a vm_domain_policy_entry with the following fields:
+.Bd -literal
+struct vm_domain_policy_entry {
+    vm_domain_policy_type_t policy;   /* VM policy */
+    int domain;   /* VM domain, if applicable */
+}
+.Ed
+.Fa vm_domain_policy_type_t policy
+is one these:
+.Bl -tag -width VM_POLICY_NONE
+.It Dv VM_POLICY_NONE
+Reset the domain back to none.
+Any parent object NUMA domain policy will apply.
+The only valid value for
+.Dv domain
+is -1.
+.It Dv VM_POLICY_ROUND_ROBIN
+Select round-robin policy.
+Pages will be allocated round-robin from each VM domain in order.
+The only valid value for
+.Dv domain
+is -1.
+.It Dv VM_POLICY_FIXED_DOMAIN
+Select fixed-domain only policy.
+Pages will be allocated from the given
+.Dv domain
+which must be set to a valid VM domain.
+Pages will not be allocated from another domain if
+.Dv domain
+is out of free pages.
+.It Dv VM_POLICY_FIXED_DOMAIN_ROUND_ROBIN
+Select fixed-domain only policy.
+Pages will be allocated from
+.Dv domain
+which must be set to a valid VM domain.
+If page allocation fails, pages will be round-robin
+allocated from another domain if
+.Dv domain
+is out of free pages.
+.It Dv VM_POLICY_FIRST_TOUCH
+Select first-touch policy.
+Pages will be allocated from the NUMA domain which the thread
+is currently scheduled upon.
+Pages will not be allocated from another domain if the current domain
+is out of free pages.
+The only valid value for
+.Dv domain
+is -1.
+.It Dv VM_POLICY_FIRST_TOUCH_ROUND_ROBIN
+Select first-touch policy.
+Pages will be allocated from the NUMA domain which the thread
+is currently scheduled upon.
+Pages will be allocated round-robin from another domain if the
+current domain is out of free pages.
+The only valid value for
+.Dv domain
+is -1.
+.El
+.Pp
+Note that the VM might assign some pages from other domains.
+For example, if an existing page allocation is covered by a superpage
+allocation.
+.Pp
+.Fn numa_getaffinity
+retrieves the
+NUMA policy from the object specified by
+.Fa which
+and
+.Fa id
+and stores it in the space provided by
+.Fa policy .
+.Pp
+.Fn numa_setaffinity
+attempts to set the NUMA policy for the object specified by
+.Fa which
+and
+.Fa id
+to the policy in
+.Fa policy .
+.Sh RETURN VALUES
+.Rv -std
+.Sh ERRORS
+.Va errno
+can contain these error codes:
+.Bl -tag -width Er
+.It Bq Er EINVAL
+The
+.Fa level
+or
+.Fa which
+argument was not a valid value.
+.It Bq Er EINVAL
+The
+.Fa policy
+argument specified when calling
+.Fn numa_setaffinity
+did not contain a valid policy.
+.It Bq Er EFAULT
+The policy pointer passed was invalid.
+.It Bq Er ESRCH
+The object specified by the
+.Fa id
+and
+.Fa which
+arguments could not be found.
+.It Bq Er ERANGE
+The
+.Fa domain
+in the given policy
+was out of the range of possible VM domains available.
+.It Bq Er EPERM
+The calling process did not have the credentials required to complete the
+operation.
+.El
+.Sh SEE ALSO
+.Xr cpuset 1 ,
+.Xr numactl 1 ,
+.Xr cpuset 2 ,
+.Xr cpuset_getaffinity 2 ,
+.Xr cpuset_getid 2 ,
+.Xr cpuset_setaffinity 2 ,
+.Xr cpuset_setid 2 ,
+.Xr pthread_affinity_np 3 ,
+.Xr pthread_attr_affinity_np 3 ,
+.Xr numa 4
+.Sh HISTORY
+The
+.Nm
+family of system calls first appeared in
+.Fx 11.0 .
+.Sh AUTHORS
+.An Adrian Chadd Aq Mt adrian at FreeBSD.org

Modified: projects/clang-trunk/lib/libc/sys/wait.2
==============================================================================
--- projects/clang-trunk/lib/libc/sys/wait.2	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/lib/libc/sys/wait.2	Wed Jul 22 19:55:32 2015	(r285802)
@@ -362,6 +362,15 @@ field set to
 and the
 .Fa si_pid
 field set to the process ID of the process reporting status.
+For the exited process, the
+.Fa si_status
+field of the
+.Dv siginfo_t
+structure contains the full 32 bit exit status passed to
+.Xr _exit 2 ;
+the
+.Fa status
+argument of other calls only returns 8 lowest bits of the exit status.
 .Pp
 When the
 .Dv WNOHANG
@@ -656,13 +665,6 @@ is an extension;
 .Tn POSIX
 only permits this flag with
 .Fn waitid .
-.Pp
-.Tn POSIX
-requires
-.Fn waitid
-to return the full 32 bits passed to
-.Xr _exit 2 ;
-this implementation only returns 8 bits like the other calls.
 .Sh HISTORY
 The
 .Fn wait

Modified: projects/clang-trunk/lib/libc/tests/sys/Makefile
==============================================================================
--- projects/clang-trunk/lib/libc/tests/sys/Makefile	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/lib/libc/tests/sys/Makefile	Wed Jul 22 19:55:32 2015	(r285802)
@@ -12,9 +12,7 @@ NETBSD_ATF_TESTS_C+=		clock_gettime_test
 NETBSD_ATF_TESTS_C+=		connect_test
 NETBSD_ATF_TESTS_C+=		dup_test
 NETBSD_ATF_TESTS_C+=		fsync_test
-.if ${MACHINE} != "arm64" # ARM64TODO: Missing makecontext
 NETBSD_ATF_TESTS_C+=		getcontext_test
-.endif
 NETBSD_ATF_TESTS_C+=		getgroups_test
 NETBSD_ATF_TESTS_C+=		getitimer_test
 NETBSD_ATF_TESTS_C+=		getlogin_test

Modified: projects/clang-trunk/lib/libkvm/kvm_proc.c
==============================================================================
--- projects/clang-trunk/lib/libkvm/kvm_proc.c	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/lib/libkvm/kvm_proc.c	Wed Jul 22 19:55:32 2015	(r285802)
@@ -66,6 +66,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/conf.h>
+#define	_WANT_KW_EXITCODE
+#include <sys/wait.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -389,7 +391,7 @@ nopgrp:
 		kp->ki_siglist = proc.p_siglist;
 		SIGSETOR(kp->ki_siglist, mtd.td_siglist);
 		kp->ki_sigmask = mtd.td_sigmask;
-		kp->ki_xstat = proc.p_xstat;
+		kp->ki_xstat = KW_EXITCODE(proc.p_xexit, proc.p_xsig);
 		kp->ki_acflag = proc.p_acflag;
 		kp->ki_lock = proc.p_lock;
 		if (proc.p_state != PRS_ZOMBIE) {

Modified: projects/clang-trunk/lib/libmd/Makefile
==============================================================================
--- projects/clang-trunk/lib/libmd/Makefile	Wed Jul 22 18:50:47 2015	(r285801)
+++ projects/clang-trunk/lib/libmd/Makefile	Wed Jul 22 19:55:32 2015	(r285802)
@@ -48,7 +48,8 @@ CLEANFILES+=	md[245]hl.c md[245].ref md[
 # in which case:
 #   * macros are used to rename symbols to libcrypt internal names

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

More information about the svn-src-projects mailing list