svn commit: r278916 - in projects/clang360-import: . bin/ln bin/pkill/tests bin/sh bin/sh/tests/expansion contrib/elftoolchain/addr2line contrib/elftoolchain/common contrib/elftoolchain/elfcopy con...

Dimitry Andric dim at FreeBSD.org
Tue Feb 17 19:53:54 UTC 2015 

Author: dim
Date: Tue Feb 17 19:53:41 2015
New Revision: 278916
URL: https://svnweb.freebsd.org/changeset/base/278916

Log:
  Merge ^/head r278756 through r278915.

Added:
  projects/clang360-import/bin/sh/tests/expansion/ifs5.0
     - copied unchanged from r278915, head/bin/sh/tests/expansion/ifs5.0
  projects/clang360-import/bin/sh/tests/expansion/pathname5.0
     - copied unchanged from r278915, head/bin/sh/tests/expansion/pathname5.0
  projects/clang360-import/lib/libc/sparc64/sys/sigaction1.S
     - copied unchanged from r278915, head/lib/libc/sparc64/sys/sigaction1.S
  projects/clang360-import/share/man/man4/udl.4
     - copied unchanged from r278915, head/share/man/man4/udl.4
  projects/clang360-import/sys/arm/arm/unwind.c
     - copied unchanged from r278915, head/sys/arm/arm/unwind.c
  projects/clang360-import/sys/dev/usb/video/
     - copied from r278915, head/sys/dev/usb/video/
  projects/clang360-import/sys/dev/videomode/
     - copied from r278915, head/sys/dev/videomode/
  projects/clang360-import/sys/modules/usb/udl/
     - copied from r278915, head/sys/modules/usb/udl/
  projects/clang360-import/sys/modules/videomode/
     - copied from r278915, head/sys/modules/videomode/
  projects/clang360-import/sys/ofed/drivers/infiniband/core/peer_mem.c
     - copied unchanged from r278915, head/sys/ofed/drivers/infiniband/core/peer_mem.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c
     - copied unchanged from r278915, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h
     - copied unchanged from r278915, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h
  projects/clang360-import/sys/ofed/include/linux/printk.h
     - copied unchanged from r278915, head/sys/ofed/include/linux/printk.h
  projects/clang360-import/sys/ofed/include/rdma/ib_peer_mem.h
     - copied unchanged from r278915, head/sys/ofed/include/rdma/ib_peer_mem.h
  projects/clang360-import/sys/ofed/include/rdma/ib_user_verbs_exp.h
     - copied unchanged from r278915, head/sys/ofed/include/rdma/ib_user_verbs_exp.h
  projects/clang360-import/sys/ofed/include/rdma/ib_verbs_exp.h
     - copied unchanged from r278915, head/sys/ofed/include/rdma/ib_verbs_exp.h
  projects/clang360-import/sys/ofed/include/rdma/peer_mem.h
     - copied unchanged from r278915, head/sys/ofed/include/rdma/peer_mem.h
Deleted:
  projects/clang360-import/lib/libc/sparc64/sys/sigaction.S
  projects/clang360-import/sys/dev/ic/hd64570.h
  projects/clang360-import/sys/ofed/drivers/infiniband/core/Makefile
  projects/clang360-import/sys/ofed/drivers/infiniband/core/local_sa.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/notice.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/Makefile
  projects/clang360-import/sys/ofed/drivers/infiniband/ulp/ipoib/Makefile
