svn commit: r317217 - in projects/clang500-import: . bin/sh bin/sh/tests/parser contrib/elftoolchain/addr2line contrib/elftoolchain/ar contrib/elftoolchain/common contrib/elftoolchain/cxxfilt contr...

Dimitry Andric dim at FreeBSD.org
Thu Apr 20 21:04:26 UTC 2017 

Author: dim
Date: Thu Apr 20 21:04:21 2017
New Revision: 317217
URL: https://svnweb.freebsd.org/changeset/base/317217

Log:
  Merge ^/head r316992 through r317215.

Added:
  projects/clang500-import/bin/sh/tests/parser/alias17.0
     - copied unchanged from r317215, head/bin/sh/tests/parser/alias17.0
  projects/clang500-import/bin/sh/tests/parser/alias18.0
     - copied unchanged from r317215, head/bin/sh/tests/parser/alias18.0
  projects/clang500-import/contrib/elftoolchain/ar/os.FreeBSD.mk
     - copied unchanged from r317215, head/contrib/elftoolchain/ar/os.FreeBSD.mk
  projects/clang500-import/contrib/elftoolchain/elfcopy/os.FreeBSD.mk
     - copied unchanged from r317215, head/contrib/elftoolchain/elfcopy/os.FreeBSD.mk
  projects/clang500-import/share/colldef/zh_TW.Big5.src
     - copied unchanged from r317215, head/share/colldef/zh_TW.Big5.src
  projects/clang500-import/share/ctypedef/zh_TW.Big5.src
     - copied unchanged from r317215, head/share/ctypedef/zh_TW.Big5.src
  projects/clang500-import/share/monetdef/zh_TW.Big5.src
     - copied unchanged from r317215, head/share/monetdef/zh_TW.Big5.src
  projects/clang500-import/share/msgdef/zh_TW.Big5.src
     - copied unchanged from r317215, head/share/msgdef/zh_TW.Big5.src
  projects/clang500-import/share/numericdef/zh_TW.Big5.src
     - copied unchanged from r317215, head/share/numericdef/zh_TW.Big5.src
  projects/clang500-import/sys/arm/mv/armada38x/armada38x_pl310.c
     - copied unchanged from r317215, head/sys/arm/mv/armada38x/armada38x_pl310.c
  projects/clang500-import/sys/crypto/chacha20/chacha.c
     - copied unchanged from r317215, head/sys/crypto/chacha20/chacha.c
  projects/clang500-import/sys/crypto/chacha20/chacha.h
     - copied unchanged from r317215, head/sys/crypto/chacha20/chacha.h
  projects/clang500-import/tools/build/options/WITH_CXX
     - copied unchanged from r317215, head/tools/build/options/WITH_CXX
  projects/clang500-import/tools/build/options/WITH_GROFF
     - copied unchanged from r317215, head/tools/build/options/WITH_GROFF
  projects/clang500-import/tools/build/options/WITH_PROFILE
     - copied unchanged from r317215, head/tools/build/options/WITH_PROFILE
  projects/clang500-import/tools/build/options/WITH_RPCBIND_WARMSTART_SUPPORT
     - copied unchanged from r317215, head/tools/build/options/WITH_RPCBIND_WARMSTART_SUPPORT
  projects/clang500-import/tools/tools/locale/etc/charmaps/Big5.TXT
     - copied unchanged from r317215, head/tools/tools/locale/etc/charmaps/Big5.TXT
  projects/clang500-import/tools/tools/locale/etc/final-maps/map.Big5
     - copied unchanged from r317215, head/tools/tools/locale/etc/final-maps/map.Big5
  projects/clang500-import/usr.bin/diff/tests/group-format.out
     - copied unchanged from r317215, head/usr.bin/diff/tests/group-format.out
  projects/clang500-import/usr.bin/diff/tests/ifdef.out
     - copied unchanged from r317215, head/usr.bin/diff/tests/ifdef.out
  projects/clang500-import/usr.bin/grep/tests/grep_freebsd_test.sh
     - copied unchanged from r317215, head/usr.bin/grep/tests/grep_freebsd_test.sh
Deleted:
  projects/clang500-import/gnu/usr.bin/diff/
  projects/clang500-import/sys/mips/beri/beri_simplebus.c
  projects/clang500-import/sys/mips/beri/fdt_ic_if.m
  projects/clang500-import/tools/build/options/WITHOUT_GNU
  projects/clang500-import/tools/build/options/WITHOUT_GNU_SUPPORT
  projects/clang500-import/usr.bin/dtc/string.hh
