Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Jan 2015 23:43:14 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r277719 - in projects/clang360-import: . bin/cp bin/expr bin/expr/tests bin/freebsd-version bin/ln bin/mv cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzpoo...
Message-ID:  <201501252343.t0PNhEQF060026@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Sun Jan 25 23:43:12 2015
New Revision: 277719
URL: https://svnweb.freebsd.org/changeset/base/277719

Log:
  Merge ^/head r277327 through r277718.

Added:
  projects/clang360-import/bin/expr/tests/
     - copied from r277718, head/bin/expr/tests/
  projects/clang360-import/contrib/libxo/libxo/xo_error.3
     - copied unchanged from r277718, head/contrib/libxo/libxo/xo_error.3
  projects/clang360-import/contrib/libxo/packaging/libxo.rb.base.in
     - copied unchanged from r277718, head/contrib/libxo/packaging/libxo.rb.base.in
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.H.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.H.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.H.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.H.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.HIPx.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.HIPx.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.HIPx.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.HIPx.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.HP.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.HP.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.HP.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.HP.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.J.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.J.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.J.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.J.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.JP.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.JP.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.JP.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.JP.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.T.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.T.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.T.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.T.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.X.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.X.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.X.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.X.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.XP.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.XP.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_08.XP.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_08.XP.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.H.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.H.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.H.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.H.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.HIPx.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.HIPx.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.HIPx.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.HIPx.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.HP.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.HP.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.HP.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.HP.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.J.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.J.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.J.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.J.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.JP.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.JP.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.JP.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.JP.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.T.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.T.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.T.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.T.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.X.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.X.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.X.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.X.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.XP.err
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.XP.err
  projects/clang360-import/contrib/libxo/tests/core/saved/test_09.XP.out
     - copied unchanged from r277718, head/contrib/libxo/tests/core/saved/test_09.XP.out
  projects/clang360-import/contrib/libxo/tests/core/test_08.c
     - copied unchanged from r277718, head/contrib/libxo/tests/core/test_08.c
  projects/clang360-import/contrib/libxo/tests/core/test_09.c
     - copied unchanged from r277718, head/contrib/libxo/tests/core/test_09.c
  projects/clang360-import/etc/newsyslog.conf.d/
     - copied from r277718, head/etc/newsyslog.conf.d/
  projects/clang360-import/etc/tests/rc.d/
     - copied from r277718, head/etc/tests/rc.d/
  projects/clang360-import/lib/libc/sys/futimens.c
     - copied unchanged from r277718, head/lib/libc/sys/futimens.c
  projects/clang360-import/lib/libc/sys/utimensat.2
     - copied unchanged from r277718, head/lib/libc/sys/utimensat.2
  projects/clang360-import/lib/libc/sys/utimensat.c
     - copied unchanged from r277718, head/lib/libc/sys/utimensat.c
  projects/clang360-import/lib/libthr/arch/common/
     - copied from r277718, head/lib/libthr/arch/common/
  projects/clang360-import/lib/libthr/thread/thr_ctrdtr.c
     - copied unchanged from r277718, head/lib/libthr/thread/thr_ctrdtr.c
  projects/clang360-import/release/Makefile.vm
     - copied unchanged from r277718, head/release/Makefile.vm
  projects/clang360-import/release/scripts/mk-vmimage.sh
     - copied unchanged from r277718, head/release/scripts/mk-vmimage.sh
  projects/clang360-import/release/tools/gce.conf
     - copied unchanged from r277718, head/release/tools/gce.conf
  projects/clang360-import/release/tools/openstack.conf
     - copied unchanged from r277718, head/release/tools/openstack.conf
  projects/clang360-import/release/tools/vmimage.subr
     - copied unchanged from r277718, head/release/tools/vmimage.subr
  projects/clang360-import/sys/arm/arm/bus_space_base.c
     - copied unchanged from r277718, head/sys/arm/arm/bus_space_base.c
  projects/clang360-import/sys/arm/freescale/imx/imx6_audmux.c
     - copied unchanged from r277718, head/sys/arm/freescale/imx/imx6_audmux.c
  projects/clang360-import/sys/arm/freescale/imx/imx6_sdma.c
     - copied unchanged from r277718, head/sys/arm/freescale/imx/imx6_sdma.c
  projects/clang360-import/sys/arm/freescale/imx/imx6_sdma.h
     - copied unchanged from r277718, head/sys/arm/freescale/imx/imx6_sdma.h
  projects/clang360-import/sys/arm/freescale/imx/imx6_ssi.c
     - copied unchanged from r277718, head/sys/arm/freescale/imx/imx6_ssi.c
  projects/clang360-import/sys/dev/drm2/i915/i915_gem_stolen.c
     - copied unchanged from r277718, head/sys/dev/drm2/i915/i915_gem_stolen.c
  projects/clang360-import/sys/dev/drm2/i915/intel_ddi.c
     - copied unchanged from r277718, head/sys/dev/drm2/i915/intel_ddi.c
  projects/clang360-import/sys/dev/drm2/i915/intel_pm.c
     - copied unchanged from r277718, head/sys/dev/drm2/i915/intel_pm.c
  projects/clang360-import/sys/net/rss_config.c
     - copied unchanged from r277718, head/sys/net/rss_config.c
  projects/clang360-import/sys/net/rss_config.h
     - copied unchanged from r277718, head/sys/net/rss_config.h
  projects/clang360-import/sys/net/toeplitz.c
     - copied unchanged from r277718, head/sys/net/toeplitz.c
  projects/clang360-import/sys/net/toeplitz.h
     - copied unchanged from r277718, head/sys/net/toeplitz.h
  projects/clang360-import/sys/netinet6/in6_rss.c
     - copied unchanged from r277718, head/sys/netinet6/in6_rss.c
  projects/clang360-import/sys/netinet6/in6_rss.h
     - copied unchanged from r277718, head/sys/netinet6/in6_rss.h
  projects/clang360-import/tools/build/options/WITHOUT_BSDINSTALL
     - copied unchanged from r277718, head/tools/build/options/WITHOUT_BSDINSTALL
  projects/clang360-import/tools/build/options/WITHOUT_CCD
     - copied unchanged from r277718, head/tools/build/options/WITHOUT_CCD
  projects/clang360-import/tools/build/options/WITHOUT_EE
     - copied unchanged from r277718, head/tools/build/options/WITHOUT_EE
  projects/clang360-import/tools/build/options/WITHOUT_ISCSI
     - copied unchanged from r277718, head/tools/build/options/WITHOUT_ISCSI
  projects/clang360-import/tools/build/options/WITHOUT_TALK
     - copied unchanged from r277718, head/tools/build/options/WITHOUT_TALK
  projects/clang360-import/usr.sbin/pw/tests/pw_groupshow.sh
     - copied unchanged from r277718, head/usr.sbin/pw/tests/pw_groupshow.sh
  projects/clang360-import/usr.sbin/pw/tests/pw_usershow.sh
     - copied unchanged from r277718, head/usr.sbin/pw/tests/pw_usershow.sh
Deleted:
  projects/clang360-import/lib/libthr/arch/amd64/amd64/pthread_md.c
  projects/clang360-import/lib/libthr/arch/arm/Makefile.inc
  projects/clang360-import/lib/libthr/arch/arm/arm/
  projects/clang360-import/lib/libthr/arch/i386/i386/pthread_md.c
  projects/clang360-import/lib/libthr/arch/mips/Makefile.inc
  projects/clang360-import/lib/libthr/arch/mips/mips/
  projects/clang360-import/lib/libthr/arch/powerpc/Makefile.inc
  projects/clang360-import/lib/libthr/arch/powerpc/powerpc/
  projects/clang360-import/lib/libthr/arch/sparc64/sparc64/pthread_md.c
  projects/clang360-import/release/amd64/mk-azure.sh
  projects/clang360-import/release/amd64/mk-vmimage.sh
  projects/clang360-import/release/i386/mk-azure.sh
  projects/clang360-import/release/i386/mk-vmimage.sh
  projects/clang360-import/share/man/man9/spl.9
  projects/clang360-import/sys/arm/arm/bus_space-v6.c
  projects/clang360-import/sys/arm/lpc/lpc_space.c
  projects/clang360-import/sys/arm/mv/bus_space.c
  projects/clang360-import/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c
  projects/clang360-import/sys/arm/versatile/bus_space.c
  projects/clang360-import/sys/arm/versatile/versatile_pci_bus_space.c
  projects/clang360-import/sys/arm/versatile/versatile_pci_bus_space.h
  projects/clang360-import/sys/arm/xilinx/zy7_bus_space.c
  projects/clang360-import/sys/arm/xscale/i80321/obio_space.c
  projects/clang360-import/sys/arm/xscale/i8134x/obio_space.c
  projects/clang360-import/sys/netinet/toeplitz.c
  projects/clang360-import/sys/netinet/toeplitz.h
  projects/clang360-import/tools/regression/lib/libc/stdio/test-fmemopen.t