Modified:
  projects/clang360-import/Makefile.inc1
  projects/clang360-import/ObsoleteFiles.inc
  projects/clang360-import/bin/ln/symlink.7
  projects/clang360-import/bin/pkill/tests/pkill-j_test.sh
  projects/clang360-import/bin/sh/cd.c
  projects/clang360-import/bin/sh/eval.c
  projects/clang360-import/bin/sh/expand.c
  projects/clang360-import/bin/sh/mail.c
  projects/clang360-import/bin/sh/memalloc.c
  projects/clang360-import/bin/sh/memalloc.h
  projects/clang360-import/bin/sh/miscbltin.c
  projects/clang360-import/bin/sh/nodetypes
  projects/clang360-import/bin/sh/parser.c
  projects/clang360-import/bin/sh/tests/expansion/Makefile
  projects/clang360-import/bin/sh/var.c
  projects/clang360-import/contrib/elftoolchain/addr2line/addr2line.c
  projects/clang360-import/contrib/elftoolchain/common/_elftc.h
  projects/clang360-import/contrib/elftoolchain/common/elfdefinitions.h
  projects/clang360-import/contrib/elftoolchain/elfcopy/main.c
  projects/clang360-import/contrib/elftoolchain/elfcopy/sections.c
  projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h
  projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_attrval.c
  projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3
  projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3
  projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3
  projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_hasattr.3
  projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c
  projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
  projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_whatattr.3
  projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c
  projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h
  projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
  projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
  projects/clang360-import/contrib/elftoolchain/libelf/_libelf_config.h
  projects/clang360-import/contrib/elftoolchain/libelf/elf.3
  projects/clang360-import/contrib/elftoolchain/libelf/elf_scn.c
  projects/clang360-import/contrib/elftoolchain/libelf/libelf_ar_util.c
  projects/clang360-import/contrib/elftoolchain/libelf/libelf_convert.m4
  projects/clang360-import/contrib/elftoolchain/nm/nm.1
  projects/clang360-import/contrib/elftoolchain/nm/nm.c
  projects/clang360-import/contrib/elftoolchain/readelf/readelf.c
  projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
  projects/clang360-import/lib/libc/gen/dlopen.3
  projects/clang360-import/lib/libc/gen/fstab.c
  projects/clang360-import/lib/libc/gen/getgrent.c
  projects/clang360-import/lib/libc/gen/getpwent.c
  projects/clang360-import/lib/libc/gen/ulimit.c
  projects/clang360-import/lib/libc/include/libc_private.h
  projects/clang360-import/lib/libc/sparc64/sys/Makefile.inc
  projects/clang360-import/lib/libc/sys/Makefile.inc
  projects/clang360-import/lib/libcompat/4.3/rexec.c
  projects/clang360-import/lib/libelftc/elftc_version.c
  projects/clang360-import/lib/liblzma/config.h
  projects/clang360-import/share/man/man4/Makefile
  projects/clang360-import/share/man/man4/wlan.4
  projects/clang360-import/sys/amd64/amd64/mp_machdep.c
  projects/clang360-import/sys/arm/arm/cpuinfo.c
  projects/clang360-import/sys/arm/arm/db_trace.c
  projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
  projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
  projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h
  projects/clang360-import/sys/arm/include/stack.h
  projects/clang360-import/sys/boot/fdt/dts/arm/bcm2835.dtsi
  projects/clang360-import/sys/conf/files
  projects/clang360-import/sys/conf/files.arm
  projects/clang360-import/sys/conf/kern.mk
  projects/clang360-import/sys/conf/kern.pre.mk
  projects/clang360-import/sys/conf/kmod.mk
  projects/clang360-import/sys/conf/options
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_gpio.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c
  projects/clang360-import/sys/contrib/rdma/krping/krping.c
  projects/clang360-import/sys/dev/acpica/acpi_pcib.c
  projects/clang360-import/sys/dev/ath/if_ath_pci.c
  projects/clang360-import/sys/dev/atkbdc/atkbd.c
  projects/clang360-import/sys/dev/atkbdc/atkbdc.c
  projects/clang360-import/sys/dev/atkbdc/atkbdcreg.h
  projects/clang360-import/sys/dev/atkbdc/psm.c
  projects/clang360-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
  projects/clang360-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
  projects/clang360-import/sys/dev/cxgbe/iw_cxgbe/cq.c
  projects/clang360-import/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
  projects/clang360-import/sys/dev/cxgbe/iw_cxgbe/mem.c
  projects/clang360-import/sys/dev/fb/fbd.c
  projects/clang360-import/sys/dev/lmc/if_lmc.h
  projects/clang360-import/sys/dev/netmap/netmap.c
  projects/clang360-import/sys/dev/pci/pci.c
  projects/clang360-import/sys/dev/random/dummy_rng.c
  projects/clang360-import/sys/dev/random/random_adaptors.c
  projects/clang360-import/sys/dev/random/randomdev.c
  projects/clang360-import/sys/dev/random/randomdev.h
  projects/clang360-import/sys/dev/sfxge/common/efx_ev.c
  projects/clang360-import/sys/dev/sfxge/common/efx_mac.c
  projects/clang360-import/sys/dev/sfxge/common/efx_mcdi.c
  projects/clang360-import/sys/dev/sfxge/common/efx_nic.c
  projects/clang360-import/sys/dev/sfxge/common/efx_rx.c
  projects/clang360-import/sys/dev/sfxge/common/efx_tx.c
  projects/clang360-import/sys/dev/sfxge/common/siena_mon.c
  projects/clang360-import/sys/dev/sfxge/common/siena_nic.c
  projects/clang360-import/sys/dev/sfxge/common/siena_vpd.c
  projects/clang360-import/sys/dev/sfxge/sfxge_port.c
  projects/clang360-import/sys/dev/sfxge/sfxge_rx.c
  projects/clang360-import/sys/dev/sfxge/sfxge_tx.c
  projects/clang360-import/sys/dev/usb/controller/musb_otg.c
  projects/clang360-import/sys/dev/usb/controller/uhci.c
  projects/clang360-import/sys/dev/usb/usbdevs
  projects/clang360-import/sys/dev/vt/vt_core.c
  projects/clang360-import/sys/dev/wpi/if_wpi.c
  projects/clang360-import/sys/dev/wpi/if_wpireg.h
  projects/clang360-import/sys/dev/xen/xenstore/xenstore_dev.c
  projects/clang360-import/sys/fs/ext2fs/ext2_htree.c
  projects/clang360-import/sys/fs/ext2fs/ext2_vfsops.c
  projects/clang360-import/sys/i386/i386/mp_machdep.c
  projects/clang360-import/sys/kern/imgact_elf.c
  projects/clang360-import/sys/kern/kern_procctl.c
  projects/clang360-import/sys/kern/subr_taskqueue.c
  projects/clang360-import/sys/kern/uipc_mbuf.c
  projects/clang360-import/sys/kern/uipc_socket.c
  projects/clang360-import/sys/kern/vfs_subr.c
  projects/clang360-import/sys/mips/conf/AR71XX_BASE
  projects/clang360-import/sys/modules/cxgbe/if_cxgbe/Makefile
  projects/clang360-import/sys/modules/drm2/radeonkms/Makefile
  projects/clang360-import/sys/modules/ibcore/Makefile
  projects/clang360-import/sys/modules/ipoib/Makefile
  projects/clang360-import/sys/modules/mlx4/Makefile
  projects/clang360-import/sys/modules/mlx4ib/Makefile
  projects/clang360-import/sys/modules/mlxen/Makefile
  projects/clang360-import/sys/modules/mthca/Makefile
  projects/clang360-import/sys/net/if_bridge.c
  projects/clang360-import/sys/net/pfvar.h
  projects/clang360-import/sys/netinet6/frag6.c
  projects/clang360-import/sys/netinet6/ip6_output.c
  projects/clang360-import/sys/netinet6/ip6_var.h
  projects/clang360-import/sys/netpfil/pf/pf.c
  projects/clang360-import/sys/netpfil/pf/pf.h
  projects/clang360-import/sys/netpfil/pf/pf_mtag.h
  projects/clang360-import/sys/netpfil/pf/pf_norm.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/addr.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/cache.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/cm.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/cm_msgs.h
  projects/clang360-import/sys/ofed/drivers/infiniband/core/cma.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/core_priv.h
  projects/clang360-import/sys/ofed/drivers/infiniband/core/device.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/fmr_pool.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/iwcm.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/mad.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/mad_priv.h
  projects/clang360-import/sys/ofed/drivers/infiniband/core/mad_rmpp.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/multicast.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/packer.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/sa.h
  projects/clang360-import/sys/ofed/drivers/infiniband/core/sa_query.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/smi.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/sysfs.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/ucm.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/ucma.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/ud_header.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/umem.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/user_mad.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/uverbs.h
  projects/clang360-import/sys/ofed/drivers/infiniband/core/uverbs_cmd.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/uverbs_main.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/uverbs_marshall.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/verbs.c
  projects/clang360-import/sys/ofed/drivers/infiniband/debug/memtrack.c
  projects/clang360-import/sys/ofed/drivers/infiniband/debug/memtrack.h
  projects/clang360-import/sys/ofed/drivers/infiniband/debug/mtrack.h
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/ah.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/cm.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/cq.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/doorbell.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/mad.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/main.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/mr.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c
  projects/clang360-import/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h
  projects/clang360-import/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
  projects/clang360-import/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  projects/clang360-import/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
  projects/clang360-import/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
  projects/clang360-import/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
  projects/clang360-import/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c
  projects/clang360-import/sys/ofed/drivers/net/mlx4/Makefile
  projects/clang360-import/sys/ofed/drivers/net/mlx4/en_rx.c
  projects/clang360-import/sys/ofed/include/linux/device.h
  projects/clang360-import/sys/ofed/include/linux/linux_compat.c
  projects/clang360-import/sys/ofed/include/rdma/ib_addr.h
  projects/clang360-import/sys/ofed/include/rdma/ib_cache.h
  projects/clang360-import/sys/ofed/include/rdma/ib_cm.h
  projects/clang360-import/sys/ofed/include/rdma/ib_mad.h
  projects/clang360-import/sys/ofed/include/rdma/ib_pack.h
  projects/clang360-import/sys/ofed/include/rdma/ib_sa.h
  projects/clang360-import/sys/ofed/include/rdma/ib_umem.h
  projects/clang360-import/sys/ofed/include/rdma/ib_user_verbs.h
  projects/clang360-import/sys/ofed/include/rdma/ib_verbs.h
  projects/clang360-import/sys/ofed/include/rdma/iw_cm.h
  projects/clang360-import/sys/ofed/include/rdma/rdma_cm.h
  projects/clang360-import/sys/ofed/include/rdma/rdma_user_cm.h
  projects/clang360-import/sys/powerpc/powerpc/db_trace.c
  projects/clang360-import/sys/sparc64/include/asm.h
  projects/clang360-import/sys/sys/fbio.h
  projects/clang360-import/sys/sys/mbuf.h
  projects/clang360-import/sys/sys/param.h
  projects/clang360-import/sys/sys/taskqueue.h
  projects/clang360-import/sys/vm/memguard.c
  projects/clang360-import/sys/x86/acpica/acpi_wakeup.c
  projects/clang360-import/sys/x86/x86/local_apic.c
  projects/clang360-import/sys/x86/xen/pvcpu_enum.c
  projects/clang360-import/sys/x86/xen/xen_intr.c
  projects/clang360-import/usr.bin/compress/compress.c
  projects/clang360-import/usr.bin/gcore/elfcore.c
  projects/clang360-import/usr.bin/gzip/gzip.c
  projects/clang360-import/usr.bin/kdump/kdump.c
  projects/clang360-import/usr.bin/timeout/timeout.c
  projects/clang360-import/usr.bin/touch/touch.c
  projects/clang360-import/usr.sbin/binmiscctl/binmiscctl.8
  projects/clang360-import/usr.sbin/binmiscctl/binmiscctl.c
  projects/clang360-import/usr.sbin/devctl/Makefile
  projects/clang360-import/usr.sbin/pw/tests/pw_useradd.sh
  projects/clang360-import/usr.sbin/pw/tests/pw_usernext.sh