Modified:
  projects/clang500-import/Makefile.inc1
  projects/clang500-import/ObsoleteFiles.inc
  projects/clang500-import/UPDATING
  projects/clang500-import/bin/sh/alias.c
  projects/clang500-import/bin/sh/tests/parser/Makefile
  projects/clang500-import/contrib/elftoolchain/addr2line/addr2line.c
  projects/clang500-import/contrib/elftoolchain/common/elfdefinitions.h
  projects/clang500-import/contrib/elftoolchain/cxxfilt/cxxfilt.c
  projects/clang500-import/contrib/elftoolchain/elfcopy/elfcopy.1
  projects/clang500-import/contrib/elftoolchain/elfcopy/main.c
  projects/clang500-import/contrib/elftoolchain/elfcopy/pe.c
  projects/clang500-import/contrib/elftoolchain/elfcopy/symbols.c
  projects/clang500-import/contrib/elftoolchain/elfdump/elfdump.c
  projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf.h
  projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf_attrval.c
  projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf_attrval_signed.3
  projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf_dump.c
  projects/clang500-import/contrib/elftoolchain/libelf/gelf_newehdr.3
  projects/clang500-import/contrib/elftoolchain/libelf/gelf_newphdr.3
  projects/clang500-import/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3
  projects/clang500-import/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c
  projects/clang500-import/contrib/elftoolchain/libelftc/libelftc_dem_arm.c
  projects/clang500-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu2.c
  projects/clang500-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
  projects/clang500-import/contrib/elftoolchain/nm/nm.c
  projects/clang500-import/contrib/elftoolchain/readelf/readelf.c
  projects/clang500-import/contrib/elftoolchain/strings/strings.c
  projects/clang500-import/contrib/ipfilter/lib/parsefields.c
  projects/clang500-import/contrib/ipfilter/tools/ipf_y.y
  projects/clang500-import/contrib/libstdc++/config/abi/pre/gnu.ver
  projects/clang500-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  projects/clang500-import/contrib/llvm/lib/Target/X86/X86RegisterInfo.td
  projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
  projects/clang500-import/contrib/traceroute/findsaddr-socket.c
  projects/clang500-import/contrib/zstd/lib/common/xxhash.c
  projects/clang500-import/etc/mtree/BSD.usr.dist
  projects/clang500-import/etc/rc.d/ldconfig
  projects/clang500-import/gnu/lib/Makefile
  projects/clang500-import/gnu/usr.bin/Makefile
  projects/clang500-import/lib/clang/llvm.build.mk
  projects/clang500-import/lib/libc/gen/telldir.c
  projects/clang500-import/lib/libc/string/wcscoll.c
  projects/clang500-import/lib/libc/sys/kqueue.2
  projects/clang500-import/lib/libc/tests/string/wcscoll_test.c
  projects/clang500-import/lib/libelftc/elftc_version.c
  projects/clang500-import/lib/libjail/jail.c
  projects/clang500-import/lib/libthread_db/libpthread_db.c
  projects/clang500-import/lib/libthread_db/libpthread_db.h
  projects/clang500-import/libexec/rpc.rstatd/rstat_proc.c
  projects/clang500-import/release/tools/vmimage.subr
  projects/clang500-import/sbin/route/route.c
  projects/clang500-import/sbin/routed/table.c
  projects/clang500-import/share/colldef/Makefile
  projects/clang500-import/share/ctypedef/Makefile
  projects/clang500-import/share/man/man4/geom.4
  projects/clang500-import/share/man/man5/src.conf.5
  projects/clang500-import/share/misc/committers-src.dot
  projects/clang500-import/share/mk/auto.obj.mk
  projects/clang500-import/share/mk/src.opts.mk
  projects/clang500-import/share/monetdef/Makefile
  projects/clang500-import/share/msgdef/Makefile
  projects/clang500-import/share/numericdef/Makefile
  projects/clang500-import/sys/amd64/amd64/bpf_jit_machdep.c
  projects/clang500-import/sys/amd64/amd64/efirt.c   (contents, props changed)
  projects/clang500-import/sys/amd64/amd64/genassym.c
  projects/clang500-import/sys/amd64/amd64/minidump_machdep.c
  projects/clang500-import/sys/amd64/amd64/trap.c
  projects/clang500-import/sys/amd64/amd64/uma_machdep.c
  projects/clang500-import/sys/amd64/include/atomic.h
  projects/clang500-import/sys/amd64/include/counter.h
  projects/clang500-import/sys/amd64/include/pcpu.h
  projects/clang500-import/sys/arm/allwinner/a10_gpio.h
  projects/clang500-import/sys/arm/allwinner/aw_cir.c
  projects/clang500-import/sys/arm/arm/intr.c
  projects/clang500-import/sys/arm/arm/machdep.c
  projects/clang500-import/sys/arm/arm/pl310.c
  projects/clang500-import/sys/arm/arm/trap-v4.c
  projects/clang500-import/sys/arm/arm/trap-v6.c
  projects/clang500-import/sys/arm/arm/undefined.c
  projects/clang500-import/sys/arm/conf/ARMADA38X
  projects/clang500-import/sys/arm/freescale/imx/imx6_usbphy.c
  projects/clang500-import/sys/arm/include/counter.h
  projects/clang500-import/sys/arm/include/pcpu.h
  projects/clang500-import/sys/arm/include/pl310.h
  projects/clang500-import/sys/arm/mv/armada38x/armada38x.c
  projects/clang500-import/sys/arm/mv/armada38x/files.armada38x
  projects/clang500-import/sys/arm/mv/mv_machdep.c
  projects/clang500-import/sys/arm/mv/mvreg.h
  projects/clang500-import/sys/arm64/arm64/exception.S
  projects/clang500-import/sys/arm64/arm64/genassym.c
  projects/clang500-import/sys/arm64/arm64/minidump_machdep.c
  projects/clang500-import/sys/arm64/arm64/trap.c
  projects/clang500-import/sys/arm64/arm64/uma_machdep.c
  projects/clang500-import/sys/arm64/include/counter.h
  projects/clang500-import/sys/arm64/include/pcpu.h
  projects/clang500-import/sys/boot/common/md.c
  projects/clang500-import/sys/boot/efi/libefi/efipart.c
  projects/clang500-import/sys/boot/fdt/dts/mips/beri-netfpga.dts
  projects/clang500-import/sys/boot/fdt/dts/mips/beri-sim.dts
  projects/clang500-import/sys/boot/fdt/dts/mips/beripad-de4.dts
  projects/clang500-import/sys/boot/fdt/dts/mips/beripad-sockit.dts
  projects/clang500-import/sys/boot/forth/loader.conf
  projects/clang500-import/sys/boot/i386/libi386/bioscd.c
  projects/clang500-import/sys/boot/i386/libi386/biosdisk.c
  projects/clang500-import/sys/boot/mips/beri/loader/beri_disk_cfi.c
  projects/clang500-import/sys/boot/mips/beri/loader/beri_disk_sdcard.c
  projects/clang500-import/sys/boot/powerpc/ps3/ps3cdrom.c
  projects/clang500-import/sys/boot/powerpc/ps3/ps3disk.c
  projects/clang500-import/sys/boot/uboot/lib/disk.c
  projects/clang500-import/sys/boot/usb/storage/umass_loader.c
  projects/clang500-import/sys/boot/userboot/userboot/userboot_disk.c
  projects/clang500-import/sys/boot/zfs/zfsimpl.c
  projects/clang500-import/sys/cam/ata/ata_all.c
  projects/clang500-import/sys/cam/ata/ata_all.h
  projects/clang500-import/sys/cam/ata/ata_da.c
  projects/clang500-import/sys/cam/ata/ata_xpt.c
  projects/clang500-import/sys/cam/cam_periph.c
  projects/clang500-import/sys/cam/cam_xpt.c
  projects/clang500-import/sys/cam/cam_xpt_internal.h
  projects/clang500-import/sys/cam/cam_xpt_periph.h
  projects/clang500-import/sys/cam/scsi/scsi_all.c
  projects/clang500-import/sys/cam/scsi/scsi_all.h
  projects/clang500-import/sys/cam/scsi/scsi_cd.c
  projects/clang500-import/sys/cam/scsi/scsi_da.c
  projects/clang500-import/sys/cam/scsi/scsi_enc.c
  projects/clang500-import/sys/cam/scsi/scsi_enc_internal.h
  projects/clang500-import/sys/cam/scsi/scsi_xpt.c
  projects/clang500-import/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
  projects/clang500-import/sys/cddl/compat/opensolaris/sys/kmem.h
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/clang500-import/sys/compat/linprocfs/linprocfs.c
  projects/clang500-import/sys/compat/linuxkpi/common/include/linux/page.h
  projects/clang500-import/sys/compat/linuxkpi/common/include/linux/rcupdate.h
  projects/clang500-import/sys/compat/linuxkpi/common/include/linux/sched.h
  projects/clang500-import/sys/compat/linuxkpi/common/include/linux/srcu.h
  projects/clang500-import/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/clang500-import/sys/compat/linuxkpi/common/src/linux_page.c
  projects/clang500-import/sys/compat/linuxkpi/common/src/linux_rcu.c
  projects/clang500-import/sys/compat/linuxkpi/common/src/linux_work.c
  projects/clang500-import/sys/conf/files
  projects/clang500-import/sys/contrib/ipfilter/netinet/radix_ipf.c
  projects/clang500-import/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
  projects/clang500-import/sys/dev/ahci/ahci.c
  projects/clang500-import/sys/dev/ahci/ahci.h
  projects/clang500-import/sys/dev/ahci/ahci_pci.c
  projects/clang500-import/sys/dev/cxgbe/adapter.h
  projects/clang500-import/sys/dev/cxgbe/t4_sge.c
  projects/clang500-import/sys/dev/drm/drmP.h
  projects/clang500-import/sys/dev/drm2/drmP.h
  projects/clang500-import/sys/dev/fb/vesa.c
  projects/clang500-import/sys/dev/fb/vga.c
  projects/clang500-import/sys/dev/ffec/if_ffec.c
  projects/clang500-import/sys/dev/hyperv/vmbus/hyperv.c
  projects/clang500-import/sys/dev/mii/micphy.c
  projects/clang500-import/sys/dev/mii/miidevs
  projects/clang500-import/sys/dev/ofw/ofw_cpu.c
  projects/clang500-import/sys/dev/qlxgbe/ql_hw.c
  projects/clang500-import/sys/dev/qlxgbe/ql_ioctl.c
  projects/clang500-import/sys/dev/qlxgbe/ql_os.c
  projects/clang500-import/sys/dev/qlxgbe/ql_os.h
  projects/clang500-import/sys/dev/random/random_harvestq.c
  projects/clang500-import/sys/dev/random/random_harvestq.h
  projects/clang500-import/sys/dev/syscons/scvgarndr.c
  projects/clang500-import/sys/dev/syscons/syscons.h
  projects/clang500-import/sys/dev/vt/vt_core.c
  projects/clang500-import/sys/dev/vt/vt_cpulogos.c
  projects/clang500-import/sys/dev/watchdog/watchdog.c
  projects/clang500-import/sys/dev/xen/gntdev/gntdev.c
  projects/clang500-import/sys/dev/xen/privcmd/privcmd.c
  projects/clang500-import/sys/fs/ext2fs/ext2_vnops.c
  projects/clang500-import/sys/fs/fuse/fuse_vnops.c
  projects/clang500-import/sys/fs/msdosfs/msdosfs_denode.c
  projects/clang500-import/sys/fs/msdosfs/msdosfs_vnops.c
  projects/clang500-import/sys/fs/nfsclient/nfs_clbio.c
  projects/clang500-import/sys/fs/smbfs/smbfs_io.c
  projects/clang500-import/sys/i386/i386/bpf_jit_machdep.c
  projects/clang500-import/sys/i386/i386/genassym.c
  projects/clang500-import/sys/i386/i386/trap.c
  projects/clang500-import/sys/i386/include/atomic.h
  projects/clang500-import/sys/i386/include/counter.h
  projects/clang500-import/sys/i386/include/pcpu.h
  projects/clang500-import/sys/kern/kern_cpuset.c
  projects/clang500-import/sys/kern/kern_fork.c
  projects/clang500-import/sys/kern/kern_intr.c
  projects/clang500-import/sys/kern/kern_mib.c
  projects/clang500-import/sys/kern/kern_numa.c
  projects/clang500-import/sys/kern/kern_synch.c
  projects/clang500-import/sys/kern/kern_thread.c
  projects/clang500-import/sys/kern/subr_intr.c
  projects/clang500-import/sys/kern/subr_syscall.c
  projects/clang500-import/sys/kern/subr_trap.c
  projects/clang500-import/sys/kern/vfs_bio.c
  projects/clang500-import/sys/libkern/arc4random.c
  projects/clang500-import/sys/mips/beri/beri_pic.c
  projects/clang500-import/sys/mips/beri/files.beri
  projects/clang500-import/sys/mips/conf/std.BERI
  projects/clang500-import/sys/mips/include/counter.h
  projects/clang500-import/sys/mips/include/intr_machdep.h
  projects/clang500-import/sys/mips/include/pcpu.h
  projects/clang500-import/sys/mips/mips/minidump_machdep.c
  projects/clang500-import/sys/mips/mips/uma_machdep.c
  projects/clang500-import/sys/net/bpf_jitter.c
  projects/clang500-import/sys/net/bpf_jitter.h
  projects/clang500-import/sys/net/route.h
  projects/clang500-import/sys/netinet/tcp_lro.c
  projects/clang500-import/sys/netinet/tcp_syncache.c
  projects/clang500-import/sys/netinet/tcp_syncache.h
  projects/clang500-import/sys/netinet6/ip6_output.c
  projects/clang500-import/sys/netpfil/pf/pf_ioctl.c
  projects/clang500-import/sys/netpfil/pf/pf_norm.c
  projects/clang500-import/sys/ofed/drivers/infiniband/core/umem.c
  projects/clang500-import/sys/powerpc/include/counter.h
  projects/clang500-import/sys/powerpc/include/pcpu.h
  projects/clang500-import/sys/powerpc/powerpc/trap.c
  projects/clang500-import/sys/powerpc/powerpc/uma_machdep.c
  projects/clang500-import/sys/riscv/include/counter.h
  projects/clang500-import/sys/riscv/include/pcpu.h
  projects/clang500-import/sys/riscv/riscv/intr_machdep.c
  projects/clang500-import/sys/riscv/riscv/minidump_machdep.c
  projects/clang500-import/sys/sparc64/include/counter.h
  projects/clang500-import/sys/sparc64/include/pcpu.h
  projects/clang500-import/sys/sparc64/sparc64/exception.S
  projects/clang500-import/sys/sparc64/sparc64/genassym.c
  projects/clang500-import/sys/sparc64/sparc64/intr_machdep.c
  projects/clang500-import/sys/sparc64/sparc64/machdep.c
  projects/clang500-import/sys/sparc64/sparc64/mem.c
  projects/clang500-import/sys/sparc64/sparc64/trap.c
  projects/clang500-import/sys/sys/fbio.h
  projects/clang500-import/sys/sys/libkern.h
  projects/clang500-import/sys/sys/param.h
  projects/clang500-import/sys/sys/pcpu.h
  projects/clang500-import/sys/sys/random.h
  projects/clang500-import/sys/sys/vmmeter.h
  projects/clang500-import/sys/ufs/ffs/ffs_balloc.c
  projects/clang500-import/sys/ufs/ffs/ffs_vfsops.c
  projects/clang500-import/sys/vm/device_pager.c
  projects/clang500-import/sys/vm/memguard.c
  projects/clang500-import/sys/vm/sg_pager.c
  projects/clang500-import/sys/vm/swap_pager.c
  projects/clang500-import/sys/vm/vm_fault.c
  projects/clang500-import/sys/vm/vm_meter.c
  projects/clang500-import/sys/vm/vm_object.c
  projects/clang500-import/sys/vm/vm_page.c
  projects/clang500-import/sys/vm/vm_pageout.c
  projects/clang500-import/sys/vm/vm_reserv.c
  projects/clang500-import/sys/vm/vnode_pager.c
  projects/clang500-import/sys/x86/acpica/srat.c
  projects/clang500-import/sys/x86/x86/intr_machdep.c
  projects/clang500-import/sys/x86/xen/xenpv.c
  projects/clang500-import/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang500-import/tools/build/options/WITHOUT_PROFILE
  projects/clang500-import/tools/build/options/makeman
  projects/clang500-import/tools/tools/locale/Makefile
  projects/clang500-import/tools/tools/locale/etc/charmaps.xml
  projects/clang500-import/tools/tools/locale/tools/convert_map.pl
  projects/clang500-import/tools/tools/locale/tools/finalize
  projects/clang500-import/tools/tools/nanobsd/embedded/common
  projects/clang500-import/usr.bin/Makefile
  projects/clang500-import/usr.bin/diff/TODO
  projects/clang500-import/usr.bin/diff/diff.1
  projects/clang500-import/usr.bin/diff/diff.c
  projects/clang500-import/usr.bin/diff/diff.h
  projects/clang500-import/usr.bin/diff/diffreg.c
  projects/clang500-import/usr.bin/diff/tests/Makefile
  projects/clang500-import/usr.bin/diff/tests/diff_test.sh
  projects/clang500-import/usr.bin/dtc/checking.cc
  projects/clang500-import/usr.bin/dtc/dtb.hh
  projects/clang500-import/usr.bin/dtc/dtc.1
  projects/clang500-import/usr.bin/dtc/dtc.cc
  projects/clang500-import/usr.bin/dtc/fdt.cc
  projects/clang500-import/usr.bin/dtc/fdt.hh
  projects/clang500-import/usr.bin/dtc/input_buffer.cc
  projects/clang500-import/usr.bin/dtc/string.cc
  projects/clang500-import/usr.bin/grep/file.c
  projects/clang500-import/usr.bin/grep/grep.1
  projects/clang500-import/usr.bin/grep/grep.c
  projects/clang500-import/usr.bin/grep/grep.h
  projects/clang500-import/usr.bin/grep/tests/Makefile
  projects/clang500-import/usr.bin/grep/util.c
  projects/clang500-import/usr.bin/netstat/route.c
  projects/clang500-import/usr.bin/pom/pom.c
  projects/clang500-import/usr.bin/top/machine.c
  projects/clang500-import/usr.bin/vmstat/vmstat.c
  projects/clang500-import/usr.bin/which/which.c
  projects/clang500-import/usr.sbin/arp/arp.c
  projects/clang500-import/usr.sbin/ndp/ndp.c
  projects/clang500-import/usr.sbin/rarpd/rarpd.c
  projects/clang500-import/usr.sbin/route6d/route6d.c
  projects/clang500-import/usr.sbin/rpcbind/Makefile
  projects/clang500-import/usr.sbin/rpcbind/rpcbind.8
  projects/clang500-import/usr.sbin/rpcbind/rpcbind.c