Modified:
  projects/clang360-import/Makefile.inc1
  projects/clang360-import/ObsoleteFiles.inc
  projects/clang360-import/bin/cp/utils.c
  projects/clang360-import/bin/expr/Makefile
  projects/clang360-import/bin/freebsd-version/Makefile
  projects/clang360-import/bin/ln/symlink.7
  projects/clang360-import/bin/mv/mv.c
  projects/clang360-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  projects/clang360-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/clang360-import/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  projects/clang360-import/contrib/ee/ee.1
  projects/clang360-import/contrib/elftoolchain/common/elfdefinitions.h
  projects/clang360-import/contrib/elftoolchain/readelf/readelf.c
  projects/clang360-import/contrib/gdb/gdb/corelow.c
  projects/clang360-import/contrib/gdb/gdb/dwarf2expr.c
  projects/clang360-import/contrib/gdb/gdb/remote.c
  projects/clang360-import/contrib/gdb/gdb/std-regs.c
  projects/clang360-import/contrib/libxo/Makefile.am
  projects/clang360-import/contrib/libxo/bin/Zaliases
  projects/clang360-import/contrib/libxo/configure.ac
  projects/clang360-import/contrib/libxo/doc/libxo.txt
  projects/clang360-import/contrib/libxo/libxo/libxo.3
  projects/clang360-import/contrib/libxo/libxo/libxo.c
  projects/clang360-import/contrib/libxo/libxo/xo.h
  projects/clang360-import/contrib/libxo/libxo/xo_attr.3
  projects/clang360-import/contrib/libxo/libxo/xo_create.3
  projects/clang360-import/contrib/libxo/libxo/xo_emit.3
  projects/clang360-import/contrib/libxo/libxo/xo_err.3
  projects/clang360-import/contrib/libxo/libxo/xo_finish.3
  projects/clang360-import/contrib/libxo/libxo/xo_flush.3
  projects/clang360-import/contrib/libxo/libxo/xo_format.5
  projects/clang360-import/contrib/libxo/libxo/xo_no_setlocale.3
  projects/clang360-import/contrib/libxo/libxo/xo_open_container.3
  projects/clang360-import/contrib/libxo/libxo/xo_open_list.3
  projects/clang360-import/contrib/libxo/libxo/xo_parse_args.3
  projects/clang360-import/contrib/libxo/libxo/xo_set_allocator.3
  projects/clang360-import/contrib/libxo/libxo/xo_set_flags.3
  projects/clang360-import/contrib/libxo/libxo/xo_set_info.3
  projects/clang360-import/contrib/libxo/libxo/xo_set_options.3
  projects/clang360-import/contrib/libxo/libxo/xo_set_style.3
  projects/clang360-import/contrib/libxo/libxo/xo_set_writer.3
  projects/clang360-import/contrib/libxo/libxo/xoconfig.h
  projects/clang360-import/contrib/libxo/libxo/xoconfig.h.in
  projects/clang360-import/contrib/libxo/libxo/xoversion.h
  projects/clang360-import/contrib/libxo/tests/core/Makefile.am
  projects/clang360-import/contrib/libxo/tests/core/saved/test_01.H.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_01.HIPx.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_01.HP.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_01.J.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_01.JP.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_01.T.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_01.X.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_01.XP.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_02.J.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_02.JP.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_07.J.out
  projects/clang360-import/contrib/libxo/tests/core/saved/test_07.JP.out
  projects/clang360-import/contrib/libxo/tests/core/test_01.c
  projects/clang360-import/contrib/libxo/tests/core/test_07.c
  projects/clang360-import/contrib/libxo/xo/xo.1
  projects/clang360-import/contrib/libxo/xo/xo.c
  projects/clang360-import/contrib/libxo/xolint/Makefile.am
  projects/clang360-import/contrib/libxo/xolint/xolint.1
  projects/clang360-import/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  projects/clang360-import/contrib/netbsd-tests/bin/expr/t_expr.sh
  projects/clang360-import/contrib/netbsd-tests/lib/libc/c063/t_utimensat.c
  projects/clang360-import/contrib/tcpdump/tcpdump.c
  projects/clang360-import/etc/Makefile
  projects/clang360-import/etc/mtree/BSD.tests.dist
  projects/clang360-import/etc/rc.d/Makefile
  projects/clang360-import/etc/rc.d/local_unbound
  projects/clang360-import/etc/tests/Makefile
  projects/clang360-import/include/Makefile
  projects/clang360-import/lib/Makefile
  projects/clang360-import/lib/libc/include/libc_private.h
  projects/clang360-import/lib/libc/sys/Makefile.inc
  projects/clang360-import/lib/libc/sys/Symbol.map
  projects/clang360-import/lib/libc/tests/c063/Makefile
  projects/clang360-import/lib/libelftc/elftc_version.c
  projects/clang360-import/lib/libproc/proc_sym.c
  projects/clang360-import/lib/libproc/tests/proc_test.c
  projects/clang360-import/lib/libstand/libstand.3
  projects/clang360-import/lib/libstand/printf.c
  projects/clang360-import/lib/libthr/Makefile
  projects/clang360-import/lib/libthr/arch/amd64/Makefile.inc
  projects/clang360-import/lib/libthr/arch/amd64/include/pthread_md.h
  projects/clang360-import/lib/libthr/arch/arm/include/pthread_md.h
  projects/clang360-import/lib/libthr/arch/i386/Makefile.inc
  projects/clang360-import/lib/libthr/arch/i386/include/pthread_md.h
  projects/clang360-import/lib/libthr/arch/mips/include/pthread_md.h
  projects/clang360-import/lib/libthr/arch/powerpc/include/pthread_md.h
  projects/clang360-import/lib/libthr/arch/sparc64/Makefile.inc
  projects/clang360-import/lib/libthr/arch/sparc64/include/pthread_md.h
  projects/clang360-import/lib/libthr/thread/Makefile.inc
  projects/clang360-import/lib/libthr/thread/thr_private.h
  projects/clang360-import/lib/libthr/thread/thr_sig.c
  projects/clang360-import/lib/libutil/gr_util.c
  projects/clang360-import/lib/libvmmapi/vmmapi.c
  projects/clang360-import/lib/libvmmapi/vmmapi.h
  projects/clang360-import/lib/libxo/Makefile
  projects/clang360-import/libexec/Makefile
  projects/clang360-import/libexec/rtld-elf/rtld.c
  projects/clang360-import/release/Makefile
  projects/clang360-import/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/clang360-import/release/picobsd/build/picobsd
  projects/clang360-import/release/release.conf.sample
  projects/clang360-import/release/release.sh
  projects/clang360-import/release/tools/azure.conf
  projects/clang360-import/rescue/rescue/Makefile
  projects/clang360-import/sbin/Makefile
  projects/clang360-import/sbin/ipfw/nat.c
  projects/clang360-import/sbin/ping/ping.c
  projects/clang360-import/sbin/rcorder/Makefile
  projects/clang360-import/sbin/rcorder/rcorder.c
  projects/clang360-import/share/Makefile
  projects/clang360-import/share/man/man3/tree.3
  projects/clang360-import/share/man/man4/Makefile
  projects/clang360-import/share/man/man4/rights.4
  projects/clang360-import/share/man/man5/src.conf.5
  projects/clang360-import/share/man/man7/release.7
  projects/clang360-import/share/man/man9/Makefile
  projects/clang360-import/share/man/man9/SYSCALL_MODULE.9
  projects/clang360-import/share/man/man9/device_get_softc.9
  projects/clang360-import/share/man/man9/printf.9
  projects/clang360-import/share/man/man9/timeout.9
  projects/clang360-import/share/misc/committers-ports.dot
  projects/clang360-import/share/mk/bsd.cpu.mk
  projects/clang360-import/share/mk/src.opts.mk
  projects/clang360-import/sys/amd64/amd64/machdep.c
  projects/clang360-import/sys/amd64/conf/GENERIC
  projects/clang360-import/sys/amd64/include/vmm.h   (contents, props changed)
  projects/clang360-import/sys/amd64/vmm/amd/svm.c
  projects/clang360-import/sys/amd64/vmm/vmm_instruction_emul.c
  projects/clang360-import/sys/arm/allwinner/a20/files.a20
  projects/clang360-import/sys/arm/allwinner/files.a10
  projects/clang360-import/sys/arm/altera/socfpga/files.socfpga
  projects/clang360-import/sys/arm/arm/bus_space_asm_generic.S
  projects/clang360-import/sys/arm/arm/bus_space_generic.c
  projects/clang360-import/sys/arm/arm/locore-v4.S
  projects/clang360-import/sys/arm/arm/mem.c
  projects/clang360-import/sys/arm/arm/physmem.c
  projects/clang360-import/sys/arm/arm/trap-v6.c
  projects/clang360-import/sys/arm/at91/at91.c
  projects/clang360-import/sys/arm/at91/files.at91
  projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  projects/clang360-import/sys/arm/broadcom/bcm2835/files.bcm2835
  projects/clang360-import/sys/arm/cavium/cns11xx/econa.c
  projects/clang360-import/sys/arm/cavium/cns11xx/files.econa
  projects/clang360-import/sys/arm/conf/RK3188
  projects/clang360-import/sys/arm/freescale/imx/files.imx51
  projects/clang360-import/sys/arm/freescale/imx/files.imx53
  projects/clang360-import/sys/arm/freescale/imx/files.imx6
  projects/clang360-import/sys/arm/freescale/imx/imx6_anatop.c
  projects/clang360-import/sys/arm/freescale/imx/imx6_anatopreg.h
  projects/clang360-import/sys/arm/freescale/imx/imx6_anatopvar.h
  projects/clang360-import/sys/arm/freescale/imx/imx6_ccm.c
  projects/clang360-import/sys/arm/freescale/imx/imx6_ccmreg.h
  projects/clang360-import/sys/arm/freescale/imx/imx_ccmvar.h
  projects/clang360-import/sys/arm/freescale/imx/imx_iomux.c
  projects/clang360-import/sys/arm/freescale/vybrid/files.vybrid
  projects/clang360-import/sys/arm/include/bus.h
  projects/clang360-import/sys/arm/include/cpu-v6.h
  projects/clang360-import/sys/arm/include/md_var.h
  projects/clang360-import/sys/arm/lpc/files.lpc
  projects/clang360-import/sys/arm/mv/files.mv
  projects/clang360-import/sys/arm/rockchip/files.rk30xx
  projects/clang360-import/sys/arm/samsung/exynos/files.exynos5
  projects/clang360-import/sys/arm/samsung/s3c2xx0/files.s3c2xx0
  projects/clang360-import/sys/arm/samsung/s3c2xx0/s3c24x0.c
  projects/clang360-import/sys/arm/samsung/s3c2xx0/s3c2xx0var.h
  projects/clang360-import/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c
  projects/clang360-import/sys/arm/ti/am335x/am335x_lcd.c
  projects/clang360-import/sys/arm/ti/am335x/files.am335x
  projects/clang360-import/sys/arm/ti/files.ti
  projects/clang360-import/sys/arm/ti/ti_mbox.c
  projects/clang360-import/sys/arm/ti/ti_pruss.c
  projects/clang360-import/sys/arm/versatile/files.versatile
  projects/clang360-import/sys/arm/versatile/versatile_pci.c
  projects/clang360-import/sys/arm/xilinx/files.zynq7
  projects/clang360-import/sys/arm/xscale/i80321/ep80219_machdep.c
  projects/clang360-import/sys/arm/xscale/i80321/files.ep80219
  projects/clang360-import/sys/arm/xscale/i80321/files.i80219
  projects/clang360-import/sys/arm/xscale/i80321/files.i80321
  projects/clang360-import/sys/arm/xscale/i80321/files.iq31244
  projects/clang360-import/sys/arm/xscale/i80321/i80321_space.c
  projects/clang360-import/sys/arm/xscale/i80321/iq31244_machdep.c
  projects/clang360-import/sys/arm/xscale/i80321/obio.c
  projects/clang360-import/sys/arm/xscale/i80321/obiovar.h
  projects/clang360-import/sys/arm/xscale/i80321/uart_cpu_i80321.c
  projects/clang360-import/sys/arm/xscale/i8134x/crb_machdep.c
  projects/clang360-import/sys/arm/xscale/i8134x/files.i81342
  projects/clang360-import/sys/arm/xscale/i8134x/i81342_space.c
  projects/clang360-import/sys/arm/xscale/i8134x/obio.c
  projects/clang360-import/sys/arm/xscale/i8134x/obiovar.h
  projects/clang360-import/sys/arm/xscale/i8134x/uart_cpu_i81342.c
  projects/clang360-import/sys/arm/xscale/ixp425/avila_ata.c
  projects/clang360-import/sys/arm/xscale/ixp425/cambria_exp_space.c
  projects/clang360-import/sys/arm/xscale/ixp425/ixp425_a4x_space.c
  projects/clang360-import/sys/arm/xscale/ixp425/ixp425_pci_space.c
  projects/clang360-import/sys/arm/xscale/ixp425/ixp425_space.c
  projects/clang360-import/sys/arm/xscale/pxa/pxa_space.c
  projects/clang360-import/sys/boot/fdt/dts/arm/apalis-imx6.dts
  projects/clang360-import/sys/boot/fdt/dts/arm/imx6.dtsi
  projects/clang360-import/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts
  projects/clang360-import/sys/boot/fdt/dts/arm/rk3188-radxa.dts
  projects/clang360-import/sys/boot/fdt/dts/arm/rk3188.dtsi
  projects/clang360-import/sys/boot/forth/beastie.4th
  projects/clang360-import/sys/boot/forth/brand.4th
  projects/clang360-import/sys/boot/i386/libfirewire/firewire.c
  projects/clang360-import/sys/boot/i386/libi386/bootinfo64.c
  projects/clang360-import/sys/cam/cam_xpt.c
  projects/clang360-import/sys/cam/ctl/ctl.c
  projects/clang360-import/sys/cam/ctl/ctl_tpc.c
  projects/clang360-import/sys/cam/scsi/scsi_da.c
  projects/clang360-import/sys/cddl/compat/opensolaris/sys/sunddi.h
  projects/clang360-import/sys/cddl/compat/opensolaris/sys/time.h
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  projects/clang360-import/sys/compat/freebsd32/freebsd32_misc.c
  projects/clang360-import/sys/compat/freebsd32/freebsd32_proto.h
  projects/clang360-import/sys/compat/freebsd32/freebsd32_syscall.h
  projects/clang360-import/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/clang360-import/sys/compat/freebsd32/freebsd32_sysent.c
  projects/clang360-import/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/clang360-import/sys/compat/freebsd32/syscalls.master
  projects/clang360-import/sys/conf/files
  projects/clang360-import/sys/conf/kern.opts.mk
  projects/clang360-import/sys/conf/ldscript.powerpc
  projects/clang360-import/sys/conf/ldscript.powerpc64
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
  projects/clang360-import/sys/contrib/rdma/krping/krping.c
  projects/clang360-import/sys/dev/acpica/acpi_ec.c
  projects/clang360-import/sys/dev/agp/agp_nvidia.c
  projects/clang360-import/sys/dev/cx/cxddk.c
  projects/clang360-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  projects/clang360-import/sys/dev/cxgbe/iw_cxgbe/device.c
  projects/clang360-import/sys/dev/dc/if_dc.c
  projects/clang360-import/sys/dev/dcons/dcons.c
  projects/clang360-import/sys/dev/dcons/dcons_crom.c
  projects/clang360-import/sys/dev/dcons/dcons_os.h
  projects/clang360-import/sys/dev/drm2/drm.h
  projects/clang360-import/sys/dev/drm2/drmP.h
  projects/clang360-import/sys/dev/drm2/drm_crtc.c
  projects/clang360-import/sys/dev/drm2/drm_crtc.h
  projects/clang360-import/sys/dev/drm2/drm_crtc_helper.c
  projects/clang360-import/sys/dev/drm2/drm_crtc_helper.h
  projects/clang360-import/sys/dev/drm2/drm_drv.c
  projects/clang360-import/sys/dev/drm2/drm_edid.c
  projects/clang360-import/sys/dev/drm2/drm_edid.h
  projects/clang360-import/sys/dev/drm2/drm_edid_modes.h
  projects/clang360-import/sys/dev/drm2/drm_fb_helper.c
  projects/clang360-import/sys/dev/drm2/drm_ioctl.c
  projects/clang360-import/sys/dev/drm2/drm_irq.c
  projects/clang360-import/sys/dev/drm2/drm_memory.c
  projects/clang360-import/sys/dev/drm2/drm_mode.h
  projects/clang360-import/sys/dev/drm2/drm_pciids.h
  projects/clang360-import/sys/dev/drm2/drm_stub.c
  projects/clang360-import/sys/dev/drm2/i915/i915_debug.c
  projects/clang360-import/sys/dev/drm2/i915/i915_dma.c
  projects/clang360-import/sys/dev/drm2/i915/i915_drm.h
  projects/clang360-import/sys/dev/drm2/i915/i915_drv.c
  projects/clang360-import/sys/dev/drm2/i915/i915_drv.h
  projects/clang360-import/sys/dev/drm2/i915/i915_gem.c
  projects/clang360-import/sys/dev/drm2/i915/i915_gem_context.c
  projects/clang360-import/sys/dev/drm2/i915/i915_gem_evict.c
  projects/clang360-import/sys/dev/drm2/i915/i915_gem_execbuffer.c
  projects/clang360-import/sys/dev/drm2/i915/i915_gem_gtt.c
  projects/clang360-import/sys/dev/drm2/i915/i915_gem_tiling.c
  projects/clang360-import/sys/dev/drm2/i915/i915_irq.c
  projects/clang360-import/sys/dev/drm2/i915/i915_reg.h
  projects/clang360-import/sys/dev/drm2/i915/i915_suspend.c
  projects/clang360-import/sys/dev/drm2/i915/intel_bios.c
  projects/clang360-import/sys/dev/drm2/i915/intel_crt.c
  projects/clang360-import/sys/dev/drm2/i915/intel_display.c
  projects/clang360-import/sys/dev/drm2/i915/intel_dp.c
  projects/clang360-import/sys/dev/drm2/i915/intel_drv.h
  projects/clang360-import/sys/dev/drm2/i915/intel_fb.c
  projects/clang360-import/sys/dev/drm2/i915/intel_hdmi.c
  projects/clang360-import/sys/dev/drm2/i915/intel_iic.c
  projects/clang360-import/sys/dev/drm2/i915/intel_lvds.c
  projects/clang360-import/sys/dev/drm2/i915/intel_modes.c
  projects/clang360-import/sys/dev/drm2/i915/intel_overlay.c
  projects/clang360-import/sys/dev/drm2/i915/intel_panel.c
  projects/clang360-import/sys/dev/drm2/i915/intel_ringbuffer.c
  projects/clang360-import/sys/dev/drm2/i915/intel_ringbuffer.h
  projects/clang360-import/sys/dev/drm2/i915/intel_sdvo.c
  projects/clang360-import/sys/dev/drm2/i915/intel_sprite.c
  projects/clang360-import/sys/dev/drm2/i915/intel_tv.c
  projects/clang360-import/sys/dev/drm2/radeon/atombios_encoders.c
  projects/clang360-import/sys/dev/drm2/radeon/radeon_legacy_encoders.c
  projects/clang360-import/sys/dev/e1000/if_igb.c
  projects/clang360-import/sys/dev/fdt/fdt_clock.c
  projects/clang360-import/sys/dev/firewire/firewire.c
  projects/clang360-import/sys/dev/firewire/fwmem.c
  projects/clang360-import/sys/dev/firewire/fwohci.c
  projects/clang360-import/sys/dev/hwpmc/hwpmc_core.c
  projects/clang360-import/sys/dev/hwpmc/pmc_events.h
  projects/clang360-import/sys/dev/isp/isp.c
  projects/clang360-import/sys/dev/isp/isp_freebsd.c
  projects/clang360-import/sys/dev/ixgbe/ixgbe.c
  projects/clang360-import/sys/dev/ixl/ixl_txrx.c
  projects/clang360-import/sys/dev/mem/memdev.c
  projects/clang360-import/sys/dev/mii/mii.c
  projects/clang360-import/sys/dev/mmc/host/dwmmc.c
  projects/clang360-import/sys/dev/mmc/host/dwmmc.h
  projects/clang360-import/sys/dev/mps/mps.c
  projects/clang360-import/sys/dev/mps/mps_user.c
  projects/clang360-import/sys/dev/netmap/netmap.c
  projects/clang360-import/sys/dev/ofw/ofw_cpu.c
  projects/clang360-import/sys/dev/pci/pci_pci.c
  projects/clang360-import/sys/dev/usb/controller/ehci_ixp4xx.c
  projects/clang360-import/sys/dev/usb/net/if_cdce.c
  projects/clang360-import/sys/dev/usb/usb_generic.c
  projects/clang360-import/sys/fs/devfs/devfs_devs.c
  projects/clang360-import/sys/fs/devfs/devfs_int.h
  projects/clang360-import/sys/fs/devfs/devfs_vnops.c
  projects/clang360-import/sys/fs/ext2fs/ext2_alloc.c
  projects/clang360-import/sys/fs/ext2fs/ext2_bmap.c
  projects/clang360-import/sys/fs/ext2fs/ext2_extents.c
  projects/clang360-import/sys/fs/ext2fs/ext2_htree.c
  projects/clang360-import/sys/fs/ext2fs/ext2_inode.c
  projects/clang360-import/sys/fs/ext2fs/ext2_lookup.c
  projects/clang360-import/sys/fs/ext2fs/ext2_vfsops.c
  projects/clang360-import/sys/fs/ext2fs/ext2_vnops.c
  projects/clang360-import/sys/i386/i386/mem.c
  projects/clang360-import/sys/kern/capabilities.conf
  projects/clang360-import/sys/kern/init_main.c
  projects/clang360-import/sys/kern/init_sysent.c
  projects/clang360-import/sys/kern/kern_condvar.c
  projects/clang360-import/sys/kern/kern_conf.c
  projects/clang360-import/sys/kern/kern_descrip.c
  projects/clang360-import/sys/kern/kern_lock.c
  projects/clang360-import/sys/kern/kern_switch.c
  projects/clang360-import/sys/kern/kern_synch.c
  projects/clang360-import/sys/kern/kern_tc.c
  projects/clang360-import/sys/kern/kern_thread.c
  projects/clang360-import/sys/kern/kern_timeout.c
  projects/clang360-import/sys/kern/subr_dummy_vdso_tc.c
  projects/clang360-import/sys/kern/subr_prf.c
  projects/clang360-import/sys/kern/subr_sleepqueue.c
  projects/clang360-import/sys/kern/sys_pipe.c
  projects/clang360-import/sys/kern/syscalls.c
  projects/clang360-import/sys/kern/syscalls.master
  projects/clang360-import/sys/kern/systrace_args.c
  projects/clang360-import/sys/kern/vfs_subr.c
  projects/clang360-import/sys/kern/vfs_syscalls.c
  projects/clang360-import/sys/mips/include/cache_mipsNN.h
  projects/clang360-import/sys/mips/mips/cache.c
  projects/clang360-import/sys/mips/mips/cache_mipsNN.c
  projects/clang360-import/sys/mips/mips/mem.c
  projects/clang360-import/sys/modules/Makefile
  projects/clang360-import/sys/modules/cxgbe/if_cxgbe/Makefile
  projects/clang360-import/sys/modules/drm2/i915kms/Makefile
  projects/clang360-import/sys/modules/geom/Makefile
  projects/clang360-import/sys/net/ieee8023ad_lacp.c
  projects/clang360-import/sys/net/if_ethersubr.c
  projects/clang360-import/sys/net/if_lagg.c
  projects/clang360-import/sys/net/pfvar.h
  projects/clang360-import/sys/netinet/in_pcb.c
  projects/clang360-import/sys/netinet/in_pcbgroup.c
  projects/clang360-import/sys/netinet/in_rss.c
  projects/clang360-import/sys/netinet/in_rss.h
  projects/clang360-import/sys/netinet/ip_carp.c
  projects/clang360-import/sys/netinet/ip_input.c
  projects/clang360-import/sys/netinet/ip_output.c
  projects/clang360-import/sys/netinet/sctp_asconf.c
  projects/clang360-import/sys/netinet/sctp_input.c
  projects/clang360-import/sys/netinet/sctp_output.c
  projects/clang360-import/sys/netinet/sctp_sysctl.c
  projects/clang360-import/sys/netinet/sctp_timer.c
  projects/clang360-import/sys/netinet/sctp_usrreq.c
  projects/clang360-import/sys/netinet/tcp_hostcache.c
  projects/clang360-import/sys/netinet/tcp_timer.c
  projects/clang360-import/sys/netinet/udp_usrreq.c
  projects/clang360-import/sys/netinet6/in6_pcbgroup.c
  projects/clang360-import/sys/netinet6/ip6_output.c
  projects/clang360-import/sys/netinet6/udp6_usrreq.c
  projects/clang360-import/sys/netpfil/pf/pf.c
  projects/clang360-import/sys/netpfil/pf/pf_if.c
  projects/clang360-import/sys/netpfil/pf/pf_ioctl.c
  projects/clang360-import/sys/netpfil/pf/pf_norm.c
  projects/clang360-import/sys/netpfil/pf/pf_table.c
  projects/clang360-import/sys/ofed/drivers/infiniband/core/device.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/main.c
  projects/clang360-import/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
  projects/clang360-import/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  projects/clang360-import/sys/ofed/drivers/net/mlx4/en_main.c
  projects/clang360-import/sys/ofed/drivers/net/mlx4/main.c
  projects/clang360-import/sys/ofed/include/linux/bitops.h
  projects/clang360-import/sys/ofed/include/linux/cache.h
  projects/clang360-import/sys/ofed/include/linux/completion.h
  projects/clang360-import/sys/ofed/include/linux/dma-mapping.h
  projects/clang360-import/sys/ofed/include/linux/etherdevice.h
  projects/clang360-import/sys/ofed/include/linux/gfp.h
  projects/clang360-import/sys/ofed/include/linux/io.h
  projects/clang360-import/sys/ofed/include/linux/kernel.h
  projects/clang360-import/sys/ofed/include/linux/ktime.h
  projects/clang360-import/sys/ofed/include/linux/module.h
  projects/clang360-import/sys/ofed/include/linux/slab.h
  projects/clang360-import/sys/powerpc/aim/locore32.S
  projects/clang360-import/sys/powerpc/aim/locore64.S
  projects/clang360-import/sys/powerpc/aim/machdep.c
  projects/clang360-import/sys/powerpc/aim/mmu_oea64.c
  projects/clang360-import/sys/powerpc/aim/mp_cpudep.c
  projects/clang360-import/sys/powerpc/aim/trap_subr32.S
  projects/clang360-import/sys/powerpc/aim/trap_subr64.S
  projects/clang360-import/sys/powerpc/booke/locore.S
  projects/clang360-import/sys/powerpc/include/asm.h
  projects/clang360-import/sys/powerpc/include/trap.h
  projects/clang360-import/sys/powerpc/ofw/ofw_machdep.c
  projects/clang360-import/sys/powerpc/ofw/ofwcall64.S
  projects/clang360-import/sys/powerpc/ofw/rtas.c
  projects/clang360-import/sys/powerpc/powerpc/elf64_machdep.c
  projects/clang360-import/sys/powerpc/powerpc/intr_machdep.c
  projects/clang360-import/sys/powerpc/powerpc/mem.c
  projects/clang360-import/sys/powerpc/powerpc/swtch64.S
  projects/clang360-import/sys/powerpc/powerpc/vm_machdep.c
  projects/clang360-import/sys/sparc64/sparc64/mem.c
  projects/clang360-import/sys/sys/_callout.h
  projects/clang360-import/sys/sys/callout.h
  projects/clang360-import/sys/sys/capsicum.h
  projects/clang360-import/sys/sys/elf_common.h
  projects/clang360-import/sys/sys/param.h
  projects/clang360-import/sys/sys/pmc.h
  projects/clang360-import/sys/sys/proc.h
  projects/clang360-import/sys/sys/stat.h
  projects/clang360-import/sys/sys/syscall.h
  projects/clang360-import/sys/sys/syscall.mk
  projects/clang360-import/sys/sys/syscallsubr.h
  projects/clang360-import/sys/sys/sysproto.h
  projects/clang360-import/sys/sys/tree.h
  projects/clang360-import/sys/sys/vdso.h
  projects/clang360-import/sys/vm/vm_map.c
  projects/clang360-import/sys/vm/vm_pageout.c
  projects/clang360-import/sys/x86/x86/tsc.c
  projects/clang360-import/sys/x86/xen/pv.c
  projects/clang360-import/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang360-import/tools/regression/file/flock/flock.c
  projects/clang360-import/tools/tools/nanobsd/nanobsd.sh   (contents, props changed)
  projects/clang360-import/usr.bin/Makefile
  projects/clang360-import/usr.bin/grep/file.c
  projects/clang360-import/usr.bin/kdump/kdump.c
  projects/clang360-import/usr.bin/touch/touch.c
  projects/clang360-import/usr.bin/vmstat/vmstat.c
  projects/clang360-import/usr.sbin/Makefile
  projects/clang360-import/usr.sbin/bsdinstall/scripts/zfsboot
  projects/clang360-import/usr.sbin/config/config.y
  projects/clang360-import/usr.sbin/config/configvers.h
  projects/clang360-import/usr.sbin/iostat/iostat.c
  projects/clang360-import/usr.sbin/mountd/mountd.c
  projects/clang360-import/usr.sbin/pmcstudy/pmcstudy.c
  projects/clang360-import/usr.sbin/pw/pw_group.c
  projects/clang360-import/usr.sbin/pw/pw_user.c
  projects/clang360-import/usr.sbin/pw/tests/Makefile
  projects/clang360-import/usr.sbin/rpc.lockd/lockd.c
  projects/clang360-import/usr.sbin/rpc.statd/statd.c