Directory Properties:
  projects/clang360-import/   (props changed)
  projects/clang360-import/contrib/elftoolchain/   (props changed)
  projects/clang360-import/contrib/llvm/   (props changed)
  projects/clang360-import/contrib/llvm/tools/lldb/   (props changed)
  projects/clang360-import/lib/libc/   (props changed)
  projects/clang360-import/share/   (props changed)
  projects/clang360-import/share/man/man4/   (props changed)
  projects/clang360-import/sys/   (props changed)
  projects/clang360-import/sys/boot/   (props changed)
  projects/clang360-import/sys/conf/   (props changed)

Modified: projects/clang360-import/Makefile.inc1
==============================================================================
--- projects/clang360-import/Makefile.inc1	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/Makefile.inc1	Tue Feb 17 19:53:41 2015	(r278916)
@@ -929,7 +929,7 @@ packageworld:
 	    @${DESTDIR}/${DISTDIR}/${dist}.debug.meta
 . else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
-	    tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \
+	    tar cvJLf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \
 	    usr/lib/debug
 . endif
 .endfor

Modified: projects/clang360-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang360-import/ObsoleteFiles.inc	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/ObsoleteFiles.inc	Tue Feb 17 19:53:41 2015	(r278916)
@@ -93,6 +93,8 @@ OLD_FILES+=usr/lib/clang/3.5.1/lib/freeb
 OLD_DIRS+=usr/lib/clang/3.5.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.5.1/lib
 OLD_DIRS+=usr/lib/clang/3.5.1
+# 20150217: Removed remnants of ar(4) driver
+OLD_FILES+=usr/include/sys/dev/ic/hd64570.h
 # 20150212: /usr/games moving into /usr/bin
 OLD_FILES+=usr/games/bcd
 OLD_FILES+=usr/games/caesar

Modified: projects/clang360-import/bin/ln/symlink.7
==============================================================================
--- projects/clang360-import/bin/ln/symlink.7	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/ln/symlink.7	Tue Feb 17 19:53:41 2015	(r278916)
@@ -29,7 +29,7 @@
 .\"	@(#)symlink.7	8.3 (Berkeley) 3/31/94
 .\" $FreeBSD$
 .\"
-.Dd January 23, 2015
+.Dd February 16, 2015
 .Dt SYMLINK 7
 .Os
 .Sh NAME
@@ -146,6 +146,7 @@ The following system calls follow symbol
 unless given the
 .Dv AT_SYMLINK_NOFOLLOW
 flag:
+.Xr chflagsat 2 ,
 .Xr fchmodat 2 ,
 .Xr fchownat 2 ,
 .Xr fstatat 2

Modified: projects/clang360-import/bin/pkill/tests/pkill-j_test.sh
==============================================================================
--- projects/clang360-import/bin/pkill/tests/pkill-j_test.sh	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/pkill/tests/pkill-j_test.sh	Tue Feb 17 19:53:41 2015	(r278916)
@@ -4,99 +4,90 @@
 jail_name_to_jid()
 {
 	local check_name="$1"
-	(
-		line="$(jls -n 2> /dev/null | grep  name=$check_name  )"
-		for nv in $line; do
-			local name="${nv%=*}"
-			if [ "${name}" = "jid" ]; then
-				eval $nv
-				echo $jid
-				break
-			fi
-		done
-	)
+	jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g'
 }
 
 base=pkill_j_test
 
+if [ `id -u` -ne 0 ]; then
+	echo "1..0 # skip Test needs uid 0."
+	exit 0
+fi
+
 echo "1..3"
 
+sleep=$(pwd)/sleep.txt
+ln -sf /bin/sleep $sleep
+
 name="pkill -j <jid>"
-if [ `id -u` -eq 0 ]; then
-	sleep=$(pwd)/sleep.txt
-	ln -sf /bin/sleep $sleep
-        jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
-            command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 &
+sleep_amount=5
+jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount &
+
+jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount &
 
-        jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
-            command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 &
+$sleep $sleep_amount &
 
-	$sleep 5 &
-	sleep 0.5
+for i in `seq 1 10`; do
 	jid1=$(jail_name_to_jid ${base}_1_1)
 	jid2=$(jail_name_to_jid ${base}_1_2)
 	jid="${jid1},${jid2}"