Directory Properties:
  projects/clang500-import/   (props changed)
  projects/clang500-import/contrib/elftoolchain/   (props changed)
  projects/clang500-import/contrib/elftoolchain/ar/   (props changed)
  projects/clang500-import/contrib/elftoolchain/elfdump/   (props changed)
  projects/clang500-import/contrib/ipfilter/   (props changed)
  projects/clang500-import/contrib/libstdc++/   (props changed)
  projects/clang500-import/contrib/llvm/   (props changed)
  projects/clang500-import/contrib/netbsd-tests/   (props changed)
  projects/clang500-import/gnu/lib/   (props changed)
  projects/clang500-import/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang500-import/sys/contrib/ipfilter/   (props changed)

Modified: projects/clang500-import/Makefile.inc1
==============================================================================
--- projects/clang500-import/Makefile.inc1	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/Makefile.inc1	Thu Apr 20 21:04:21 2017	(r317217)
@@ -1522,8 +1522,8 @@ sign-packages:	_pkgbootstrap .PHONY
 		-o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \
 		${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \
 		${PKGSIGNKEY} ; \
-	ln -s ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \
-		${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest
+	cd ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI); \
+	ln -s ${PKG_VERSION} latest
 
 #
 #
@@ -1972,7 +1972,7 @@ native-xtools: .PHONY
     ${_clang} \
     sbin/md5 \
     sbin/sysctl \
-    gnu/usr.bin/diff \
+    usr.bin/diff \
     usr.bin/awk \
     usr.bin/basename \
     usr.bin/bmake \

Modified: projects/clang500-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang500-import/ObsoleteFiles.inc	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/ObsoleteFiles.inc	Thu Apr 20 21:04:21 2017	(r317217)
@@ -150,6 +150,8 @@ OLD_FILES+=usr/lib/clang/4.0.0/lib/freeb
 OLD_DIRS+=usr/lib/clang/4.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/4.0.0/lib
 OLD_DIRS+=usr/lib/clang/4.0.0
+# 20170420: remove GNU diff
+OLD_FILES+=usr/share/man/man7/diff.7.gz
 # 20170322: rename <x> to <x>_test to match the FreeBSD test suite name scheme
 OLD_FILES+=usr/tests/usr.bin/col/col
 OLD_FILES+=usr/tests/usr.bin/diff/diff
@@ -175,14 +177,6 @@ OLD_FILES+=usr/tests/lib/libc/locale/io_
 # 20170319: remove nls for non supported Big5* locales
 OLD_DIRS+=usr/share/nls/zh_HK.Big5HKSCS
 OLD_DIRS+=usr/share/nls/zh_TW.Big5
-# 20170319: Remove zh_TW.Big5
-OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_COLLATE
-OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_CTYPE
-OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_MESSAGES
-OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_MONETARY
-OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_NUMERIC
-OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_TIME
-OLD_DIRS+=usr/share/locale/zh_TW.Big5
 # 20170313: move .../sys/geom/eli/... to .../sys/geom/class/eli/...
 OLD_FILES+=usr/tests/sys/geom/eli/pbkdf2/pbkdf2
 OLD_FILES+=usr/tests/sys/geom/eli/pbkdf2/Kyuafile

Modified: projects/clang500-import/UPDATING
==============================================================================
--- projects/clang500-import/UPDATING	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/UPDATING	Thu Apr 20 21:04:21 2017	(r317217)
@@ -56,6 +56,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
 	Please see the 20141231 entry below for information about prerequisites
 	and upgrading, if you are not already using clang 3.5.0 or higher.
 
+20170420:
+	GNU diff has been replaced by a BSD licensed diff. Some features of GNU
+	diff has not been implemented, if those are needed a newer version of
+	GNU diff is available via the diffutils package under the gdiff name.
+
 20170413:
 	As of r316810 for ipfilter, keep frags is no longer assumed when
 	keep state is specified in a rule. r316810 aligns ipfilter with

Modified: projects/clang500-import/bin/sh/alias.c
==============================================================================
--- projects/clang500-import/bin/sh/alias.c	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/bin/sh/alias.c	Thu Apr 20 21:04:21 2017	(r317217)
@@ -63,17 +63,8 @@ setalias(const char *name, const char *v
 {
 	struct alias *ap, **app;
 
+	unalias(name);
 	app = hashalias(name);
-	for (ap = *app; ap; ap = ap->next) {
-		if (equal(name, ap->name)) {
-			INTOFF;
-			ckfree(ap->val);
-			ap->val	= savestr(val);
-			INTON;
-			return;
-		}
-	}
-	/* not found */
 	INTOFF;
 	ap = ckmalloc(sizeof (struct alias));
 	ap->name = savestr(name);
@@ -85,6 +76,14 @@ setalias(const char *name, const char *v
 	INTON;
 }
 
+static void
+freealias(struct alias *ap)
+{
+	ckfree(ap->name);
+	ckfree(ap->val);
+	ckfree(ap);
+}
+
 static int
 unalias(const char *name)
 {
@@ -106,9 +105,7 @@ unalias(const char *name)
 			else {
 				INTOFF;
 				*app = ap->next;
-				ckfree(ap->name);
-				ckfree(ap->val);
-				ckfree(ap);
+				freealias(ap);
 				INTON;
 			}
 			aliases--;
@@ -122,19 +119,21 @@ unalias(const char *name)
 static void
 rmaliases(void)
 {
-	struct alias *ap, *tmp;
+	struct alias *ap, **app;
 	int i;
 
 	INTOFF;
 	for (i = 0; i < ATABSIZE; i++) {
-		ap = atab[i];
-		atab[i] = NULL;
-		while (ap) {
-			ckfree(ap->name);
-			ckfree(ap->val);
-			tmp = ap;
-			ap = ap->next;
-			ckfree(tmp);
+		app = &atab[i];
+		while (*app) {
+			ap = *app;
+			if (ap->flag & ALIASINUSE) {
+				*ap->name = '\0';
+				app = &(*app)->next;
+			} else {
+				*app = ap->next;
+				freealias(ap);
+			}
 		}
 	}
 	aliases = 0;

Modified: projects/clang500-import/bin/sh/tests/parser/Makefile
==============================================================================
--- projects/clang500-import/bin/sh/tests/parser/Makefile	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/bin/sh/tests/parser/Makefile	Thu Apr 20 21:04:21 2017	(r317217)
@@ -23,6 +23,8 @@ ${PACKAGE}FILES+=	alias13.0
 ${PACKAGE}FILES+=	alias14.0
 ${PACKAGE}FILES+=	alias15.0 alias15.0.stdout
 ${PACKAGE}FILES+=	alias16.0
+${PACKAGE}FILES+=	alias17.0
+${PACKAGE}FILES+=	alias18.0
 ${PACKAGE}FILES+=	and-pipe-not.0
 ${PACKAGE}FILES+=	case1.0
 ${PACKAGE}FILES+=	case2.0

Copied: projects/clang500-import/bin/sh/tests/parser/alias17.0 (from r317215, head/bin/sh/tests/parser/alias17.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang500-import/bin/sh/tests/parser/alias17.0	Thu Apr 20 21:04:21 2017	(r317217, copy of r317215, head/bin/sh/tests/parser/alias17.0)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+v=1
+alias a='unalias -a
+v=2'
+eval a
+[ "$v" = 2 ]

Copied: projects/clang500-import/bin/sh/tests/parser/alias18.0 (from r317215, head/bin/sh/tests/parser/alias18.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang500-import/bin/sh/tests/parser/alias18.0	Thu Apr 20 21:04:21 2017	(r317217, copy of r317215, head/bin/sh/tests/parser/alias18.0)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+v=1
+alias a='alias a=v=2
+v=3
+a'
+eval a
+[ "$v" = 2 ]

Modified: projects/clang500-import/contrib/elftoolchain/addr2line/addr2line.c
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/addr2line/addr2line.c	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/addr2line/addr2line.c	Thu Apr 20 21:04:21 2017	(r317217)
@@ -40,7 +40,7 @@
 #include "uthash.h"
 #include "_elftc.h"
 
-ELFTC_VCSID("$Id: addr2line.c 3446 2016-05-03 01:31:17Z emaste $");
+ELFTC_VCSID("$Id: addr2line.c 3499 2016-11-25 16:06:29Z emaste $");
 
 struct Func {
 	char *name;
@@ -720,11 +720,11 @@ main(int argc, char **argv)
 	if (argc > 0)
 		for (i = 0; i < argc; i++)
 			translate(dbg, e, argv[i]);
-	else
-		while (fgets(line, sizeof(line), stdin) != NULL) {
+	else {
+		setvbuf(stdout, NULL, _IOLBF, 0);
+		while (fgets(line, sizeof(line), stdin) != NULL)
 			translate(dbg, e, line);
-			fflush(stdout);
-		}
+	}
 
 	dwarf_finish(dbg, &de);
 

Copied: projects/clang500-import/contrib/elftoolchain/ar/os.FreeBSD.mk (from r317215, head/contrib/elftoolchain/ar/os.FreeBSD.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang500-import/contrib/elftoolchain/ar/os.FreeBSD.mk	Thu Apr 20 21:04:21 2017	(r317217, copy of r317215, head/contrib/elftoolchain/ar/os.FreeBSD.mk)
@@ -0,0 +1,2 @@
+DPADD+= ${LIBBZ2}
+LDADD+= -lbz2

Modified: projects/clang500-import/contrib/elftoolchain/common/elfdefinitions.h
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/common/elfdefinitions.h	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/common/elfdefinitions.h	Thu Apr 20 21:04:21 2017	(r317217)
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: elfdefinitions.h 3485 2016-08-18 13:38:52Z emaste $
+ * $Id: elfdefinitions.h 3515 2017-01-24 22:04:22Z emaste $
  */
 
 /*
@@ -153,6 +153,8 @@ _ELF_DEFINE_DT(DT_SUNW_FILTER,      0x60
 	"offset of string naming standard filtees")			\
 _ELF_DEFINE_DT(DT_SUNW_CAP,         0x60000010UL,			\
 	"address of hardware capabilities section")			\
+_ELF_DEFINE_DT(DT_SUNW_ASLR,        0x60000023UL,			\
+	"Address Space Layout Randomization flag")			\
 _ELF_DEFINE_DT(DT_HIOS,             0x6FFFF000UL,			\
 	"end of OS-specific types")					\
 _ELF_DEFINE_DT(DT_VALRNGLO,         0x6FFFFD00UL,			\
@@ -919,6 +921,12 @@ _ELF_DEFINE_PT(PT_GNU_STACK,	    0x6474E
 	"Stack flags")						\
 _ELF_DEFINE_PT(PT_GNU_RELRO,	    0x6474E552UL,		\
 	"Segment becomes read-only after relocation")		\
+_ELF_DEFINE_PT(PT_OPENBSD_RANDOMIZE,0x65A3DBE6UL,		\
+	"Segment filled with random data")			\
+_ELF_DEFINE_PT(PT_OPENBSD_WXNEEDED, 0x65A3DBE7UL,		\
+	"Program violates W^X")					\
+_ELF_DEFINE_PT(PT_OPENBSD_BOOTDATA, 0x65A41BE6UL,		\
+	"Boot data")						\
 _ELF_DEFINE_PT(PT_SUNWBSS,          0x6FFFFFFAUL,		\
 	"A Solaris .SUNW_bss section")				\
 _ELF_DEFINE_PT(PT_SUNWSTACK,        0x6FFFFFFBUL,		\

Modified: projects/clang500-import/contrib/elftoolchain/cxxfilt/cxxfilt.c
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/cxxfilt/cxxfilt.c	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/cxxfilt/cxxfilt.c	Thu Apr 20 21:04:21 2017	(r317217)
@@ -35,7 +35,7 @@
 
 #include "_elftc.h"
 
-ELFTC_VCSID("$Id: cxxfilt.c 3454 2016-05-07 17:11:05Z kaiwang27 $");
+ELFTC_VCSID("$Id: cxxfilt.c 3499 2016-11-25 16:06:29Z emaste $");
 
 #define	STRBUFSZ	8192
 
@@ -175,6 +175,7 @@ main(int argc, char **argv)
 	} else {
 		p = 0;
 		for (;;) {
+			setvbuf(stdout, NULL, _IOLBF, 0);
 			c = fgetc(stdin);
 			if (c == EOF || !(isalnum(c) || strchr(".$_", c))) {
 				if (p > 0) {

Modified: projects/clang500-import/contrib/elftoolchain/elfcopy/elfcopy.1
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/elfcopy/elfcopy.1	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/elfcopy/elfcopy.1	Thu Apr 20 21:04:21 2017	(r317217)
@@ -23,7 +23,7 @@
 .\"
 .\" $Id: elfcopy.1 3426 2016-03-05 13:32:28Z emaste $
 .\"
-.Dd March 5, 2016
+.Dd April 20, 2017
 .Os
 .Dt ELFCOPY 1
 .Sh NAME
@@ -83,6 +83,7 @@
 .Op Fl -srec-forceS3
 .Op Fl -srec-len Ns = Ns Ar val
 .Op Fl -strip-dwo
+.Op Fl -strip-symbols= Ns Ar filename
 .Op Fl -strip-unneeded
 .Ar infile
 .Op Ar outfile
@@ -339,6 +340,10 @@ This option is only meaningful when the 
 .Dq srec .
 .It Fl -strip-dwo
 Do not copy .dwo debug sections to the output file.
+.It Fl -strip-symbols= Ns Ar filename
+Do not copy any of the symbols specified by
+.Ar filename
+to the output.
 .It Fl -strip-unneeded
 Do not copy symbols that are not needed for relocation processing.
 .El

Modified: projects/clang500-import/contrib/elftoolchain/elfcopy/main.c
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/elfcopy/main.c	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/elfcopy/main.c	Thu Apr 20 21:04:21 2017	(r317217)
@@ -39,7 +39,7 @@
 
 #include "elfcopy.h"
 
-ELFTC_VCSID("$Id: main.c 3446 2016-05-03 01:31:17Z emaste $");
+ELFTC_VCSID("$Id: main.c 3520 2017-04-17 01:47:52Z kaiwang27 $");
 
 enum options
 {
@@ -285,6 +285,7 @@ create_elf(struct elfcopy *ecp)
 	size_t		 ishnum;
 
 	ecp->flags |= SYMTAB_INTACT;
+	ecp->flags &= ~SYMTAB_EXIST;
 
 	/* Create EHDR. */
 	if (gelf_getehdr(ecp->ein, &ieh) == NULL)
@@ -499,6 +500,10 @@ free_elf(struct elfcopy *ecp)
 		}
 	}
 
+	ecp->symtab = NULL;
+	ecp->strtab = NULL;
+	ecp->shstrtab = NULL;
+
 	if (ecp->secndx != NULL) {
 		free(ecp->secndx);
 		ecp->secndx = NULL;

Copied: projects/clang500-import/contrib/elftoolchain/elfcopy/os.FreeBSD.mk (from r317215, head/contrib/elftoolchain/elfcopy/os.FreeBSD.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang500-import/contrib/elftoolchain/elfcopy/os.FreeBSD.mk	Thu Apr 20 21:04:21 2017	(r317217, copy of r317215, head/contrib/elftoolchain/elfcopy/os.FreeBSD.mk)
@@ -0,0 +1,4 @@
+.if !defined(LIBELF_AR)
+DPADD+= ${LIBBZ2}
+LDADD+= -lbz2
+.endif

Modified: projects/clang500-import/contrib/elftoolchain/elfcopy/pe.c
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/elfcopy/pe.c	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/elfcopy/pe.c	Thu Apr 20 21:04:21 2017	(r317217)
@@ -34,7 +34,7 @@
 
 #include "elfcopy.h"
 
-ELFTC_VCSID("$Id: pe.c 3490 2016-08-31 00:12:22Z emaste $");
+ELFTC_VCSID("$Id: pe.c 3508 2016-12-27 06:19:39Z kaiwang27 $");
 
 /* Convert ELF object to Portable Executable (PE). */
 void

Modified: projects/clang500-import/contrib/elftoolchain/elfcopy/symbols.c
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/elfcopy/symbols.c	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/elfcopy/symbols.c	Thu Apr 20 21:04:21 2017	(r317217)
@@ -34,7 +34,7 @@
 
 #include "elfcopy.h"
 
-ELFTC_VCSID("$Id: symbols.c 3446 2016-05-03 01:31:17Z emaste $");
+ELFTC_VCSID("$Id: symbols.c 3520 2017-04-17 01:47:52Z kaiwang27 $");
 
 /* Backwards compatibility for systems with older ELF definitions. */
 #ifndef STB_GNU_UNIQUE
@@ -676,6 +676,8 @@ create_symtab(struct elfcopy *ecp)
 	sy = ecp->symtab;
 	st = ecp->strtab;
 
+	assert(sy != NULL && st != NULL);
+
 	/*
 	 * Set section index map for .symtab and .strtab. We need to set
 	 * these map because otherwise symbols which refer to .symtab and

Modified: projects/clang500-import/contrib/elftoolchain/elfdump/elfdump.c
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/elfdump/elfdump.c	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/elfdump/elfdump.c	Thu Apr 20 21:04:21 2017	(r317217)
@@ -50,7 +50,7 @@
 
 #include "_elftc.h"
 
-ELFTC_VCSID("$Id: elfdump.c 3482 2016-08-02 18:47:00Z emaste $");
+ELFTC_VCSID("$Id: elfdump.c 3497 2016-10-17 20:57:22Z emaste $");
 
 #if defined(ELFTC_NEED_ELF_NOTE_DEFINITION)
 #include "native-elf-format.h"
@@ -223,9 +223,9 @@ d_tags(uint64_t tag)
 	case 0x6ffffff0:	return "DT_GNU_VERSYM";
 	/* 0x70000000 - 0x7fffffff processor-specific semantics */
 	case 0x70000000:	return "DT_IA_64_PLT_RESERVE";
-	case 0x7ffffffd:	return "DT_SUNW_AUXILIARY";
-	case 0x7ffffffe:	return "DT_SUNW_USED";
-	case 0x7fffffff:	return "DT_SUNW_FILTER";
+	case DT_AUXILIARY:	return "DT_AUXILIARY";
+	case DT_USED:		return "DT_USED";
+	case DT_FILTER:		return "DT_FILTER";
 	}
 
 	snprintf(unknown_buf, sizeof(unknown_buf),

Modified: projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf.h
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf.h	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf.h	Thu Apr 20 21:04:21 2017	(r317217)
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: dwarf.h 3052 2014-05-26 20:36:24Z kaiwang27 $
+ * $Id: dwarf.h 3494 2016-09-20 17:16:13Z emaste $
  */
 
 #ifndef	_DWARF_H_
@@ -208,6 +208,25 @@
 #define DW_AT_lo_user			0x2000
 #define DW_AT_hi_user			0x3fff
 
+/* SGI/MIPS extensions. */
+#define DW_AT_MIPS_fde				0x2001
+#define DW_AT_MIPS_loop_begin			0x2002
+#define DW_AT_MIPS_tail_loop_begin		0x2003
+#define DW_AT_MIPS_epilog_begin			0x2004
+#define DW_AT_MIPS_loop_unroll_factor		0x2005
+#define DW_AT_MIPS_software_pipeline_depth	0x2006
+#define DW_AT_MIPS_linkage_name			0x2007
+#define DW_AT_MIPS_stride			0x2008
+#define DW_AT_MIPS_abstract_name		0x2009
+#define DW_AT_MIPS_clone_origin			0x200a
+#define DW_AT_MIPS_has_inlines			0x200b
+#define DW_AT_MIPS_stride_byte			0x200c
+#define DW_AT_MIPS_stride_elem			0x200d
+#define DW_AT_MIPS_ptr_dopetype			0x200e
+#define DW_AT_MIPS_allocatable_dopetype		0x200f
+#define DW_AT_MIPS_assumed_shape_dopetype	0x2010
+#define DW_AT_MIPS_assumed_size			0x2011
+
 /* GNU extensions. */
 #define	DW_AT_sf_names				0x2101
 #define	DW_AT_src_info				0x2102
@@ -505,6 +524,7 @@
 #define DW_LANG_UPC		 	0x0012
 #define DW_LANG_D		 	0x0013
 #define DW_LANG_lo_user		 	0x8000
+#define DW_LANG_Mips_Assembler		0x8001
 #define DW_LANG_hi_user		 	0xffff
 
 #define DW_ID_case_sensitive	 	0x00

Modified: projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf_attrval.c
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf_attrval.c	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf_attrval.c	Thu Apr 20 21:04:21 2017	(r317217)
@@ -26,7 +26,7 @@
 
 #include "_libdwarf.h"
 
-ELFTC_VCSID("$Id: dwarf_attrval.c 3159 2015-02-15 21:43:27Z emaste $");
+ELFTC_VCSID("$Id: dwarf_attrval.c 3509 2016-12-29 03:58:41Z emaste $");
 
 int
 dwarf_attrval_flag(Dwarf_Die die, Dwarf_Half attr, Dwarf_Bool *valp, Dwarf_Error *err)

Modified: projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf_attrval_signed.3
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf_attrval_signed.3	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf_attrval_signed.3	Thu Apr 20 21:04:21 2017	(r317217)
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: dwarf_attrval_signed.3 2980 2014-01-21 20:15:54Z kaiwang27 $
+.\" $Id: dwarf_attrval_signed.3 3509 2016-12-29 03:58:41Z emaste $
 .\"
 .Dd December 26, 2016
 .Os

Modified: projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf_dump.c
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf_dump.c	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/libdwarf/dwarf_dump.c	Thu Apr 20 21:04:21 2017	(r317217)
@@ -27,7 +27,7 @@
 
 #include "_libdwarf.h"
 
-ELFTC_VCSID("$Id: dwarf_dump.c 3052 2014-05-26 20:36:24Z kaiwang27 $");
+ELFTC_VCSID("$Id: dwarf_dump.c 3494 2016-09-20 17:16:13Z emaste $");
 
 int
 dwarf_get_ACCESS_name(unsigned access, const char **s)
@@ -262,6 +262,40 @@ dwarf_get_AT_name(unsigned attr, const c
 		*s = "DW_AT_body_begin"; break;
 	case DW_AT_body_end:
 		*s = "DW_AT_body_end"; break;
+	case DW_AT_MIPS_fde:
+		*s = "DW_AT_MIPS_fde"; break;
+	case DW_AT_MIPS_loop_begin:
+		*s = "DW_AT_MIPS_loop_begin"; break;
+	case DW_AT_MIPS_tail_loop_begin:
+		*s = "DW_AT_MIPS_tail_loop_begin"; break;
+	case DW_AT_MIPS_epilog_begin:
+		*s = "DW_AT_MIPS_epilog_begin"; break;
+	case DW_AT_MIPS_loop_unroll_factor:
+		*s = "DW_AT_MIPS_loop_unroll_factor"; break;
+	case DW_AT_MIPS_software_pipeline_depth:
+		*s = "DW_AT_MIPS_software_pipeline_depth"; break;
+	case DW_AT_MIPS_linkage_name:
+		*s = "DW_AT_MIPS_linkage_name"; break;
+	case DW_AT_MIPS_stride:
+		*s = "DW_AT_MIPS_stride"; break;
+	case DW_AT_MIPS_abstract_name:
+		*s = "DW_AT_MIPS_abstract_name"; break;
+	case DW_AT_MIPS_clone_origin:
+		*s = "DW_AT_MIPS_clone_origin"; break;
+	case DW_AT_MIPS_has_inlines:
+		*s = "DW_AT_MIPS_has_inlines"; break;
+	case DW_AT_MIPS_stride_byte:
+		*s = "DW_AT_MIPS_stride_byte"; break;
+	case DW_AT_MIPS_stride_elem:
+		*s = "DW_AT_MIPS_stride_elem"; break;
+	case DW_AT_MIPS_ptr_dopetype:
+		*s = "DW_AT_MIPS_ptr_dopetype"; break;
+	case DW_AT_MIPS_allocatable_dopetype:
+		*s = "DW_AT_MIPS_allocatable_dopetype"; break;
+	case DW_AT_MIPS_assumed_shape_dopetype:
+		*s = "DW_AT_MIPS_assumed_shape_dopetype"; break;
+	case DW_AT_MIPS_assumed_size:
+		*s = "DW_AT_MIPS_assumed_size"; break;
 	case DW_AT_GNU_vector:
 		*s = "DW_AT_GNU_vector"; break;
 	case DW_AT_GNU_guarded_by:
@@ -756,6 +790,8 @@ dwarf_get_LANG_name(unsigned lang, const
 		*s = "DW_LANG_D"; break;
 	case DW_LANG_lo_user:
 		*s = "DW_LANG_lo_user"; break;
+	case DW_LANG_Mips_Assembler:
+		*s = "DW_LANG_Mips_Assembler"; break;
 	case DW_LANG_hi_user:
 		*s = "DW_LANG_hi_user"; break;
 	default:

Modified: projects/clang500-import/contrib/elftoolchain/libelf/gelf_newehdr.3
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/libelf/gelf_newehdr.3	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/libelf/gelf_newehdr.3	Thu Apr 20 21:04:21 2017	(r317217)
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $Id: gelf_newehdr.3 189 2008-07-20 10:38:08Z jkoshy $
+.\" $Id: gelf_newehdr.3 3500 2016-12-04 11:08:44Z jkoshy $
 .\"
 .Dd October 22, 2007
 .Os
@@ -127,6 +127,15 @@ flag on ELF descriptor
 .Sh RETURN VALUES
 These functions return a pointer to a translated header descriptor
 if successful, or NULL on failure.
+.Sh COMPATIBILITY
+The
+.Fn gelf_newehdr
+function uses a type of
+.Ft "void *"
+for its returned value.
+This differs from some other implementations of the ELF(3) API, which use an
+.Ft "unsigned long"
+return type.
 .Sh ERRORS
 These functions can fail with the following errors:
 .Bl -tag -width "[ELF_E_RESOURCE]"

Modified: projects/clang500-import/contrib/elftoolchain/libelf/gelf_newphdr.3
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/libelf/gelf_newphdr.3	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/libelf/gelf_newphdr.3	Thu Apr 20 21:04:21 2017	(r317217)
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $Id: gelf_newphdr.3 189 2008-07-20 10:38:08Z jkoshy $
+.\" $Id: gelf_newphdr.3 3500 2016-12-04 11:08:44Z jkoshy $
 .\"
 .Dd October 22, 2007
 .Os
@@ -97,6 +97,15 @@ will no longer be valid.
 .Sh RETURN VALUES
 The functions a valid pointer if successful, or NULL in case an error
 was encountered.
+.Sh COMPATIBILITY
+The
+.Fn gelf_newphdr
+function uses a type of
+.Ft "void *"
+for its returned value.
+This differs from some other implementations of the ELF(3) API, which use an
+.Ft "unsigned long"
+return type.
 .Sh ERRORS
 These functions may fail with the following errors:
 .Bl -tag -width "[ELF_E_RESOURCE]"

Modified: projects/clang500-import/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3	Thu Apr 20 21:04:21 2017	(r317217)
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $Id: elftc_bfd_find_target.3 3488 2016-08-24 18:15:57Z emaste $
+.\" $Id: elftc_bfd_find_target.3 3516 2017-02-10 02:33:08Z emaste $
 .\"
 .Dd November 30, 2011
 .Os
@@ -74,6 +74,7 @@ Known descriptor names and their propert
 .It Li elf32-littlearm Ta ELF Ta LSB Ta 32
 .It Li elf32-littlemips Ta ELF Ta LSB Ta 32
 .It Li elf32-powerpc Ta ELF Ta MSB Ta 32
+.It Li elf32-powerpc-freebsd Ta ELF Ta MSB Ta 32
 .It Li elf32-powerpcle Ta ELF Ta LSB Ta 32
 .It Li elf32-sh Ta ELF Ta MSB Ta 32
 .It Li elf32-shl Ta ELF Ta LSB Ta 32
@@ -94,6 +95,7 @@ Known descriptor names and their propert
 .It Li elf64-littleaarch64 Ta ELF Ta LSB Ta 64
 .It Li elf64-littlemips Ta ELF Ta LSB Ta 64
 .It Li elf64-powerpc Ta ELF Ta MSB Ta 64
+.It Li elf64-powerpc-freebsd Ta ELF Ta MSB Ta 64
 .It Li elf64-powerpcle Ta ELF Ta LSB Ta 64
 .It Li elf64-sh64 Ta ELF Ta MSB Ta 64
 .It Li elf64-sh64l Ta ELF Ta LSB Ta 64

Modified: projects/clang500-import/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c	Thu Apr 20 21:04:21 2017	(r317217)
@@ -30,7 +30,7 @@
 
 #include "_libelftc.h"
 
-ELFTC_VCSID("$Id: libelftc_bfdtarget.c 3488 2016-08-24 18:15:57Z emaste $");
+ELFTC_VCSID("$Id: libelftc_bfdtarget.c 3516 2017-02-10 02:33:08Z emaste $");
 
 struct _Elftc_Bfd_Target _libelftc_targets[] = {
 

Modified: projects/clang500-import/contrib/elftoolchain/libelftc/libelftc_dem_arm.c
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/libelftc/libelftc_dem_arm.c	Thu Apr 20 21:01:59 2017	(r317216)
+++ projects/clang500-import/contrib/elftoolchain/libelftc/libelftc_dem_arm.c	Thu Apr 20 21:04:21 2017	(r317217)
@@ -37,7 +37,7 @@
 
 #include "_libelftc.h"
 
-ELFTC_VCSID("$Id: libelftc_dem_arm.c 3447 2016-05-03 13:32:23Z emaste $");
+ELFTC_VCSID("$Id: libelftc_dem_arm.c 3513 2016-12-29 07:04:22Z kaiwang27 $");
 
 /**
  * @file cpp_demangle_arm.c
@@ -68,6 +68,7 @@ struct demangle_data {
 };
 
 #define SIMPLE_HASH(x,y)	(64 * x + y)
+#define VEC_PUSH_STR(d,s)	vector_str_push((d), (s), strlen((s)))
 #define	CPP_DEMANGLE_ARM_TRY	128
 
 static void	dest_cstring(struct cstring *);
@@ -137,7 +138,7 @@ cpp_demangle_ARM(const char *org)
 	++d.p;
 
 	/* start argument types */
-	if (vector_str_push(&d.vec, "(", 1) == false)
+	if (VEC_PUSH_STR(&d.vec, "(") == false)
 		goto clean;
 
 	for (;;) {
@@ -169,21 +170,21 @@ cpp_demangle_ARM(const char *org)
 			goto clean;
 
 		if (d.ptr == true) {
-			if (vector_str_push(&d.vec, "*", 1) == false)
+			if (VEC_PUSH_STR(&d.vec, "*") == false)
 				goto clean;
 
 			d.ptr = false;
 		}
 
 		if (d.ref == true) {
-			if (vector_str_push(&d.vec, "&", 1) == false)
+			if (VEC_PUSH_STR(&d.vec, "&") == false)
 				goto clean;
 
 			d.ref = false;
 		}
 
 		if (d.cnst == true) {
-			if (vector_str_push(&d.vec, " const", 6) == false)
+			if (VEC_PUSH_STR(&d.vec, " const") == false)
 				goto clean;
 
 			d.cnst = false;
@@ -210,7 +211,7 @@ cpp_demangle_ARM(const char *org)
 
 		free(arg);
 
-		if (vector_str_push(&d.vec, ", ", 2) == false)
+		if (VEC_PUSH_STR(&d.vec, ", ") == false)
 			goto clean;
 
 		if (++try > CPP_DEMANGLE_ARM_TRY)
@@ -218,7 +219,7 @@ cpp_demangle_ARM(const char *org)
 	}
 
 	/* end argument types */
-	if (vector_str_push(&d.vec, ")", 1) == false)
+	if (VEC_PUSH_STR(&d.vec, ")") == false)
 		goto clean;
 
 flat:
@@ -323,11 +324,10 @@ push_CTDT(const char *s, size_t l, struc
 		return (false);
 
 	assert(v->size > 1);
-	if (vector_str_push(v, v->container[v->size - 2],
-		strlen(v->container[v->size - 2])) == false)
+	if (VEC_PUSH_STR(v, v->container[v->size - 2]) == false)
 		return (false);
 
-	if (vector_str_push(v, "()", 2) == false)
+	if (VEC_PUSH_STR(v, "()") == false)
 		return (false);
 
 	return (true);
@@ -429,7 +429,7 @@ read_func(struct demangle_data *d)
 		if (read_class(d) == false)
 			return (false);
 
-		if (vector_str_push(&d->vec, "::", 2) == false)
+		if (VEC_PUSH_STR(&d->vec, "::") == false)
 			return (false);
 	}
 
@@ -486,7 +486,7 @@ read_func_name(struct demangle_data *d)
 			if (read_qual_name(d) == false)
 				goto clean;
 
-			if (vector_str_push(&d->vec, "::", 2) == false)
+			if (VEC_PUSH_STR(&d->vec, "::") == false)
 				goto clean;
 
 			if (vector_str_push(&d->vec, op_name, len) == false)
@@ -508,7 +508,7 @@ read_func_name(struct demangle_data *d)
 			if (read_class(d) == false)
 				goto clean;
 
-			if (vector_str_push(&d->vec, "::", 2) == false)
+			if (VEC_PUSH_STR(&d->vec, "::") == false)
 				goto clean;
 
 			if (vector_str_push(&d->vec, op_name, len) == false)
@@ -553,7 +553,7 @@ read_func_ptr(struct demangle_data *d)
 		}
 
 		if (fptr.ptr == true) {
-			if (vector_str_push(&fptr.vec, "*", 1) == false) {
+			if (VEC_PUSH_STR(&fptr.vec, "*") == false) {
 				dest_demangle_data(&fptr);
 
 				return (false);
@@ -563,7 +563,7 @@ read_func_ptr(struct demangle_data *d)
 		}
 
 		if (fptr.ref == true) {
-			if (vector_str_push(&fptr.vec, "&", 1) == false) {
+			if (VEC_PUSH_STR(&fptr.vec, "&") == false) {
 				dest_demangle_data(&fptr);
 
 				return (false);
@@ -573,7 +573,7 @@ read_func_ptr(struct demangle_data *d)
 		}
 
 		if (fptr.cnst == true) {
-			if (vector_str_push(&fptr.vec, " const", 6) == false) {
+			if (VEC_PUSH_STR(&fptr.vec, " const") == false) {
 				dest_demangle_data(&fptr);
 
 				return (false);
@@ -585,7 +585,7 @@ read_func_ptr(struct demangle_data *d)
 		if (*fptr.p == '_')
 			break;
 
-		if (vector_str_push(&fptr.vec, ", ", 2) == false) {
+		if (VEC_PUSH_STR(&fptr.vec, ", ") == false) {
 			dest_demangle_data(&fptr);
 
 			return (false);
@@ -636,7 +636,7 @@ read_func_ptr(struct demangle_data *d)
 
 	free(rtn_type);
 
-	if (vector_str_push(&d->vec, " (*)(", 5) == false) {
+	if (VEC_PUSH_STR(&d->vec, " (*)(") == false) {
 		free(arg_type);
 
 		return (false);
@@ -650,7 +650,7 @@ read_func_ptr(struct demangle_data *d)
 
 	free(arg_type);
 
-	return (vector_str_push(&d->vec, ")", 1));
+	return (VEC_PUSH_STR(&d->vec, ")"));
 }
 
 static bool
@@ -689,7 +689,7 @@ read_memptr(struct demangle_data *d)
 	if (vector_str_push(&d->vec, mptr_str, len) == false)
 		goto clean;
 
-	if (vector_str_push(&d->vec, "::*", 3) == false)
+	if (VEC_PUSH_STR(&d->vec, "::*") == false)
 		goto clean;
 
 	rtn = true;
@@ -712,108 +712,102 @@ read_op(struct demangle_data *d)
 	switch (SIMPLE_HASH(*(d->p), *(d->p+1))) {
 	case SIMPLE_HASH('m', 'l') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator*", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator*"));
 	case SIMPLE_HASH('d', 'v') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator/", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator/"));
 	case SIMPLE_HASH('m', 'd') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator%", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator%"));
 	case SIMPLE_HASH('p', 'l') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator+", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator+"));
 	case SIMPLE_HASH('m', 'i') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator-", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator-"));
 	case SIMPLE_HASH('l', 's') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator<<", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator<<"));
 	case SIMPLE_HASH('r', 's') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator>>", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator>>"));
 	case SIMPLE_HASH('e', 'q') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator==", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator=="));
 	case SIMPLE_HASH('n', 'e') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator!=", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator!="));
 	case SIMPLE_HASH('l', 't') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator<", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator<"));
 	case SIMPLE_HASH('g', 't') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator>", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator>"));
 	case SIMPLE_HASH('l', 'e') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator<=", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator<="));
 	case SIMPLE_HASH('g', 'e') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator>=", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator>="));
 	case SIMPLE_HASH('a', 'd') :
 		d->p += 2;
 		if (*d->p == 'v') {
 			++d->p;
-			return (vector_str_push(&d->vec, "operator/=",
-				10));
+			return (VEC_PUSH_STR(&d->vec, "operator/="));
 		} else