Directory Properties:
  projects/clang360-import/   (props changed)
  projects/clang360-import/cddl/   (props changed)
  projects/clang360-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang360-import/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/clang360-import/contrib/ee/   (props changed)
  projects/clang360-import/contrib/elftoolchain/   (props changed)
  projects/clang360-import/contrib/gdb/   (props changed)
  projects/clang360-import/contrib/llvm/   (props changed)
  projects/clang360-import/contrib/llvm/tools/clang/   (props changed)
  projects/clang360-import/contrib/tcpdump/   (props changed)
  projects/clang360-import/etc/   (props changed)
  projects/clang360-import/include/   (props changed)
  projects/clang360-import/lib/libc/   (props changed)
  projects/clang360-import/lib/libutil/   (props changed)
  projects/clang360-import/lib/libvmmapi/   (props changed)
  projects/clang360-import/sbin/   (props changed)
  projects/clang360-import/sbin/ipfw/   (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/amd64/vmm/   (props changed)
  projects/clang360-import/sys/boot/   (props changed)
  projects/clang360-import/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang360-import/sys/conf/   (props changed)

Modified: projects/clang360-import/Makefile.inc1
==============================================================================
--- projects/clang360-import/Makefile.inc1	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/Makefile.inc1	Sun Jan 25 23:43:12 2015	(r277719)
@@ -1292,12 +1292,16 @@ _clang_tblgen= \
 	usr.bin/clang/clang-tblgen
 .endif
 
+# ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
 # dtrace tools are required for older bootstrap env and cross-build
 # pre libdwarf
-.if ${MK_CDDL} != "no" && (${BOOTSTRAPPING} < 1100006 \
-      || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}))
-_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
-    lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
+.if ${BOOTSTRAPPING} < 1100006 || (${MACHINE} != ${TARGET} || \
+    ${MACHINE_ARCH} != ${TARGET_ARCH})
+_elftoolchain_libs= lib/libelf lib/libdwarf 
+.if ${MK_CDDL} != "no"
+_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \
+    cddl/usr.bin/ctfmerge
+.endif
 .endif
 
 # Default to building the GPL DTC, but build the BSDL one if users explicitly