-	if pkill -f -j "$jid" $sleep && sleep 0.5 &&
-	    ! -f ${PWD}/${base}_1_1.pid &&
-	    ! -f ${PWD}/${base}_1_2.pid ; then
-		echo "ok 1 - $name"
-	else
-		echo "not ok 1 - $name"
-	fi 2>/dev/null
-	rm -f $sleep
-	[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
-	[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
-	wait
+	case "$jid" in
+	[0-9]+,[0-9]+)
+		break
+		;;
+	esac
+	sleep 0.1
+done
+
+if pkill -f -j "$jid" $sleep && sleep 0.5 &&
+    ! -f ${PWD}/${base}_1_1.pid &&
+    ! -f ${PWD}/${base}_1_2.pid ; then
+	echo "ok 1 - $name"
 else
-	echo "ok 1 - $name # skip Test needs uid 0."
-fi
+	echo "not ok 1 - $name"
+fi 2>/dev/null
+[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
+[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
+wait
 
 name="pkill -j any"
-if [ `id -u` -eq 0 ]; then
-	sleep=$(pwd)/sleep.txt
-	ln -sf /bin/sleep $sleep
-        jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
-            command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 &
-
-        jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
-            command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 &
-
-	$sleep 5 &
-	sleep 0.5
-	chpid3=$!
-	if pkill -f -j any $sleep && sleep 0.5 &&
-	    [ ! -f ${PWD}/${base}_2_1.pid -a
-	      ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then
-		echo "ok 2 - $name"
-	else
-		echo "not ok 2 - $name"
-	fi 2>/dev/null
-	rm -f $sleep
-	[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
-	[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
-	wait
+sleep_amount=6
+jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount &
+
+jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount &
+
+$sleep $sleep_amount &
+chpid3=$!
+sleep 0.5
+if pkill -f -j any $sleep && sleep 0.5 &&
+    [ ! -f ${PWD}/${base}_2_1.pid -a
+      ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then
+	echo "ok 2 - $name"
 else
-	echo "ok 2 - $name # skip Test needs uid 0."
-fi
+	echo "not ok 2 - $name"
+fi 2>/dev/null
+[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
+[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
+wait
 
 name="pkill -j none"
-if [ `id -u` -eq 0 ]; then
-	sleep=$(pwd)/sleep.txt
-	ln -sf /bin/sleep $sleep
-	daemon -p ${PWD}/${base}_3_1.pid $sleep 5
-	jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
-            command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 &
-	sleep 1
-	if pkill -f -j none "$sleep 5" && sleep 1 &&
-	    [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then
-		echo "ok 3 - $name"
-	else
-		ls ${PWD}/*.pid
-		echo "not ok 3 - $name"
-	fi 2>/dev/null
-	rm -f $sleep
-	[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid)
-	[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid)
+sleep_amount=7
+daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount
+jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount &
+sleep 1
+if pkill -f -j none "$sleep $sleep_amount" && sleep 1 &&
+    [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then
+	echo "ok 3 - $name"
 else
-	echo "ok 3 - $name # skip Test needs uid 0."
-fi
+	ls ${PWD}/*.pid
+	echo "not ok 3 - $name"
+fi 2>/dev/null
+[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid)
+[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid)
+
+rm -f $sleep

Modified: projects/clang360-import/bin/sh/cd.c
==============================================================================
--- projects/clang360-import/bin/sh/cd.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/sh/cd.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -122,7 +122,7 @@ cdcmd(int argc __unused, char **argv __u
 	    (dest[0] == '.' && (dest[1] == '/' || dest[1] == '\0')) ||
 	    (dest[0] == '.' && dest[1] == '.' && (dest[2] == '/' || dest[2] == '\0')) ||
 	    (path = bltinlookup("CDPATH", 1)) == NULL)
-		path = nullstr;
+		path = "";
 	while ((p = padvance(&path, dest)) != NULL) {
 		if (stat(p, &statb) < 0) {
 			if (errno != ENOENT)
@@ -182,7 +182,6 @@ cdlogical(char *dest)
 	struct stat statb;
 	int first;
 	int badstat;
-	size_t len;
 
 	/*
 	 *  Check each component of the path. If we find a symlink or
@@ -190,9 +189,7 @@ cdlogical(char *dest)
 	 *  next time we get the value of the current directory.
 	 */
 	badstat = 0;
-	len = strlen(dest);
-	cdcomppath = stalloc(len + 1);
-	memcpy(cdcomppath, dest, len + 1);
+	cdcomppath = stsavestr(dest);
 	STARTSTACKSTR(p);
 	if (*dest == '/') {
 		STPUTC('/', p);
@@ -277,7 +274,6 @@ findcwd(char *dir)
 {
 	char *new;
 	char *p;
-	size_t len;
 
 	/*
 	 * If our argument is NULL, we don't know the current directory
@@ -286,9 +282,7 @@ findcwd(char *dir)
 	 */
 	if (dir == NULL || curdir == NULL)
 		return getpwd2();
-	len = strlen(dir);
-	cdcomppath = stalloc(len + 1);
-	memcpy(cdcomppath, dir, len + 1);
+	cdcomppath = stsavestr(dir);
 	STARTSTACKSTR(new);
 	if (*dir != '/') {
 		STPUTS(curdir, new);

Modified: projects/clang360-import/bin/sh/eval.c
==============================================================================
--- projects/clang360-import/bin/sh/eval.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/sh/eval.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -498,7 +498,7 @@ exphere(union node *redir, struct arglis
 	struct localvar *savelocalvars;
 	int need_longjmp = 0;
 
-	redir->nhere.expdoc = nullstr;
+	redir->nhere.expdoc = "";
 	savelocalvars = localvars;
 	localvars = NULL;
 	forcelocal++;

Modified: projects/clang360-import/bin/sh/expand.c
==============================================================================
--- projects/clang360-import/bin/sh/expand.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/sh/expand.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -105,11 +105,12 @@ static void expbackq(union node *, int, 
 static int subevalvar(char *, char *, int, int, int, int, int);
 static char *evalvar(char *, int);
 static int varisset(const char *, int);
+static void strtodest(const char *, int, int, int);
 static void varvalue(const char *, int, int, int);
 static void recordregion(int, int, int);
 static void removerecordregions(int);
 static void ifsbreakup(char *, struct arglist *);
-static void expandmeta(struct strlist *, int);
+static void expandmeta(struct strlist *);
 static void expmeta(char *, char *);
 static void addfname(char *);
 static struct strlist *expsort(struct strlist *);
@@ -175,7 +176,7 @@ expandarg(union node *arg, struct arglis
 		ifsbreakup(p, &exparg);
 		*exparg.lastp = NULL;
 		exparg.lastp = &exparg.list;
-		expandmeta(exparg.list, flag);
+		expandmeta(exparg.list);
 	} else {
 		sp = (struct strlist *)stalloc(sizeof (struct strlist));
 		sp->text = p;
@@ -298,9 +299,9 @@ exptilde(char *p, int flag)
 	char c, *startp = p;
 	struct passwd *pw;
 	char *home;
-	int quotes = flag & (EXP_FULL | EXP_CASE);
 
-	while ((c = *p) != '\0') {
+	for (;;) {
+		c = *p;
 		switch(c) {
 		case CTLESC: /* This means CTL* are always considered quoted. */
 		case CTLVAR:
@@ -311,31 +312,27 @@ exptilde(char *p, int flag)
 		case CTLQUOTEMARK:
 			return (startp);
 		case ':':
-			if (flag & EXP_VARTILDE)
-				goto done;
-			break;
+			if ((flag & EXP_VARTILDE) == 0)
+				break;
+			/* FALLTHROUGH */
+		case '\0':
 		case '/':
 		case CTLENDVAR:
-			goto done;
+			*p = '\0';
+			if (*(startp+1) == '\0') {
+				home = lookupvar("HOME");
+			} else {
+				pw = getpwnam(startp+1);
+				home = pw != NULL ? pw->pw_dir : NULL;
+			}
+			*p = c;
+			if (home == NULL || *home == '\0')
+				return (startp);
+			strtodest(home, flag, VSNORMAL, 1);
+			return (p);
 		}
 		p++;
 	}
-done:
-	*p = '\0';
-	if (*(startp+1) == '\0') {
-		home = lookupvar("HOME");
-	} else {
-		pw = getpwnam(startp+1);
-		home = pw != NULL ? pw->pw_dir : NULL;
-	}
-	*p = c;
-	if (home == NULL || *home == '\0')
-		return (startp);
-	if (quotes)
-		STPUTS_QUOTES(home, DQSYNTAX, expdest);
-	else
-		STPUTS(home, expdest);
-	return (p);
 }
 
 
@@ -496,6 +493,17 @@ expbackq(union node *cmd, int quoted, in
 
 
 
+static void
+recordleft(const char *str, const char *loc, char *startp)
+{
+	int amount;
+
+	amount = ((str - 1) - (loc - startp)) - expdest;
+	STADJUST(amount, expdest);
+	while (loc != str - 1)
+		*startp++ = *loc++;
+}
+
 static int
 subevalvar(char *p, char *str, int strloc, int subtype, int startloc,
   int varflags, int quotes)
@@ -530,8 +538,7 @@ subevalvar(char *p, char *str, int strlo
 			error((char *)NULL);
 		}
 		error("%.*s: parameter %snot set", (int)(p - str - 1),
-		      str, (varflags & VSNUL) ? "null or "
-					      : nullstr);
+		      str, (varflags & VSNUL) ? "null or " : "");
 		return 0;
 
 	case VSTRIMLEFT:
@@ -540,7 +547,8 @@ subevalvar(char *p, char *str, int strlo
 			*loc = '\0';
 			if (patmatch(str, startp, quotes)) {
 				*loc = c;
-				goto recordleft;
+				recordleft(str, loc, startp);
+				return 1;
 			}
 			*loc = c;
 			if (quotes && *loc == CTLESC)
@@ -554,7 +562,8 @@ subevalvar(char *p, char *str, int strlo
 			*loc = '\0';
 			if (patmatch(str, startp, quotes)) {
 				*loc = c;
-				goto recordleft;
+				recordleft(str, loc, startp);
+				return 1;
 			}
 			*loc = c;
 			loc--;
@@ -602,13 +611,6 @@ subevalvar(char *p, char *str, int strlo
 	default:
 		abort();
 	}
-
-recordleft:
-	amount = ((str - 1) - (loc - startp)) - expdest;
-	STADJUST(amount, expdest);
-	while (loc != str - 1)
-		*startp++ = *loc++;
-	return 1;
 }
 
 
@@ -633,6 +635,7 @@ evalvar(char *p, int flag)
 	int varlenb;
 	int easy;
 	int quotes = flag & (EXP_FULL | EXP_CASE);
+	int record;
 
 	varflags = (unsigned char)*p++;
 	subtype = varflags & VSTYPE;
@@ -690,22 +693,15 @@ again: /* jump here after setting a vari
 				STADJUST(-varlenb, expdest);
 			}
 		} else {
-			char const *syntax = (varflags & VSQUOTE) ? DQSYNTAX
-								  : BASESYNTAX;
-
 			if (subtype == VSLENGTH) {
 				for (;*val; val++)
 					if (!localeisutf8 ||
 					    (*val & 0xC0) != 0x80)
 						varlen++;
 			}
-			else {
-				if (quotes)
-					STPUTS_QUOTES(val, syntax, expdest);
-				else
-					STPUTS(val, expdest);
-
-			}
+			else
+				strtodest(val, flag, subtype,
+				    varflags & VSQUOTE);
 		}
 	}
 
@@ -719,15 +715,11 @@ again: /* jump here after setting a vari
 	switch (subtype) {
 	case VSLENGTH:
 		expdest = cvtnum(varlen, expdest);
-		goto record;
+		record = 1;
+		break;
 
 	case VSNORMAL:
-		if (!easy)
-			break;
-record:
-		recordregion(startloc, expdest - stackblock(),
-		    varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' &&
-		    (*var == '@' || *var == '*')));
+		record = easy;
 		break;
 
 	case VSPLUS:
@@ -737,8 +729,7 @@ record:
 			    (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0));
 			break;
 		}
-		if (easy)
-			goto record;
+		record = easy;
 		break;
 
 	case VSTRIMLEFT:
@@ -760,7 +751,8 @@ record:
 		}
 		/* Remove any recorded regions beyond start of variable */
 		removerecordregions(startloc);
-		goto record;
+		record = 1;
+		break;
 
 	case VSASSIGN:
 	case VSQUESTION:
@@ -777,8 +769,7 @@ record:
 			}
 			break;
 		}
-		if (easy)
-			goto record;
+		record = easy;
 		break;
 
 	case VSERROR:
@@ -790,6 +781,11 @@ record:
 		abort();
 	}
 
+	if (record)
+		recordregion(startloc, expdest - stackblock(),
+		    varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' &&
+		    (*var == '@' || *var == '*')));
+
 	if (subtype != VSNORMAL) {	/* skip to end of alternative */
 		int nesting = 1;
 		for (;;) {
@@ -1093,7 +1089,7 @@ static char expdir[PATH_MAX];
  * The results are stored in the list exparg.
  */
 static void
-expandmeta(struct strlist *str, int flag __unused)
+expandmeta(struct strlist *str)
 {
 	char *p;
 	struct strlist **savelastp;
@@ -1284,11 +1280,8 @@ addfname(char *name)
 {
 	char *p;
 	struct strlist *sp;
-	size_t len;
 
-	len = strlen(name);
-	p = stalloc(len + 1);
-	memcpy(p, name, len + 1);
+	p = stsavestr(name);
 	sp = (struct strlist *)stalloc(sizeof *sp);
 	sp->text = p;
 	*exparg.lastp = sp;
@@ -1478,16 +1471,14 @@ patmatch(const char *pattern, const char
 			endp = p;
 			if (*endp == '!' || *endp == '^')
 				endp++;
-			for (;;) {
+			do {
 				while (*endp == CTLQUOTEMARK)
 					endp++;
 				if (*endp == 0)
 					goto dft;		/* no matching ] */
 				if (*endp == CTLESC)
 					endp++;
-				if (*++endp == ']')
-					break;
-			}
+			} while (*++endp != ']');
 			invert = 0;
 			if (*p == '!' || *p == '^') {
 				invert++;

Modified: projects/clang360-import/bin/sh/mail.c
==============================================================================
--- projects/clang360-import/bin/sh/mail.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/sh/mail.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -85,7 +85,7 @@ chkmail(int silent)
 	setstackmark(&smark);
 	mpath = mpathset()? mpathval() : mailval();
 	for (i = 0 ; i < nmboxes ; i++) {
-		p = padvance(&mpath, nullstr);
+		p = padvance(&mpath, "");
 		if (p == NULL)
 			break;
 		if (*p == '\0')

Modified: projects/clang360-import/bin/sh/memalloc.c
==============================================================================
--- projects/clang360-import/bin/sh/memalloc.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/sh/memalloc.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -180,6 +180,18 @@ stunalloc(pointer p)
 }
 
 
+char *
+stsavestr(const char *s)
+{
+	char *p;
+	size_t len;
+
+	len = strlen(s);
+	p = stalloc(len + 1);
+	memcpy(p, s, len + 1);
+	return p;
+}
+
 
 void
 setstackmark(struct stackmark *mark)

Modified: projects/clang360-import/bin/sh/memalloc.h
==============================================================================
--- projects/clang360-import/bin/sh/memalloc.h	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/sh/memalloc.h	Tue Feb 17 19:53:41 2015	(r278916)
@@ -52,6 +52,7 @@ void ckfree(pointer);
 char *savestr(const char *);
 pointer stalloc(int);
 void stunalloc(pointer);
+char *stsavestr(const char *);
 void setstackmark(struct stackmark *);
 void popstackmark(struct stackmark *);
 char *growstackstr(void);

Modified: projects/clang360-import/bin/sh/miscbltin.c
==============================================================================
--- projects/clang360-import/bin/sh/miscbltin.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/sh/miscbltin.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -265,7 +265,7 @@ readcmd(int argc __unused, char **argv _
 
 	/* Set any remaining args to "" */
 	while (*++ap != NULL)
-		setvar(*ap, nullstr, 0);
+		setvar(*ap, "", 0);
 	return status;
 }
 

Modified: projects/clang360-import/bin/sh/nodetypes
==============================================================================
--- projects/clang360-import/bin/sh/nodetypes	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/sh/nodetypes	Tue Feb 17 19:53:41 2015	(r278916)
@@ -138,7 +138,7 @@ NXHERE nhere			# fd<<!
 	fd	  int			# file descriptor being redirected
 	next	  nodeptr		# next redirection in list
 	doc	  nodeptr		# input to command (NARG node)
-	expdoc    temp	char *expdoc	# actual document (for NXHERE)
+	expdoc    temp	const char *expdoc	# actual document (for NXHERE)
 
 NNOT nnot			# ! command  (actually pipeline)
 	type	int

Modified: projects/clang360-import/bin/sh/parser.c
==============================================================================
--- projects/clang360-import/bin/sh/parser.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/sh/parser.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -1940,7 +1940,7 @@ getprompt(void *unused __unused)
 	 */
 	switch (whichprompt) {
 	case 0:
-		fmt = nullstr;
+		fmt = "";
 		break;
 	case 1:
 		fmt = ps1val();

Modified: projects/clang360-import/bin/sh/tests/expansion/Makefile
==============================================================================
--- projects/clang360-import/bin/sh/tests/expansion/Makefile	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/sh/tests/expansion/Makefile	Tue Feb 17 19:53:41 2015	(r278916)
@@ -48,6 +48,7 @@ FILES+=		ifs1.0
 FILES+=		ifs2.0
 FILES+=		ifs3.0
 FILES+=		ifs4.0
+FILES+=		ifs5.0
 FILES+=		length1.0
 FILES+=		length2.0
 FILES+=		length3.0
@@ -62,6 +63,7 @@ FILES+=		pathname1.0
 FILES+=		pathname2.0
 FILES+=		pathname3.0
 FILES+=		pathname4.0
+FILES+=		pathname5.0
 FILES+=		plus-minus1.0
 FILES+=		plus-minus2.0
 FILES+=		plus-minus3.0

Copied: projects/clang360-import/bin/sh/tests/expansion/ifs5.0 (from r278915, head/bin/sh/tests/expansion/ifs5.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang360-import/bin/sh/tests/expansion/ifs5.0	Tue Feb 17 19:53:41 2015	(r278916, copy of r278915, head/bin/sh/tests/expansion/ifs5.0)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+set -- $(echo a b c d)
+[ "$#" = 4 ]

Copied: projects/clang360-import/bin/sh/tests/expansion/pathname5.0 (from r278915, head/bin/sh/tests/expansion/pathname5.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang360-import/bin/sh/tests/expansion/pathname5.0	Tue Feb 17 19:53:41 2015	(r278916, copy of r278915, head/bin/sh/tests/expansion/pathname5.0)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+[ `echo '/[e]tc'` = /etc ]

Modified: projects/clang360-import/bin/sh/var.c
==============================================================================
--- projects/clang360-import/bin/sh/var.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/bin/sh/var.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -872,7 +872,7 @@ unsetvar(const char *s)
 	if (vp->flags & VREADONLY)
 		return (1);
 	if (vp->text[vp->name_len + 1] != '\0')
-		setvar(s, nullstr, 0);
+		setvar(s, "", 0);
 	if ((vp->flags & VEXPORT) && localevar(vp->text)) {
 		change_env(s, 0);
 		setlocale(LC_ALL, "");

Modified: projects/clang360-import/contrib/elftoolchain/addr2line/addr2line.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/addr2line/addr2line.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/addr2line/addr2line.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -40,7 +40,7 @@
 
 #include "_elftc.h"
 
-ELFTC_VCSID("$Id: addr2line.c 2185 2011-11-19 16:07:16Z jkoshy $");
+ELFTC_VCSID("$Id: addr2line.c 3148 2015-02-15 18:47:39Z emaste $");
 
 static struct option longopts[] = {
 	{"target" , required_argument, NULL, 'b'},

Modified: projects/clang360-import/contrib/elftoolchain/common/_elftc.h
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/common/_elftc.h	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/common/_elftc.h	Tue Feb 17 19:53:41 2015	(r278916)
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: _elftc.h 2922 2013-03-17 22:53:15Z kaiwang27 $
+ * $Id: _elftc.h 3139 2015-01-05 03:17:06Z kaiwang27 $
  */
 
 /**
@@ -76,10 +76,17 @@
  * SUCH DAMAGE.
  */
 
+#ifndef	LIST_FOREACH_SAFE
+#define	LIST_FOREACH_SAFE(var, head, field, tvar)		\
+	for ((var) = LIST_FIRST((head));			\
+	    (var) && ((tvar) = LIST_NEXT((var), field), 1);	\
+	    (var) = (tvar))
+#endif
+
 #ifndef	SLIST_FOREACH_SAFE
-#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = SLIST_FIRST((head));				\
-	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)		\
+	for ((var) = SLIST_FIRST((head));			\
+	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);	\
 	    (var) = (tvar))
 #endif
 

Modified: projects/clang360-import/contrib/elftoolchain/common/elfdefinitions.h
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/common/elfdefinitions.h	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/common/elfdefinitions.h	Tue Feb 17 19:53:41 2015	(r278916)
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: elfdefinitions.h 3110 2014-12-20 08:32:46Z kaiwang27 $
+ * $Id: elfdefinitions.h 3149 2015-02-15 19:00:06Z emaste $
  */
 
 /*
@@ -1396,6 +1396,12 @@ _ELF_DEFINE_RELOC(R_386_8,		22)	\
 _ELF_DEFINE_RELOC(R_386_PC8,		23)
 
 /*
+ */
+#define	_ELF_DEFINE_AARCH64_RELOCATIONS()		\
+_ELF_DEFINE_RELOC(R_AARCH64_ABS64,		257)	\
+_ELF_DEFINE_RELOC(R_AARCH64_ABS32,		258)	\
+
+/*
  * These are the symbols used in the Sun ``Linkers and Loaders
  * Guide'', Document No: 817-1984-17.  See the X86_64 relocations list
  * below for the spellings used in the ELF specification.
@@ -1962,6 +1968,7 @@ _ELF_DEFINE_RELOC(R_X86_64_IRELATIVE,	37
 
 #define	_ELF_DEFINE_RELOCATIONS()		\
 _ELF_DEFINE_386_RELOCATIONS()			\
+_ELF_DEFINE_AARCH64_RELOCATIONS()		\
 _ELF_DEFINE_AMD64_RELOCATIONS()			\
 _ELF_DEFINE_ARM_RELOCATIONS()			\
 _ELF_DEFINE_IA64_RELOCATIONS()			\

Modified: projects/clang360-import/contrib/elftoolchain/elfcopy/main.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/elfcopy/main.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/elfcopy/main.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -40,7 +40,7 @@
 
 #include "elfcopy.h"
 
-ELFTC_VCSID("$Id: main.c 3111 2014-12-20 08:33:01Z kaiwang27 $");
+ELFTC_VCSID("$Id: main.c 3156 2015-02-15 21:40:01Z emaste $");
 
 enum options
 {

Modified: projects/clang360-import/contrib/elftoolchain/elfcopy/sections.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/elfcopy/sections.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/elfcopy/sections.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -35,7 +35,7 @@
 
 #include "elfcopy.h"
 
-ELFTC_VCSID("$Id: sections.c 3134 2014-12-23 10:43:59Z kaiwang27 $");
+ELFTC_VCSID("$Id: sections.c 3150 2015-02-15 19:07:46Z emaste $");
 
 static void	add_gnu_debuglink(struct elfcopy *ecp);
 static uint32_t calc_crc32(const char *p, size_t len, uint32_t crc);

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h	Tue Feb 17 19:53:41 2015	(r278916)
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: _libdwarf.h 3106 2014-12-19 16:00:58Z kaiwang27 $
+ * $Id: _libdwarf.h 3161 2015-02-15 21:43:36Z emaste $
  */
 
 #ifndef	__LIBDWARF_H_

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_attrval.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_attrval.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_attrval.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -26,7 +26,7 @@
 
 #include "_libdwarf.h"
 
-ELFTC_VCSID("$Id: dwarf_attrval.c 2977 2014-01-21 20:13:31Z kaiwang27 $");
+ELFTC_VCSID("$Id: dwarf_attrval.c 3159 2015-02-15 21:43:27Z emaste $");
 
 int
 dwarf_attrval_flag(Dwarf_Die die, Dwarf_Half attr, Dwarf_Bool *valp, Dwarf_Error *err)

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3	Tue Feb 17 19:53:41 2015	(r278916)
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: dwarf_get_AT_name.3 2071 2011-10-27 03:20:00Z jkoshy $
+.\" $Id: dwarf_get_AT_name.3 3142 2015-01-29 23:11:14Z jkoshy $
 .\"
 .Dd April 22, 2011
 .Os

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3	Tue Feb 17 19:53:41 2015	(r278916)
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: dwarf_get_arange_info.3 2134 2011-11-10 08:40:14Z jkoshy $
+.\" $Id: dwarf_get_arange_info.3 3142 2015-01-29 23:11:14Z jkoshy $
 .\"
 .Dd April 16, 2011
 .Os

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3	Tue Feb 17 19:53:41 2015	(r278916)
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: dwarf_get_section_max_offsets.3 3098 2014-09-02 22:18:29Z kaiwang27 $
+.\" $Id: dwarf_get_section_max_offsets.3 3141 2015-01-29 23:11:10Z jkoshy $
 .\"
-.Dd July 27, 2014
+.Dd December 21, 2014
 .Os
 .Dt DWARF_GET_SECTION_MAX_OFFSETS
 .Sh NAME
@@ -101,7 +101,7 @@ is identical to function
 .Fn dwarf_get_section_max_offsets_b
 except that it does not provide argument
 .Ar debug_types ,
-thus it can not retrieve the size of the
+and thus cannot return the size of the
 .Dq \&.debug_types
 section.
 .Sh RETURN VALUES

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_hasattr.3
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_hasattr.3	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_hasattr.3	Tue Feb 17 19:53:41 2015	(r278916)
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: dwarf_hasattr.3 2073 2011-10-27 03:30:47Z jkoshy $
+.\" $Id: dwarf_hasattr.3 3142 2015-01-29 23:11:14Z jkoshy $
 .\"
 .Dd April 17, 2010
 .Os

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -26,7 +26,7 @@
 
 #include "_libdwarf.h"
 
-ELFTC_VCSID("$Id: dwarf_reloc.c 2075 2011-10-27 03:47:28Z jkoshy $");
+ELFTC_VCSID("$Id: dwarf_reloc.c 3161 2015-02-15 21:43:36Z emaste $");
 
 int
 dwarf_set_reloc_application(int apply)

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3	Tue Feb 17 19:53:41 2015	(r278916)
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: dwarf_set_reloc_application.3 2075 2011-10-27 03:47:28Z jkoshy $
+.\" $Id: dwarf_set_reloc_application.3 3161 2015-02-15 21:43:36Z emaste $
 .\"
 .Dd February 11, 2015
 .Os

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_whatattr.3
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_whatattr.3	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_whatattr.3	Tue Feb 17 19:53:41 2015	(r278916)
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: dwarf_whatattr.3 2075 2011-10-27 03:47:28Z jkoshy $
+.\" $Id: dwarf_whatattr.3 3142 2015-01-29 23:11:14Z jkoshy $
 .\"
 .Dd May 22, 2010
 .Os

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -26,7 +26,7 @@
 
 #include "_libdwarf.h"
 
-ELFTC_VCSID("$Id: libdwarf.c 2070 2011-10-27 03:05:32Z jkoshy $");
+ELFTC_VCSID("$Id: libdwarf.c 3161 2015-02-15 21:43:36Z emaste $");
 
 struct _libdwarf_globals _libdwarf = {
 	.errhand	= NULL,

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h	Tue Feb 17 19:53:41 2015	(r278916)
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: libdwarf.h 3064 2014-06-06 19:35:55Z kaiwang27 $
+ * $Id: libdwarf.h 3149 2015-02-15 19:00:06Z emaste $
  */
 
 #ifndef	_LIBDWARF_H_

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -26,7 +26,7 @@
 
 #include "_libdwarf.h"
 
-ELFTC_VCSID("$Id: libdwarf_elf_init.c 2972 2013-12-23 06:46:04Z kaiwang27 $");
+ELFTC_VCSID("$Id: libdwarf_elf_init.c 3161 2015-02-15 21:43:36Z emaste $");
 
 static const char *debug_name[] = {
 	".debug_abbrev",

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -26,7 +26,7 @@
 
 #include "_libdwarf.h"
 
-ELFTC_VCSID("$Id: libdwarf_reloc.c 2948 2013-05-30 21:25:52Z kaiwang27 $");
+ELFTC_VCSID("$Id: libdwarf_reloc.c 3149 2015-02-15 19:00:06Z emaste $");
 
 Dwarf_Unsigned
 _dwarf_get_reloc_type(Dwarf_P_Debug dbg, int is64)

Modified: projects/clang360-import/contrib/elftoolchain/libelf/_libelf_config.h
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libelf/_libelf_config.h	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libelf/_libelf_config.h	Tue Feb 17 19:53:41 2015	(r278916)
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: _libelf_config.h 2287 2011-12-04 06:45:47Z jkoshy $
+ * $Id: _libelf_config.h 3143 2015-02-15 17:57:38Z emaste $
  */
 
 #ifdef	__DragonFly__

Modified: projects/clang360-import/contrib/elftoolchain/libelf/elf.3
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libelf/elf.3	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libelf/elf.3	Tue Feb 17 19:53:41 2015	(r278916)
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $Id: elf.3 3082 2014-07-28 09:13:33Z jkoshy $
+.\" $Id: elf.3 3142 2015-01-29 23:11:14Z jkoshy $
 .\"
 .Dd July 28, 2014
 .Os

Modified: projects/clang360-import/contrib/elftoolchain/libelf/elf_scn.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libelf/elf_scn.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libelf/elf_scn.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -37,7 +37,7 @@
 
 #include "_libelf.h"
 
-ELFTC_VCSID("$Id: elf_scn.c 3013 2014-03-23 06:16:59Z jkoshy $");
+ELFTC_VCSID("$Id: elf_scn.c 3147 2015-02-15 18:45:23Z emaste $");
 
 /*
  * Load an ELF section table and create a list of Elf_Scn structures.

Modified: projects/clang360-import/contrib/elftoolchain/libelf/libelf_ar_util.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libelf/libelf_ar_util.c	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libelf/libelf_ar_util.c	Tue Feb 17 19:53:41 2015	(r278916)
@@ -34,7 +34,7 @@
 #include "_libelf.h"
 #include "_libelf_ar.h"
 
-ELFTC_VCSID("$Id: libelf_ar_util.c 3013 2014-03-23 06:16:59Z jkoshy $");
+ELFTC_VCSID("$Id: libelf_ar_util.c 3157 2015-02-15 21:42:02Z emaste $");
 
 /*
  * Convert a string bounded by `start' and `start+sz' (exclusive) to a
@@ -278,7 +278,6 @@ _libelf_ar_open(Elf *e, int reporterror)
 	 * Handle special archive members for the SVR4 format.
 	 */
 	if (arh.ar_name[0] == '/') {
-
 		if (sz == 0)
 			goto error;
 

Modified: projects/clang360-import/contrib/elftoolchain/libelf/libelf_convert.m4
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libelf/libelf_convert.m4	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/libelf/libelf_convert.m4	Tue Feb 17 19:53:41 2015	(r278916)
@@ -32,7 +32,7 @@
 
 #include "_libelf.h"
 
-ELFTC_VCSID("$Id: libelf_convert.m4 3009 2014-03-23 01:49:59Z jkoshy $");
+ELFTC_VCSID("$Id: libelf_convert.m4 3158 2015-02-15 21:42:07Z emaste $");
 
 /* WARNING: GENERATED FROM __file__. */
 

Modified: projects/clang360-import/contrib/elftoolchain/nm/nm.1
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/nm/nm.1	Tue Feb 17 19:38:16 2015	(r278915)
+++ projects/clang360-import/contrib/elftoolchain/nm/nm.1	Tue Feb 17 19:53:41 2015	(r278916)
@@ -22,9 +22,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: nm.1 2377 2012-01-03 07:10:59Z jkoshy $
+.\" $Id: nm.1 3145 2015-02-15 18:04:37Z emaste $
 .\"
-.Dd January 8, 2015
+.Dd February 15, 2015
 .Os
 .Dt NM 1
 .Sh NAME

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

More information about the svn-src-projects mailing list