-			return (vector_str_push(&d->vec, "operator&", 9));
+			return (VEC_PUSH_STR(&d->vec, "operator&"));
 	case SIMPLE_HASH('o', 'r') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator|", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator|"));
 	case SIMPLE_HASH('e', 'r') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator^", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator^"));
 	case SIMPLE_HASH('a', 'a') :
 		d->p += 2;
 		if (*d->p == 'd') {
 			++d->p;
-			return (vector_str_push(&d->vec, "operator&=",
-				10));
+			return (VEC_PUSH_STR(&d->vec, "operator&="));
 		} else
-			return (vector_str_push(&d->vec, "operator&&",
-				10));
+			return (VEC_PUSH_STR(&d->vec, "operator&&"));
 	case SIMPLE_HASH('o', 'o') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator||", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator||"));
 	case SIMPLE_HASH('n', 't') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator!", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator!"));
 	case SIMPLE_HASH('c', 'o') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator~", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator~"));
 	case SIMPLE_HASH('p', 'p') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator++", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator++"));
 	case SIMPLE_HASH('m', 'm') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator--", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator--"));
 	case SIMPLE_HASH('a', 's') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator=", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator="));
 	case SIMPLE_HASH('r', 'f') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator->", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator->"));
 	case SIMPLE_HASH('a', 'p') :
 		/* apl */
 		if (*(d->p + 2) != 'l')
 			return (false);
 
 		d->p += 3;