@@ -1324,6 +1328,7 @@ bootstrap-tools: .MAKE
 .for _tool in \
     ${_clang_tblgen} \
     ${_kerberos5_bootstrap_tools} \
+    ${_elftoolchain_libs} \
     ${_dtrace_tools} \
     ${_strfile} \
     ${_gperf} \
@@ -1428,11 +1433,13 @@ _binutils=	gnu/usr.bin/binutils
 .endif
 .if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
 _elftctools=	lib/libelftc \
-		usr.bin/addr2line \
 		usr.bin/elfcopy \
 		usr.bin/nm \
 		usr.bin/size \
 		usr.bin/strings
+# These are not required by the build, but can be useful for developers who
+# cross-build on a FreeBSD 10 host:
+_elftctools+=	usr.bin/addr2line
 .endif
 .endif
 

Modified: projects/clang360-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang360-import/ObsoleteFiles.inc	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/ObsoleteFiles.inc	Sun Jan 25 23:43:12 2015	(r277719)
@@ -38,6 +38,20 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150124: spl.9 and friends
+OLD_FILES+=usr/share/man/man9/spl.9
+OLD_FILES+=usr/share/man/man9/spl0.9
+OLD_FILES+=usr/share/man/man9/splbio.9
+OLD_FILES+=usr/share/man/man9/splclock.9
+OLD_FILES+=usr/share/man/man9/splhigh.9
+OLD_FILES+=usr/share/man/man9/splimp.9
+OLD_FILES+=usr/share/man/man9/splnet.9
+OLD_FILES+=usr/share/man/man9/splsoftclock.9
+OLD_FILES+=usr/share/man/man9/splsofttty.9
+OLD_FILES+=usr/share/man/man9/splstatclock.9
+OLD_FILES+=usr/share/man/man9/spltty.9
+OLD_FILES+=usr/share/man/man9/splvm.9
+OLD_FILES+=usr/share/man/man9/splx.9
 # 20150118: new clang import which bumps version from 3.5.0 to 3.5.1.
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h