-		return (vector_str_push(&d->vec, "operator+=", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator+="));
 	case SIMPLE_HASH('a', 'm') :
 		d->p += 2;
 		if (*d->p == 'i') {
 			++d->p;
-			return (vector_str_push(&d->vec, "operator-=",
-				10));
+			return (VEC_PUSH_STR(&d->vec, "operator-="));
 		} else if (*d->p == 'u') {
 			++d->p;
-			return (vector_str_push(&d->vec, "operator*=",
-				10));
+			return (VEC_PUSH_STR(&d->vec, "operator*="));
 		} else if (*d->p == 'd') {
 			++d->p;
-			return (vector_str_push(&d->vec, "operator%=",
-				10));
+			return (VEC_PUSH_STR(&d->vec, "operator%="));
 		}
 
 		return (false);
@@ -823,40 +817,40 @@ read_op(struct demangle_data *d)
 			return (false);
 
 		d->p += 3;
-		return (vector_str_push(&d->vec, "operator<<=", 11));
+		return (VEC_PUSH_STR(&d->vec, "operator<<="));
 	case SIMPLE_HASH('a', 'r') :
 		/* ars */
 		if (*(d->p + 2) != 's')
 			return (false);
 
 		d->p += 3;
-		return (vector_str_push(&d->vec, "operator>>=", 11));
+		return (VEC_PUSH_STR(&d->vec, "operator>>="));
 	case SIMPLE_HASH('a', 'o') :
 		/* aor */
 		if (*(d->p + 2) != 'r')
 			return (false);
 
 		d->p += 3;
-		return (vector_str_push(&d->vec, "operator|=", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator|="));
 	case SIMPLE_HASH('a', 'e') :
 		/* aer */
 		if (*(d->p + 2) != 'r')
 			return (false);
 
 		d->p += 3;
-		return (vector_str_push(&d->vec, "operator^=", 10));
+		return (VEC_PUSH_STR(&d->vec, "operator^="));
 	case SIMPLE_HASH('c', 'm') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator,", 9));
+		return (VEC_PUSH_STR(&d->vec, "operator,"));
 	case SIMPLE_HASH('r', 'm') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator->*", 11));
+		return (VEC_PUSH_STR(&d->vec, "operator->*"));
 	case SIMPLE_HASH('c', 'l') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "()", 2));
+		return (VEC_PUSH_STR(&d->vec, "()"));
 	case SIMPLE_HASH('v', 'c') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "[]", 2));