Modified: projects/clang360-import/bin/cp/utils.c
==============================================================================
--- projects/clang360-import/bin/cp/utils.c	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/bin/cp/utils.c	Sun Jan 25 23:43:12 2015	(r277719)
@@ -330,7 +330,7 @@ copy_special(struct stat *from_stat, int
 int
 setfile(struct stat *fs, int fd)
 {
-	static struct timeval tv[2];
+	static struct timespec tspec[2];
 	struct stat ts;
 	int rval, gotstat, islink, fdval;
 
@@ -340,10 +340,11 @@ setfile(struct stat *fs, int fd)
 	fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
 		       S_IRWXU | S_IRWXG | S_IRWXO;
 
-	TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atim);
-	TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtim);
-	if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) {
-		warn("%sutimes: %s", islink ? "l" : "", to.p_path);
+	tspec[0] = fs->st_atim;
+	tspec[1] = fs->st_mtim;
+	if (utimensat(AT_FDCWD, to.p_path, tspec,
+	    islink ? AT_SYMLINK_NOFOLLOW : 0)) {
+		warn("utimensat: %s", to.p_path);
 		rval = 1;
 	}
 	if (fdval ? fstat(fd, &ts) :

Modified: projects/clang360-import/bin/expr/Makefile
==============================================================================
--- projects/clang360-import/bin/expr/Makefile	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/bin/expr/Makefile	Sun Jan 25 23:43:12 2015	(r277719)
@@ -1,9 +1,15 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	expr
 SRCS=	expr.y
 YFLAGS=
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Modified: projects/clang360-import/bin/freebsd-version/Makefile
==============================================================================
--- projects/clang360-import/bin/freebsd-version/Makefile	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/bin/freebsd-version/Makefile	Sun Jan 25 23:43:12 2015	(r277719)
@@ -11,7 +11,7 @@ freebsd-version.sh: ${.CURDIR}/freebsd-v
 			s/@@TYPE@@/$${TYPE}/g; \
 			s/@@REVISION@@/$${REVISION}/g; \
 			s/@@BRANCH@@/$${BRANCH}/g; \
-		" ${.ALLSRC} >${.TARGET} ; then \
+		" ${.CURDIR}/freebsd-version.sh.in >${.TARGET} ; then \
 		rm -f ${.TARGET} ; \
 		exit 1 ; \
 	fi

Modified: projects/clang360-import/bin/ln/symlink.7
==============================================================================
--- projects/clang360-import/bin/ln/symlink.7	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/bin/ln/symlink.7	Sun Jan 25 23:43:12 2015	(r277719)
@@ -29,7 +29,7 @@
 .\"	@(#)symlink.7	8.3 (Berkeley) 3/31/94
 .\" $FreeBSD$
 .\"
-.Dd December 29, 2014
+.Dd January 23, 2015
 .Dt SYMLINK 7
 .Os
 .Sh NAME
@@ -147,9 +147,10 @@ unless given the
 .Dv AT_SYMLINK_NOFOLLOW
 flag:
 .Xr fchmodat 2 ,
-.Xr fchownat 2
+.Xr fchownat 2 ,
+.Xr fstatat 2
 and
-.Xr fstatat 2 .
+.Xr utimensat 2 .
 .Pp
 The owner and group of an existing symbolic link can be changed by
 means of the

Modified: projects/clang360-import/bin/mv/mv.c
==============================================================================
--- projects/clang360-import/bin/mv/mv.c	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/bin/mv/mv.c	Sun Jan 25 23:43:12 2015	(r277719)
@@ -273,7 +273,7 @@ do_move(const char *from, const char *to
 static int
 fastcopy(const char *from, const char *to, struct stat *sbp)
 {
-	struct timeval tval[2];
+	struct timespec ts[2];
 	static u_int blen = MAXPHYS;
 	static char *bp = NULL;
 	mode_t oldmode;
@@ -350,10 +350,9 @@ err:		if (unlink(to))
 	} else
 		warn("%s: cannot stat", to);
 
-	tval[0].tv_sec = sbp->st_atime;
-	tval[1].tv_sec = sbp->st_mtime;
-	tval[0].tv_usec = tval[1].tv_usec = 0;
-	if (utimes(to, tval))
+	ts[0] = sbp->st_atim;
+	ts[1] = sbp->st_mtim;
+	if (utimensat(AT_FDCWD, to, ts, 0))
 		warn("%s: set times", to);
 
 	if (close(to_fd)) {

Modified: projects/clang360-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Sun Jan 25 23:43:12 2015	(r277719)
@@ -18,10 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
+ * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
- * Copyright 2014 Nexenta Systems, Inc. All rights reserved.
  */
 
 /*
@@ -198,8 +199,10 @@ fix_paths(nvlist_t *nv, name_entry_t *na
 	if ((devid = get_devid(best->ne_name)) == NULL) {
 		(void) nvlist_remove_all(nv, ZPOOL_CONFIG_DEVID);
 	} else {
-		if (nvlist_add_string(nv, ZPOOL_CONFIG_DEVID, devid) != 0)
+		if (nvlist_add_string(nv, ZPOOL_CONFIG_DEVID, devid) != 0) {
+			devid_str_free(devid);
 			return (-1);
+		}
 		devid_str_free(devid);
 	}
 
@@ -665,8 +668,10 @@ get_configs(libzfs_handle_t *hdl, pool_l
 				    nvlist_add_uint64(holey,
 				    ZPOOL_CONFIG_ID, c) != 0 ||
 				    nvlist_add_uint64(holey,
-				    ZPOOL_CONFIG_GUID, 0ULL) != 0)
+				    ZPOOL_CONFIG_GUID, 0ULL) != 0) {
+					nvlist_free(holey);
 					goto nomem;
+				}
 				child[c] = holey;
 			}
 		}
@@ -1118,8 +1123,10 @@ zpool_clear_label(int fd)
 
 	for (l = 0; l < VDEV_LABELS; l++) {
 		if (pwrite64(fd, label, sizeof (vdev_label_t),
-		    label_offset(size, l)) != sizeof (vdev_label_t))
+		    label_offset(size, l)) != sizeof (vdev_label_t)) {
+			free(label);
 			return (-1);
+		}
 	}
 
 	free(label);
@@ -1137,7 +1144,6 @@ static nvlist_t *
 zpool_find_import_impl(libzfs_handle_t *hdl, importargs_t *iarg)
 {
 	int i, dirs = iarg->paths;
-	DIR *dirp = NULL;
 	struct dirent64 *dp;
 	char path[MAXPATHLEN];
 	char *end, **dir = iarg->path;
@@ -1167,6 +1173,8 @@ zpool_find_import_impl(libzfs_handle_t *
 		tpool_t *t;
 		char *rdsk;
 		int dfd;
+		boolean_t config_failed = B_FALSE;
+		DIR *dirp;
 
 		/* use realpath to normalize the path */
 		if (realpath(dir[i], path) == 0) {
@@ -1191,6 +1199,8 @@ zpool_find_import_impl(libzfs_handle_t *
 
 		if ((dfd = open64(rdsk, O_RDONLY)) < 0 ||
 		    (dirp = fdopendir(dfd)) == NULL) {
+			if (dfd >= 0)
+				(void) close(dfd);
 			zfs_error_aux(hdl, strerror(errno));
 			(void) zfs_error_fmt(hdl, EZFS_BADPATH,
 			    dgettext(TEXT_DOMAIN, "cannot open '%s'"),
@@ -1272,7 +1282,7 @@ skipdir:
 		cookie = NULL;
 		while ((slice = avl_destroy_nodes(&slice_cache,
 		    &cookie)) != NULL) {
-			if (slice->rn_config != NULL) {
+			if (slice->rn_config != NULL && !config_failed) {
 				nvlist_t *config = slice->rn_config;
 				boolean_t matched = B_TRUE;
 
@@ -1293,13 +1303,16 @@ skipdir:
 				}
 				if (!matched) {
 					nvlist_free(config);
-					config = NULL;
-					continue;
+				} else {
+					/*
+					 * use the non-raw path for the config
+					 */
+					(void) strlcpy(end, slice->rn_name,
+					    pathleft);
+					if (add_config(hdl, &pools, path,
+					    config) != 0)
+						config_failed = B_TRUE;
 				}
-				/* use the non-raw path for the config */
-				(void) strlcpy(end, slice->rn_name, pathleft);
-				if (add_config(hdl, &pools, path, config) != 0)
-					goto error;
 			}
 			free(slice->rn_name);
 			free(slice);
@@ -1307,7 +1320,9 @@ skipdir:
 		avl_destroy(&slice_cache);
 
 		(void) closedir(dirp);
-		dirp = NULL;
+
+		if (config_failed)
+			goto error;
 	}
 
 	ret = get_configs(hdl, &pools, iarg->can_be_active);
@@ -1330,14 +1345,10 @@ error:
 
 	for (ne = pools.names; ne != NULL; ne = nenext) {
 		nenext = ne->ne_next;
-		if (ne->ne_name)
-			free(ne->ne_name);
+		free(ne->ne_name);
 		free(ne);
 	}
 
-	if (dirp)
-		(void) closedir(dirp);
-
 	return (ret);
 }
 
@@ -1695,9 +1706,9 @@ zpool_in_use(libzfs_handle_t *hdl, int f
 		cb.cb_type = ZPOOL_CONFIG_SPARES;
 		if (zpool_iter(hdl, find_aux, &cb) == 1) {
 			name = (char *)zpool_get_name(cb.cb_zhp);
-			ret = TRUE;
+			ret = B_TRUE;
 		} else {
-			ret = FALSE;
+			ret = B_FALSE;
 		}
 		break;
 
@@ -1711,9 +1722,9 @@ zpool_in_use(libzfs_handle_t *hdl, int f
 		cb.cb_type = ZPOOL_CONFIG_L2CACHE;
 		if (zpool_iter(hdl, find_aux, &cb) == 1) {
 			name = (char *)zpool_get_name(cb.cb_zhp);
-			ret = TRUE;
+			ret = B_TRUE;
 		} else {
-			ret = FALSE;
+			ret = B_FALSE;
 		}
 		break;
 

Modified: projects/clang360-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Sun Jan 25 23:43:12 2015	(r277719)
@@ -20,8 +20,8 @@
  */
 
 /*
+ * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
@@ -1715,7 +1715,7 @@ zpool_import_props(libzfs_handle_t *hdl,
 		thename = origname;
 	}
 
-	if (props) {
+	if (props != NULL) {
 		uint64_t version;
 		prop_flags_t flags = { .create = B_FALSE, .import = B_TRUE };
 
@@ -1723,12 +1723,13 @@ zpool_import_props(libzfs_handle_t *hdl,
 		    &version) == 0);
 
 		if ((props = zpool_valid_proplist(hdl, origname,
-		    props, version, flags, errbuf)) == NULL) {
+		    props, version, flags, errbuf)) == NULL)
 			return (-1);
-		} else if (zcmd_write_src_nvlist(hdl, &zc, props) != 0) {
+		if (zcmd_write_src_nvlist(hdl, &zc, props) != 0) {
 			nvlist_free(props);
 			return (-1);
 		}
+		nvlist_free(props);
 	}
 
 	(void) strlcpy(zc.zc_name, thename, sizeof (zc.zc_name));
@@ -1737,11 +1738,11 @@ zpool_import_props(libzfs_handle_t *hdl,
 	    &zc.zc_guid) == 0);
 
 	if (zcmd_write_conf_nvlist(hdl, &zc, config) != 0) {
-		nvlist_free(props);
+		zcmd_free_nvlists(&zc);
 		return (-1);
 	}
 	if (zcmd_alloc_dst_nvlist(hdl, &zc, zc.zc_nvlist_conf_size * 2) != 0) {
-		nvlist_free(props);
+		zcmd_free_nvlists(&zc);
 		return (-1);
 	}
 
@@ -1757,6 +1758,9 @@ zpool_import_props(libzfs_handle_t *hdl,
 		error = errno;
 
 	(void) zcmd_read_dst_nvlist(hdl, &zc, &nv);
+
+	zcmd_free_nvlists(&zc);
+
 	zpool_get_rewind_policy(config, &policy);
 
 	if (error) {
@@ -1862,9 +1866,6 @@ zpool_import_props(libzfs_handle_t *hdl,
 		return (0);
 	}
 
-	zcmd_free_nvlists(&zc);
-	nvlist_free(props);
-
 	return (ret);
 }
 
@@ -3332,8 +3333,10 @@ devid_to_path(char *devid_str)
 	if (ret != 0)
 		return (NULL);
 
-	if ((path = strdup(list[0].devname)) == NULL)
-		return (NULL);
+	/*
+	 * In a case the strdup() fails, we will just return NULL below.
+	 */
+	path = strdup(list[0].devname);
 
 	devid_free_nmlist(list);
 

Modified: projects/clang360-import/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Sun Jan 25 23:43:12 2015	(r277719)
@@ -535,7 +535,7 @@ extern vnode_t *rootdir;
 extern void delay(clock_t ticks);
 
 #define	SEC_TO_TICK(sec)	((sec) * hz)
-#define	NSEC_TO_TICK(usec)	((usec) / (NANOSEC / hz))
+#define	NSEC_TO_TICK(nsec)	((nsec) / (NANOSEC / hz))
 
 #define	gethrestime_sec() time(NULL)
 #define	gethrestime(t) \

Modified: projects/clang360-import/contrib/ee/ee.1
==============================================================================
--- projects/clang360-import/contrib/ee/ee.1	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/contrib/ee/ee.1	Sun Jan 25 23:43:12 2015	(r277719)
@@ -329,8 +329,8 @@ A window showing the keyboard operations
 displayed or not.
 .IP "\fBemacs keys\fR"
 Control keys may be given bindings similar to emacs, or not.
-.IP "\f16 bit characters\fR"
-Toggles whether sixteen bit characters are handled as one 16-bit quantities or 
+.IP "\fB16 bit characters\fR"
+Toggles whether sixteen bit characters are handled as one 16-bit quantity or 
 two 8-bit quantities.  This works primarily with the Chinese Big 5 code set.
 .RE
 .PP
@@ -461,7 +461,7 @@ Turns off display of eight bit character
 value inside angle brackets, e.g., "<220>").
 .IP \fB16bit\fR
 Turns on handling of 16-bit characters.
-.IP \fbno16bit\fR
+.IP \fBno16bit\fR
 Turns off handling of 16-bit characters.
 .IP \fBemacs\fR
 Turns on emacs key bindings.

Modified: projects/clang360-import/contrib/elftoolchain/common/elfdefinitions.h
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/common/elfdefinitions.h	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/contrib/elftoolchain/common/elfdefinitions.h	Sun Jan 25 23:43:12 2015	(r277719)
@@ -1948,11 +1948,17 @@ _ELF_DEFINE_RELOC(R_X86_64_TPOFF32,	23)	
 _ELF_DEFINE_RELOC(R_X86_64_PC64,	24)	\
 _ELF_DEFINE_RELOC(R_X86_64_GOTOFF64,	25)	\
 _ELF_DEFINE_RELOC(R_X86_64_GOTPC32,	26)	\
+_ELF_DEFINE_RELOC(R_X86_64_GOT64,	27)	\
+_ELF_DEFINE_RELOC(R_X86_64_GOTPCREL64,	28)	\
+_ELF_DEFINE_RELOC(R_X86_64_GOTPC64,	29)	\
+_ELF_DEFINE_RELOC(R_X86_64_GOTPLT64,	30)	\
+_ELF_DEFINE_RELOC(R_X86_64_PLTOFF64,	31)	\
 _ELF_DEFINE_RELOC(R_X86_64_SIZE32,	32)	\
 _ELF_DEFINE_RELOC(R_X86_64_SIZE64,	33)	\
 _ELF_DEFINE_RELOC(R_X86_64_GOTPC32_TLSDESC, 34)	\
 _ELF_DEFINE_RELOC(R_X86_64_TLSDESC_CALL, 35)	\
-_ELF_DEFINE_RELOC(R_X86_64_TLSDESC,	36)
+_ELF_DEFINE_RELOC(R_X86_64_TLSDESC,	36)	\
+_ELF_DEFINE_RELOC(R_X86_64_IRELATIVE,	37)
 
 #define	_ELF_DEFINE_RELOCATIONS()		\
 _ELF_DEFINE_386_RELOCATIONS()			\

Modified: projects/clang360-import/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/readelf/readelf.c	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/contrib/elftoolchain/readelf/readelf.c	Sun Jan 25 23:43:12 2015	(r277719)
@@ -1480,6 +1480,20 @@ r_type(unsigned int mach, unsigned int t
 		case 21: return "R_X86_64_DTPOFF32";
 		case 22: return "R_X86_64_GOTTPOFF";
 		case 23: return "R_X86_64_TPOFF32";
+		case 24: return "R_X86_64_PC64";
+		case 25: return "R_X86_64_GOTOFF64";
+		case 26: return "R_X86_64_GOTPC32";
+		case 27: return "R_X86_64_GOT64";
+		case 28: return "R_X86_64_GOTPCREL64";
+		case 29: return "R_X86_64_GOTPC64";
+		case 30: return "R_X86_64_GOTPLT64";
+		case 31: return "R_X86_64_PLTOFF64";
+		case 32: return "R_X86_64_SIZE32";
+		case 33: return "R_X86_64_SIZE64";
+		case 34: return "R_X86_64_GOTPC32_TLSDESC";
+		case 35: return "R_X86_64_TLSDESC_CALL";
+		case 36: return "R_X86_64_TLSDESC";
+		case 37: return "R_X86_64_IRELATIVE";
 		default: return "";
 		}
 	default: return "";

Modified: projects/clang360-import/contrib/gdb/gdb/corelow.c
==============================================================================
--- projects/clang360-import/contrib/gdb/gdb/corelow.c	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/contrib/gdb/gdb/corelow.c	Sun Jan 25 23:43:12 2015	(r277719)
@@ -432,15 +432,16 @@ get_core_register_section (char *name,
 			   char *human_name,
 			   int required)
 {
-  char section_name[100];
+  static char *section_name = NULL;
   struct bfd_section *section;
   bfd_size_type size;
   char *contents;
 
+  xfree (section_name);
   if (PIDGET (inferior_ptid))
-    sprintf (section_name, "%s/%d", name, PIDGET (inferior_ptid));
+    section_name = xstrprintf ("%s/%d", name, PIDGET (inferior_ptid));
   else
-    strcpy (section_name, name);
+    section_name = xstrdup (name);
 
   section = bfd_get_section_by_name (core_bfd, section_name);
   if (! section)

Modified: projects/clang360-import/contrib/gdb/gdb/dwarf2expr.c
==============================================================================
--- projects/clang360-import/contrib/gdb/gdb/dwarf2expr.c	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/contrib/gdb/gdb/dwarf2expr.c	Sun Jan 25 23:43:12 2015	(r277719)
@@ -575,6 +575,7 @@ execute_stack_op (struct dwarf_expr_cont
 		break;
 	      case DW_OP_div:
 		binop = BINOP_DIV;
+                break;
 	      case DW_OP_minus:
 		binop = BINOP_SUB;
 		break;
@@ -595,6 +596,7 @@ execute_stack_op (struct dwarf_expr_cont
 		break;
 	      case DW_OP_shr:
 		binop = BINOP_RSH;
+                break;
 	      case DW_OP_shra:
 		binop = BINOP_RSH;
 		val1 = value_from_longest (signed_address_type (), first);

Modified: projects/clang360-import/contrib/gdb/gdb/remote.c
==============================================================================
--- projects/clang360-import/contrib/gdb/gdb/remote.c	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/contrib/gdb/gdb/remote.c	Sun Jan 25 23:43:12 2015	(r277719)
@@ -3463,7 +3463,7 @@ remote_store_registers (int regnum)
   {
     int i;
     regs = alloca (rs->sizeof_g_packet);
-    memset (regs, rs->sizeof_g_packet, 0);
+    memset (regs, 0, rs->sizeof_g_packet);
     for (i = 0; i < NUM_REGS + NUM_PSEUDO_REGS; i++)
       {
 	struct packet_reg *r = &rs->regs[i];

Modified: projects/clang360-import/contrib/gdb/gdb/std-regs.c
==============================================================================
--- projects/clang360-import/contrib/gdb/gdb/std-regs.c	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/contrib/gdb/gdb/std-regs.c	Sun Jan 25 23:43:12 2015	(r277719)
@@ -61,7 +61,7 @@ value_of_builtin_frame_reg (struct frame
   val = allocate_value (builtin_type_frame_reg);
   VALUE_LVAL (val) = not_lval;
   buf = VALUE_CONTENTS_RAW (val);
-  memset (buf, TYPE_LENGTH (VALUE_TYPE (val)), 0);
+  memset (buf, 0, TYPE_LENGTH (VALUE_TYPE (val)));
   /* frame.base.  */
   if (frame != NULL)
     ADDRESS_TO_POINTER (builtin_type_void_data_ptr, buf,
@@ -87,7 +87,7 @@ value_of_builtin_frame_fp_reg (struct fr
       struct value *val = allocate_value (builtin_type_void_data_ptr);
       char *buf = VALUE_CONTENTS_RAW (val);
       if (frame == NULL)
-	memset (buf, TYPE_LENGTH (VALUE_TYPE (val)), 0);
+	memset (buf, 0, TYPE_LENGTH (VALUE_TYPE (val)));
       else
 	ADDRESS_TO_POINTER (builtin_type_void_data_ptr, buf,
 			    get_frame_base_address (frame));
@@ -105,7 +105,7 @@ value_of_builtin_frame_pc_reg (struct fr
       struct value *val = allocate_value (builtin_type_void_data_ptr);
       char *buf = VALUE_CONTENTS_RAW (val);
       if (frame == NULL)
-	memset (buf, TYPE_LENGTH (VALUE_TYPE (val)), 0);
+	memset (buf, 0, TYPE_LENGTH (VALUE_TYPE (val)));
       else
 	ADDRESS_TO_POINTER (builtin_type_void_data_ptr, buf,
 			    get_frame_pc (frame));

Modified: projects/clang360-import/contrib/libxo/Makefile.am
==============================================================================
--- projects/clang360-import/contrib/libxo/Makefile.am	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/contrib/libxo/Makefile.am	Sun Jan 25 23:43:12 2015	(r277719)
@@ -35,6 +35,7 @@ docs:
 
 DIST_FILES_DIR = ~/Dropbox/dist-files/
 GH_PAGES_DIR = gh-pages/
+GH_PAGES_DIR_VER = gh-pages/${PACKAGE_VERSION}
 PACKAGE_FILE = ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.gz
 
 upload: dist upload-docs
@@ -45,10 +46,14 @@ upload-docs: docs
 	@echo "Uploading libxo-manual.html ... "
 	@-[ -d ${GH_PAGES_DIR} ] \
 		&& echo "Updating manual on gh-pages ..." \
+		&& mkdir -p ${GH_PAGES_DIR_VER} \
 		&& cp doc/libxo-manual.html ${GH_PAGES_DIR} \
+		&& cp doc/libxo-manual.html ${GH_PAGES_DIR_VER} \
 		&& (cd ${GH_PAGES_DIR} \
+			&& git add ${PACKAGE_VERSION} \
+			&& git add libxo-manual.html \
 			&& git commit -m 'new docs' \
-                               libxo-manual.html \
+                               libxo-manual.html ${PACKAGE_VERSION} \
 			&& git push origin gh-pages ) ; true
 
 pkgconfigdir=$(libdir)/pkgconfig
@@ -66,7 +71,7 @@ UPDATE_PACKAGE_FILE = \
     -e "s;__SHA256__;SHA256 (textproc/${PACKAGE_FILE}) = $$SHA256;" \
     -e "s;__SIZE__;SIZE (textproc/${PACKAGE_FILE}) = $$SIZE;"
 
-GH_PACKAGING_DIR = packaging/${PACKAGE_VERSION}
+GH_PACKAGING_DIR = ${PACKAGE_VERSION}/packaging
 GH_PAGES_PACKAGE_DIR = ${GH_PAGES_DIR}/${GH_PACKAGING_DIR}
 
 packages:
@@ -75,7 +80,6 @@ packages:
 		&& SHA1="`openssl sha1 ${PACKAGE_FILE} | awk '{print $$2}'`" \
 		&& SHA256="`openssl sha256 ${PACKAGE_FILE} | awk '{print $$2}'`" \
 		&& SIZE="`ls -l ${PACKAGE_FILE} | awk '{print $$5}'`" \
-		&& mkdir -p ${GH_PAGES_PACKAGE_DIR}/freebsd \
 		&& echo "... ${GH_PAGES_PACKAGE_DIR}/${PACKAGE_NAME}.rb ..." \
 		&& sed ${UPDATE_PACKAGE_FILE} \
 			packaging/${PACKAGE_NAME}.rb.base \
@@ -83,20 +87,10 @@ packages:
 		&& echo "... ${GH_PAGES_PACKAGE_DIR}/${PACKAGE_NAME}.spec ..." \
 		&& cp packaging/${PACKAGE_NAME}.spec \
 			${GH_PAGES_PACKAGE_DIR}/${PACKAGE_NAME}.spec \
-		&& echo "... ${GH_PAGES_PACKAGE_DIR}/freebsd ..." \
-		&& sed ${UPDATE_PACKAGE_FILE} \
-			${srcdir}/packaging/freebsd/distinfo.base \
-			> ${GH_PAGES_PACKAGE_DIR}/freebsd/distinfo \
-		&& cp ${srcdir}/packaging/freebsd/pkg-descr \
-			${GH_PAGES_PACKAGE_DIR}/freebsd/pkg-descr \
-		&& cp ${srcdir}/packaging/freebsd/pkg-plist \
-			${GH_PAGES_PACKAGE_DIR}/freebsd/pkg-plist \
-		&& cp ${srcdir}/packaging/freebsd/pkg-plist \
-			${GH_PAGES_PACKAGE_DIR}/freebsd/pkg-plist \
-		&& cp packaging/freebsd/port-Makefile \
-			${GH_PAGES_PACKAGE_DIR}/freebsd/Makefile \
 		&& (cd ${GH_PAGES_DIR} \
 			&& git add ${GH_PACKAGING_DIR} \
+			&& git add ${GH_PACKAGING_DIR}/libxo.rb \
+                                   ${GH_PACKAGING_DIR}/libxo.spec \
 			&& git commit -m 'new packaging data' \
                                ${GH_PACKAGING_DIR} \
 			&& git push origin gh-pages ) ; true

Modified: projects/clang360-import/contrib/libxo/bin/Zaliases
==============================================================================
--- projects/clang360-import/contrib/libxo/bin/Zaliases	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/contrib/libxo/bin/Zaliases	Sun Jan 25 23:43:12 2015	(r277719)
@@ -1,5 +1,5 @@
 set top_src=`pwd`
-alias Zautoreconf "(cd $top_src ; autoreconf --install)"
+alias Zautoreconf "(cd $top_src ; autoreconf)"
 
 set opts=' \
 --with-libslax-prefix=/Users/phil/work/root \

Modified: projects/clang360-import/contrib/libxo/configure.ac
==============================================================================
--- projects/clang360-import/contrib/libxo/configure.ac	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/contrib/libxo/configure.ac	Sun Jan 25 23:43:12 2015	(r277719)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.1.6], [phil@juniper.net])
+AC_INIT([libxo], [0.2.0], [phil@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.
@@ -57,8 +57,10 @@ AC_CHECK_FUNCS([getpass])
 AC_CHECK_FUNCS([sysctlbyname])
 AC_CHECK_FUNCS([flock])
 AC_CHECK_FUNCS([asprintf])
+AC_CHECK_FUNCS([__flbf])
 
 AC_CHECK_HEADERS([dlfcn.h])
+AC_CHECK_HEADERS([stdio_ext.h])
 AC_CHECK_HEADERS([tzfile.h])
 AC_CHECK_HEADERS([stdtime/tzfile.h])
 AC_CHECK_FUNCS([dlfunc])
@@ -164,7 +166,6 @@ AC_ARG_ENABLE([libxo-options],
 AC_MSG_RESULT([$LIBXO_OPTS])
 AM_CONDITIONAL([NO_LIBXO_OPTIONS], [test "$LIBXO_OPTS" != "yes"])
 
-
 case $host_os in
      darwin*)
         LIBTOOL=glibtool
@@ -238,6 +239,7 @@ AC_CONFIG_FILES([
   tests/core/Makefile
   tests/xo/Makefile
   packaging/libxo.spec
+  packaging/libxo.rb.base
 ])
 AC_OUTPUT
 

Modified: projects/clang360-import/contrib/libxo/doc/libxo.txt
==============================================================================
--- projects/clang360-import/contrib/libxo/doc/libxo.txt	Sun Jan 25 23:36:55 2015	(r277718)
+++ projects/clang360-import/contrib/libxo/doc/libxo.txt	Sun Jan 25 23:43:12 2015	(r277719)
@@ -12,14 +12,15 @@
 
 libxo - A Library for Generating Text, XML, JSON, and HTML Output
 
-You live in the present, but you want to live in the future.  You'd
-love a flying car, but need to get to work today.  You want to support
-features like XML, JSON, and HTML rendering to allow integration with
-NETCONF, REST, and web browsers, but you need to make text output for
-command line users.  And you don't want multiple code paths that can't
-help but get out of sync.  None of this "if (xml) {... } else {...}"
-logic.  And ifdefs are right out.  But you'd really, really like all
-the fancy features that modern encoding formats can provide.
+You want to prepare for the future, but you need to live in the
+present.  You'd love a flying car, but need to get to work today.  You
+want to support features like XML, JSON, and HTML rendering to allow
+integration with NETCONF, REST, and web browsers, but you need to make
+text output for command line users.  And you don't want multiple code
+paths that can't help but get out of sync.  None of this "if (xml)
+{... } else {...}"  logic.  And ifdefs are right out.  But you'd
+really, really like all the fancy features that modern encoding
+formats can provide.  libxo can help.
 
 The libxo library allows an application to generate text, XML, JSON,
 and HTML output using a common set of function calls.  The application
@@ -83,31 +84,37 @@ The latest release of libxo is available
 
   https://github.com/Juniper/libxo/releases
 
-We are following the branching scheme from 
-^http://nvie.com/posts/a-successful-git-branching-model/^
-which means we will do development under the "develop" branch, and
-release from the master.  To clone a developer tree, run the following
+We are following the branching scheme from
+^http://nvie.com/posts/a-successful-git-branching-model/^ which means
+we will do development under the "develop" branch, and release from
+the "master" branch.  To clone a developer tree, run the following
 command:
 
   git clone https://github.com/Juniper/libxo.git -b develop
 
-We're using semantic release numbering.
+We're using semantic release numbering, as defined in
+^http://semver.org/spec/v2.0.0.html^.
+
+libxo is open source, distributed under the BSD license.  It
+is shipped as part of FreeBSD 11.0.
 
 * Overview
 
 Most unix commands emit text output aimed at humans.  It is designed
-to be parsed and understood by a user.  Humans are gifted at extracted
-details and pattern matching.  Often programmers need to extract
-information from this human-oriented output.  Programmers use tools
-like grep, awk, and regular expressions to ferret out the pieces of
-information they need.  Such solutions are fragile and require
-updates when output contents change or evolve, requiring testing and
-validation.
+to be parsed and understood by a user.  Humans are gifted at
+extracting details and pattern matching in such output.  Often
+programmers need to extract information from this human-oriented
+output.  Programmers use tools like grep, awk, and regular expressions
+to ferret out the pieces of information they need.  Such solutions are
+fragile and require maintenance when output contents change or evolve,
+along with testing and validation.
 
-Modern tool developers favors encoding schemes like XML and JSON,
+Modern tool developers favor encoding schemes like XML and JSON,
 which allow trivial parsing and extraction of data.  Such formats are
 simple, well understood, hierarchical, easily parsed, and often
-integrate easier with common tools and environments.
+integrate easier with common tools and environments.  Changes to
+content can be done in ways that do not break existing users of the
+data, which can reduce maintenance costs and increase feature velocity.
 
 In addition, modern reality means that more output ends up in web
 browsers than in terminals, making HTML output valuable.
@@ -278,7 +285,7 @@ content.  The roles are listed below; on
 |---+--------------+-------------------------------------------------|
 | M | Name         | Description                                     |
 |---+--------------+-------------------------------------------------|
-| D | decoration   | Field is non-text (e.g. colon, comma)           |
+| D | decoration   | Field is non-text (e.g., colon, comma)          |
 | E | error        | Field is an error message                       |
 | L | label        | Field is text that prefixes a value             |
 | N | note         | Field is text that follows a value              |
@@ -321,7 +328,7 @@ the field descriptor, or a printf-style 
 if preceded by a slash ("/"):
 
     xo_emit("{P:        }{Lwc:Cost}{:cost/%u}\n", cost);
-    xo_emit("{P:/30s}{Lwc:Cost}{:cost/%u}\n", "", cost);
+    xo_emit("{P:/%30s}{Lwc:Cost}{:cost/%u}\n", "", cost);
 
 **** The Title Role ({T:})
 
@@ -333,6 +340,16 @@ if preceded by a slash ("/"):
     xo_emit("{T:Interface Statistics}\n");
     xo_emit("{T:/%20.20s}{T:/%6.6s}\n", "Item Name", "Cost");
 
+Title fields have an extra convenience feature; if both content and
+format are specified, instead of looking to the argument list for a
+value, the content is used, allowing a mixture of format and content
+within the field descriptor:
+
+    xo_emit("{T:Name/%20s}{T:Count/%6s}\n");
+
+Since the incoming argument is a string, the format must be "%s" or
+something suitable.
+
 **** The Units Role ({U:})
 
 Units are the dimension by which values are measured, such as degrees,
@@ -412,6 +429,7 @@ content emitted for some output styles:
 | d | display      | Only emit field for display styles (text/HTML)  |
 | e | encoding     | Only emit for encoding styles (XML/JSON)        |
 | k | key          | Field is a key, suitable for XPath predicates   |
+| l | leaf-list    | Field is a leaf-list
 | n | no-quotes    | Do not quote the field when using JSON style    |
 | q | quotes       | Quote the field when using JSON style           |
 | w | white space  | A blank (" ") is appended after the label       |
@@ -433,7 +451,7 @@ The colon modifier appends a single colo
       Name:phil
 
 The colon modifier is only used for the TEXT and HTML output
-styles. It is commonly combined with the space modifier ('{w:').
+styles. It is commonly combined with the space modifier ('{w:}').
 It is purely a convenience feature.
 
 **** The Display Modifier ({d:})
@@ -485,6 +503,24 @@ Currently the key modifier is only used 
 for the HTML output style when XOF_XPATH is set, but other uses are
 likely in the near future.
 
+**** The Leaf-List Modifier ({l:})
+
+The leaf-list modifier is used to distinguish lists where each
+instance consists of only a single value.  In XML, these are
+rendered as single elements, where JSON renders them as arrays.
+
+    EXAMPLE:
+        for (i = 0; i < num_users; i++) {
+            xo_emit("Member {l:user}\n", user[i].u_name);
+        }
+    XML:
+        <user>phil</user>
+        <user>pallavi</user>
+    JSON:
+        "user": [ "phil", "pallavi" ]
+
+The name of the field must match the name of the leaf list.
+
 **** The No-Quotes Modifier ({n:})
 
 The no-quotes modifier (and its twin, the 'quotes' modifier) affect
@@ -522,7 +558,7 @@ The white space modifier appends a singl
       Name phil
 
 The white space modifier is only used for the TEXT and HTML output
-styles. It is commonly combined with the colon modifier ('{c:').
+styles. It is commonly combined with the colon modifier ('{c:}').
 It is purely a convenience feature.
 
 Note that the sense of the 'w' modifier is reversed for the units role
@@ -530,14 +566,15 @@ Note that the sense of the 'w' modifier 
 
 *** Field Formatting
 
-The field format is similar to the format string for printf(3).  It's
-used varies based on the role of the field, but generally is used to
+The field format is similar to the format string for printf(3).  Its
+use varies based on the role of the field, but generally is used to
 format the field's contents.
 
-If not provided, the format string defaults to "%s".
+If the format string is not provided for a value field, it defaults to
+"%s".
 
 Note a field definition can contain zero or more printf-style
-'directives', which are sequences that start with a '%' and end with a
+'directives', which are sequences that start with a '%' and end with
 one of following characters: "diouxXDOUeEfFgGaAcCsSp".  Each directive
 is matched by one of more arguments to the xo_emit function.
 
@@ -557,7 +594,7 @@ argument.  If the width in columns of th
 the minumum width, the value will be padded to reach the minimum.
 - a period followed by one or more digits indicating the maximum
 number of bytes which will be examined for a string argument, or the maximum
-width for a non-string argument.  When handling ASCII strings this is
+width for a non-string argument.  When handling ASCII strings this
 functions as the field width but for multi-byte characters, a single
 character may be composed of multiple bytes.
 xo_emit will never dereference memory beyond the given number of bytes.
@@ -630,8 +667,8 @@ ASCII data, a normal 7-bit ASCII string 
 Unicode values.  '%hs' expects a 'char *' pointer to a multi-byte
 string encoded with the current locale, as given by the LC_CTYPE,
 LANG, or LC_ALL environment varibles.  The first of this list of
-variables is used and if none of the variables, the locale defaults to
-"UTF-8".
+variables is used and if none of the variables are set, the locale
+defaults to "UTF-8".
 
 For example, a function is passed a locale-base name, a hat size,
 and a time value.  The hat size is formatted in a UTF-8 (ASCII)
@@ -676,10 +713,10 @@ columns. 
 
 *** Characters Outside of Field Definitions
 
-Characters in the format string are not part of a field definition are
-copied to the output for the TEXT style, and are ignored for the JSON
-and XML styles.  For HTML, these characters are placed in a <div> with
-class "text".
+Characters in the format string that are not part of a field
+definition are copied to the output for the TEXT style, and are
+ignored for the JSON and XML styles.  For HTML, these characters are
+placed in a <div> with class "text".
 
   EXAMPLE:
       xo_emit("The hat is {:size/%s}.\n", size_val);
@@ -854,7 +891,7 @@ container, a warning will be generated.
 *** Lists and Instances
 
 A list is set of one or more instances that appear under the same
-parent.  The instances contains details about a specific object.  One
+parent.  The instances contain details about a specific object.  One
 can think of instances as objects or records.  A call is needed to
 open and close the list, while a distinct call is needed to open and
 close each instance of the list:
@@ -874,8 +911,8 @@ generation of XML and JSON data.
 
 *** DTRT Mode
 
-Some user may find tracking the names of open containers, lists, and
-instances inconvenient.  libxo offers "Do The Right Thing" mode, where
+Some users may find tracking the names of open containers, lists, and
+instances inconvenient.  libxo offers a "Do The Right Thing" mode, where
 libxo will track the names of open containers, lists, and instances so
 the close function can be called without a name.  To enable DTRT mode,
 turn on the XOF_DTRT flag prior to making any other libxo output.
@@ -889,10 +926,42 @@ will close the open container, list, or 
     ...
     xo_close_container_d();
 
+This also works for lists and instances:
+
+    xo_open_list("item");
+    for (...) {
+        xo_open_instance("item");
+        xo_emit(...);
+        xo_close_instance_d();
+    }
+    xo_close_list_d();
+
 Note that the XOF_WARN flag will also cause libxo to track open
-containers, lists, and instances.  A warning is generated with the
+containers, lists, and instances.  A warning is generated when the
 name given to the close function and the name recorded do not match.
 
+*** Markers
+
+Markers are used to protect and restore the state of open constructs.
+While a marker is open, no other open constructs can be closed.  When
+a marker is closed, all constructs open since the marker was opened
+will be closed.
+
+Markers use names which are not user-visible, allowing the caller to
+choose appropriate internal names.
+
+In this example, the code whiffles through a list of fish, calling a
+function to emit details about each fish.  The marker "fish-guts" is
+used to ensure that any constructs opened by the function are closed
+properly.
+
+    for (i = 0; fish[i]; i++) {
+        xo_open_instance("fish");
+        xo_open_marker("fish-guts");
+        dump_fish_details(i);
+        xo_close_marker("fish-guts");
+    }
+
 ** Handles
 
 libxo uses "handles" to control its rendering functionality.  The
@@ -952,7 +1021,7 @@ be passed NULL to access the default han
 
 For the typical command that is generating output on standard output,
 there is no need to create an explicit handle, but they are available
-when needed, e.g. for daemons that generate multiple streams of
+when needed, e.g., for daemons that generate multiple streams of
 output.
 
 *** xo_create
@@ -972,7 +1041,7 @@ See also ^styles^ and ^flags^.
 
 By default, libxo writes output to standard output.  A convenience
 function is provided for situations when output should be written to
-different file:
+a different file:
 
     xo_handle_t *xo_create_to_file (FILE *fp, unsigned style,
                                     unsigned flags);
@@ -987,10 +1056,13 @@ which can tailor how libxo writes data. 
 recorded and passed back to the write function, allowing the function
 to acquire context information. The 'close' function can
 release this opaque data and any other resources as needed.
+The flush function can flush buffered data associated with the opaque
+object.
 
     void xo_set_writer (xo_handle_t *xop, void *opaque,
                         xo_write_func_t write_func,
                         xo_close_func_t close_func);
+                        xo_flush_func_t flush_func);

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501252343.t0PNhEQF060026>