+		return (VEC_PUSH_STR(&d->vec, "[]"));
 	case SIMPLE_HASH('c', 't') :
 		d->p += 4;
 		d->type = ENCODE_OP_CT;
@@ -883,11 +877,10 @@ read_op(struct demangle_data *d)
 		return (false);
 	case SIMPLE_HASH('n', 'w') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator new()", 14));
+		return (VEC_PUSH_STR(&d->vec, "operator new()"));
 	case SIMPLE_HASH('d', 'l') :
 		d->p += 2;
-		return (vector_str_push(&d->vec, "operator delete()",
-			17));
+		return (VEC_PUSH_STR(&d->vec, "operator delete()"));
 	case SIMPLE_HASH('o', 'p') :
 		/* __op<TO_TYPE>__<FROM_TYPE> */
 		d->p += 2;
@@ -962,13 +955,13 @@ read_op_user(struct demangle_data *d)
 	if (vector_str_push(&d->vec, from_str, from_len) == false)
 		goto clean;
 
-	if (vector_str_push(&d->vec, "::operator ", 11) == false)
+	if (VEC_PUSH_STR(&d->vec, "::operator ") == false)
 		return (false);
 
 	if (vector_str_push(&d->vec, to_str, to_len) == false)
 		goto clean;
 
-	rtn = vector_str_push(&d->vec, "()", 2);
+	rtn = VEC_PUSH_STR(&d->vec, "()");
 clean:
 	free(to_str);
 	free(from_str);
@@ -1000,7 +993,7 @@ read_qual_name(struct demangle_data *d)
 		if (read_class(d) == false)
 			return (false);
 
-		if (vector_str_push(&d->vec, "::", 2) == false)
+		if (VEC_PUSH_STR(&d->vec, "::") == false)
 			return (false);
 	}
 

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

More information about the svn-src-projects mailing list