svn commit: r276302 - in projects/clang350-import: . bin/sh cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libdtrace/common cddl/usr.bin/ctfconvert contrib/binutils/gas contrib/bzi...

Dimitry Andric dim at FreeBSD.org
Sat Dec 27 14:59:03 UTC 2014 

Author: dim
Date: Sat Dec 27 14:58:52 2014
New Revision: 276302
URL: https://svnweb.freebsd.org/changeset/base/276302

Log:
  Merge ^/head r274961 through r276301.

Added:
  projects/clang350-import/contrib/mdocml/mandoc_headers.3
     - copied unchanged from r276301, head/contrib/mdocml/mandoc_headers.3
  projects/clang350-import/contrib/ofed/libibverbs/examples/build/
     - copied from r276301, head/contrib/ofed/libibverbs/examples/build/
  projects/clang350-import/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
     - copied unchanged from r276301, head/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
  projects/clang350-import/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h
     - copied unchanged from r276301, head/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h
Deleted:
  projects/clang350-import/contrib/ofed/libibverbs/examples/Makefile
  projects/clang350-import/share/man/man4/gpib.4
  projects/clang350-import/share/man/man4/pcii.4
  projects/clang350-import/share/man/man4/tnt4882.4
  projects/clang350-import/sys/dev/ieee488/ibfoo.c
  projects/clang350-import/sys/dev/ieee488/ibfoo_int.h
  projects/clang350-import/sys/dev/ieee488/pcii.c
  projects/clang350-import/sys/dev/ieee488/tnt4882.c
  projects/clang350-import/sys/dev/ieee488/tnt4882.h
  projects/clang350-import/sys/dev/ieee488/ugpib.h
  projects/clang350-import/sys/dev/ieee488/upd7210.c
  projects/clang350-import/sys/dev/ieee488/upd7210.h
  projects/clang350-import/sys/geom/sched/subr_disk.c
  projects/clang350-import/sys/modules/dtrace/dtnfsclient/
  projects/clang350-import/sys/modules/nfs_common/
  projects/clang350-import/sys/modules/nfsclient/
  projects/clang350-import/sys/modules/nfsserver/
  projects/clang350-import/sys/net/if_stf.h
  projects/clang350-import/sys/netinet/in_gif.h
  projects/clang350-import/sys/netinet6/in6_gif.h
  projects/clang350-import/sys/nfs/nfs_common.c
  projects/clang350-import/sys/nfsclient/nfs_bio.c
  projects/clang350-import/sys/nfsclient/nfs_kdtrace.c
  projects/clang350-import/sys/nfsclient/nfs_krpc.c
  projects/clang350-import/sys/nfsclient/nfs_nfsiod.c
  projects/clang350-import/sys/nfsclient/nfs_node.c
  projects/clang350-import/sys/nfsclient/nfs_subs.c
  projects/clang350-import/sys/nfsclient/nfs_vfsops.c
  projects/clang350-import/sys/nfsclient/nfs_vnops.c
  projects/clang350-import/sys/nfsserver/nfs_fha_old.c
  projects/clang350-import/sys/nfsserver/nfs_serv.c
  projects/clang350-import/sys/nfsserver/nfs_srvkrpc.c
  projects/clang350-import/sys/nfsserver/nfs_srvsubs.c
  projects/clang350-import/tools/build/options/WITHOUT_GPIB
Modified:
  projects/clang350-import/Makefile.inc1
  projects/clang350-import/ObsoleteFiles.inc
  projects/clang350-import/UPDATING
  projects/clang350-import/bin/sh/error.c
  projects/clang350-import/bin/sh/error.h
  projects/clang350-import/bin/sh/eval.c
  projects/clang350-import/bin/sh/expand.c
  projects/clang350-import/bin/sh/expand.h
  projects/clang350-import/bin/sh/trap.c
  projects/clang350-import/bin/sh/trap.h
  projects/clang350-import/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
  projects/clang350-import/cddl/usr.bin/ctfconvert/ctfconvert.1
  projects/clang350-import/contrib/binutils/gas/expr.c
  projects/clang350-import/contrib/binutils/gas/input-scrub.c
  projects/clang350-import/contrib/binutils/gas/read.c
  projects/clang350-import/contrib/bzip2/bzip2.1
  projects/clang350-import/contrib/ee/ee.1
  projects/clang350-import/contrib/elftoolchain/common/elfdefinitions.h
  projects/clang350-import/contrib/elftoolchain/elfcopy/sections.c
  projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3
  projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3
  projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_hasattr.3
  projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_whatattr.3
  projects/clang350-import/contrib/elftoolchain/libelf/elf.3
  projects/clang350-import/contrib/elftoolchain/readelf/readelf.c
  projects/clang350-import/contrib/gcc/config/arm/arm.c
  projects/clang350-import/contrib/libxo/libxo/libxo.c
  projects/clang350-import/contrib/libxo/libxo/xo_create.3
  projects/clang350-import/contrib/libxo/libxo/xo_emit.3
  projects/clang350-import/contrib/libxo/libxo/xo_open_container.3
  projects/clang350-import/contrib/mdocml/INSTALL
  projects/clang350-import/contrib/mdocml/LICENSE
  projects/clang350-import/contrib/mdocml/Makefile
  projects/clang350-import/contrib/mdocml/Makefile.depend
  projects/clang350-import/contrib/mdocml/NEWS
  projects/clang350-import/contrib/mdocml/TODO
  projects/clang350-import/contrib/mdocml/compat_fts.c
  projects/clang350-import/contrib/mdocml/compat_reallocarray.c
  projects/clang350-import/contrib/mdocml/compat_strcasestr.c
  projects/clang350-import/contrib/mdocml/compat_strsep.c
  projects/clang350-import/contrib/mdocml/config.h
  projects/clang350-import/contrib/mdocml/configure
  projects/clang350-import/contrib/mdocml/configure.local.example
  projects/clang350-import/contrib/mdocml/example.style.css
  projects/clang350-import/contrib/mdocml/html.c
  projects/clang350-import/contrib/mdocml/html.h
  projects/clang350-import/contrib/mdocml/libman.h
  projects/clang350-import/contrib/mdocml/libmandoc.h
  projects/clang350-import/contrib/mdocml/libmdoc.h
  projects/clang350-import/contrib/mdocml/libroff.h
  projects/clang350-import/contrib/mdocml/main.c
  projects/clang350-import/contrib/mdocml/main.h
  projects/clang350-import/contrib/mdocml/man.h
  projects/clang350-import/contrib/mdocml/man_hash.c
  projects/clang350-import/contrib/mdocml/man_html.c
  projects/clang350-import/contrib/mdocml/man_term.c
  projects/clang350-import/contrib/mdocml/mandoc.1
  projects/clang350-import/contrib/mdocml/mandoc.h
  projects/clang350-import/contrib/mdocml/mandoc_aux.h
  projects/clang350-import/contrib/mdocml/mandocdb.c
  projects/clang350-import/contrib/mdocml/manpath.h
  projects/clang350-import/contrib/mdocml/mansearch.3
  projects/clang350-import/contrib/mdocml/mansearch.c
  projects/clang350-import/contrib/mdocml/mansearch.h
  projects/clang350-import/contrib/mdocml/mansearch_const.c
  projects/clang350-import/contrib/mdocml/mdoc.7
  projects/clang350-import/contrib/mdocml/mdoc.h
  projects/clang350-import/contrib/mdocml/mdoc_html.c
  projects/clang350-import/contrib/mdocml/mdoc_macro.c
  projects/clang350-import/contrib/mdocml/mdoc_man.c
  projects/clang350-import/contrib/mdocml/mdoc_term.c
  projects/clang350-import/contrib/mdocml/mdoc_validate.c
  projects/clang350-import/contrib/mdocml/msec.c
  projects/clang350-import/contrib/mdocml/out.c
  projects/clang350-import/contrib/mdocml/out.h
  projects/clang350-import/contrib/mdocml/read.c
  projects/clang350-import/contrib/mdocml/roff.7
  projects/clang350-import/contrib/mdocml/st.in
  projects/clang350-import/contrib/mdocml/term.c
  projects/clang350-import/contrib/mdocml/term.h
  projects/clang350-import/contrib/mdocml/term_ps.c
  projects/clang350-import/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c
  projects/clang350-import/contrib/ntp/ntpd/ntp_config.c
  projects/clang350-import/contrib/ntp/ntpd/ntp_control.c
  projects/clang350-import/contrib/ntp/ntpd/ntp_crypto.c
  projects/clang350-import/contrib/ntp/ntpd/ntp_proto.c
  projects/clang350-import/contrib/ntp/util/ntp-keygen.c
  projects/clang350-import/etc/hosts.allow
  projects/clang350-import/etc/services
  projects/clang350-import/gnu/lib/libssp/Makefile
  projects/clang350-import/gnu/usr.bin/gdb/kgdb/trgt_arm.c
  projects/clang350-import/include/Makefile
  projects/clang350-import/lib/Makefile
  projects/clang350-import/lib/libbsnmp/libbsnmp/Makefile
  projects/clang350-import/lib/libc/gen/cap_rights_get.3
  projects/clang350-import/lib/libc/gen/ftok.3
  projects/clang350-import/lib/libc/gen/ftw.3
  projects/clang350-import/lib/libc/gen/getcap.3
  projects/clang350-import/lib/libc/gen/posix_spawn.3
  projects/clang350-import/lib/libc/gen/scandir.3
  projects/clang350-import/lib/libc/iconv/iconvlist.3
  projects/clang350-import/lib/libc/locale/digittoint.3
  projects/clang350-import/lib/libc/locale/xlocale.3
  projects/clang350-import/lib/libc/net/getaddrinfo.3
  projects/clang350-import/lib/libc/net/sctp_recvmsg.3
  projects/clang350-import/lib/libc/net/sctp_send.3
  projects/clang350-import/lib/libc/posix1e/acl_set_flagset_np.3
  projects/clang350-import/lib/libc/regex/regcomp.c
  projects/clang350-import/lib/libc/rpc/rpc.3
  projects/clang350-import/lib/libc/rpc/rpc_svc_reg.3
  projects/clang350-import/lib/libc/stdlib/atexit.3
  projects/clang350-import/lib/libc/stdlib/exit.3
  projects/clang350-import/lib/libc/string/strspn.3
  projects/clang350-import/lib/libc/sys/access.2
  projects/clang350-import/lib/libc/sys/getdirentries.2
  projects/clang350-import/lib/libc/sys/getrlimit.2
  projects/clang350-import/lib/libc/sys/poll.2
  projects/clang350-import/lib/libc/sys/posix_openpt.2
  projects/clang350-import/lib/libc/sys/procctl.2
  projects/clang350-import/lib/libc/sys/revoke.2
  projects/clang350-import/lib/libc/sys/sched_setscheduler.2
  projects/clang350-import/lib/libc/sys/sigwaitinfo.2
  projects/clang350-import/lib/libc/sys/vfork.2
  projects/clang350-import/lib/libdpv/dpv.3
  projects/clang350-import/lib/libmandoc/Makefile
  projects/clang350-import/lib/libpam/modules/pam_guest/pam_guest.8
  projects/clang350-import/lib/libproc/proc_sym.c
  projects/clang350-import/lib/librtld_db/librtld_db.3
  projects/clang350-import/lib/libstand/cd9660.c
  projects/clang350-import/lib/libstand/ext2fs.c
  projects/clang350-import/lib/libstand/nandfs.c
  projects/clang350-import/lib/libstand/nfs.c
  projects/clang350-import/lib/libstand/read.c
  projects/clang350-import/lib/libstand/stand.h
  projects/clang350-import/lib/libstand/tftp.c
  projects/clang350-import/lib/libstand/twiddle.c
  projects/clang350-import/lib/libstand/ufs.c
  projects/clang350-import/lib/libstand/write.c
  projects/clang350-import/lib/libusb/libusb20.3
  projects/clang350-import/lib/libutil/quotafile.3
  projects/clang350-import/lib/libxo/Makefile
  projects/clang350-import/lib/msun/man/cexp.3
  projects/clang350-import/lib/msun/man/complex.3
  projects/clang350-import/lib/msun/man/csqrt.3
  projects/clang350-import/lib/msun/man/sin.3
  projects/clang350-import/lib/msun/src/math_private.h
  projects/clang350-import/release/arm/release.sh
  projects/clang350-import/sbin/dhclient/dhclient.conf.5
  projects/clang350-import/sbin/dhclient/dhclient.leases.5
  projects/clang350-import/sbin/ifconfig/ifconfig.8
  projects/clang350-import/sbin/iscontrol/iscontrol.8
  projects/clang350-import/sbin/mount/mount.8
  projects/clang350-import/sbin/mount_fusefs/mount_fusefs.8
  projects/clang350-import/sbin/newfs/newfs.8
  projects/clang350-import/share/man/man3/ATOMIC_VAR_INIT.3
  projects/clang350-import/share/man/man3/makedev.3
  projects/clang350-import/share/man/man3/pthread.3
  projects/clang350-import/share/man/man3/pthread_attr.3
  projects/clang350-import/share/man/man3/pthread_cond_init.3
  projects/clang350-import/share/man/man3/pthread_mutex_init.3
  projects/clang350-import/share/man/man3/pthread_mutexattr_getkind_np.3
  projects/clang350-import/share/man/man3/pthread_rwlock_init.3
  projects/clang350-import/share/man/man3/pthread_rwlockattr_getpshared.3
  projects/clang350-import/share/man/man3/pthread_rwlockattr_init.3
  projects/clang350-import/share/man/man3/pthread_rwlockattr_setpshared.3
  projects/clang350-import/share/man/man4/Makefile
  projects/clang350-import/share/man/man4/altera_atse.4
  projects/clang350-import/share/man/man4/aout.4
  projects/clang350-import/share/man/man4/ata.4
  projects/clang350-import/share/man/man4/ath_ahb.4
  projects/clang350-import/share/man/man4/ath_pci.4
  projects/clang350-import/share/man/man4/audit.4
  projects/clang350-import/share/man/man4/bhyve.4   (contents, props changed)
  projects/clang350-import/share/man/man4/carp.4
  projects/clang350-import/share/man/man4/ch.4
  projects/clang350-import/share/man/man4/crypto.4
  projects/clang350-import/share/man/man4/ehci.4
  projects/clang350-import/share/man/man4/geom.4
  projects/clang350-import/share/man/man4/gpioled.4
  projects/clang350-import/share/man/man4/hv_ata_pci_disengage.4
  projects/clang350-import/share/man/man4/hv_kvp.4
  projects/clang350-import/share/man/man4/hv_netvsc.4
  projects/clang350-import/share/man/man4/hv_storvsc.4
  projects/clang350-import/share/man/man4/hv_utils.4
  projects/clang350-import/share/man/man4/hv_vmbus.4
  projects/clang350-import/share/man/man4/igmp.4
  projects/clang350-import/share/man/man4/iicbus.4
  projects/clang350-import/share/man/man4/ip.4
  projects/clang350-import/share/man/man4/ip6.4
  projects/clang350-import/share/man/man4/ipheth.4
  projects/clang350-import/share/man/man4/ips.4
  projects/clang350-import/share/man/man4/iscsi_initiator.4
  projects/clang350-import/share/man/man4/isp.4
  projects/clang350-import/share/man/man4/ispfw.4
  projects/clang350-import/share/man/man4/iwi.4
  projects/clang350-import/share/man/man4/lagg.4
  projects/clang350-import/share/man/man4/man4.i386/glxsb.4
  projects/clang350-import/share/man/man4/man4.powerpc/smu.4
  projects/clang350-import/share/man/man4/man4.powerpc/snd_ai2s.4
  projects/clang350-import/share/man/man4/man4.powerpc/snd_davbus.4
  projects/clang350-import/share/man/man4/mmc.4
  projects/clang350-import/share/man/man4/mmcsd.4
  projects/clang350-import/share/man/man4/mod_cc.4
  projects/clang350-import/share/man/man4/mpr.4
  projects/clang350-import/share/man/man4/mpt.4
  projects/clang350-import/share/man/man4/mrsas.4
  projects/clang350-import/share/man/man4/multicast.4
  projects/clang350-import/share/man/man4/net80211.4
  projects/clang350-import/share/man/man4/netmap.4
  projects/clang350-import/share/man/man4/nfe.4
  projects/clang350-import/share/man/man4/ng_ether_echo.4
  projects/clang350-import/share/man/man4/ng_netflow.4
  projects/clang350-import/share/man/man4/nvram2env.4
  projects/clang350-import/share/man/man4/ohci.4
  projects/clang350-import/share/man/man4/pass.4
  projects/clang350-import/share/man/man4/pccbb.4
  projects/clang350-import/share/man/man4/pflog.4
  projects/clang350-import/share/man/man4/pfsync.4
  projects/clang350-import/share/man/man4/pts.4
  projects/clang350-import/share/man/man4/ral.4
  projects/clang350-import/share/man/man4/rsu.4
  projects/clang350-import/share/man/man4/rum.4
  projects/clang350-import/share/man/man4/run.4
  projects/clang350-import/share/man/man4/sa.4
  projects/clang350-import/share/man/man4/send.4
  projects/clang350-import/share/man/man4/sfxge.4
  projects/clang350-import/share/man/man4/snd_hda.4
  projects/clang350-import/share/man/man4/snd_ich.4
  projects/clang350-import/share/man/man4/tap.4
  projects/clang350-import/share/man/man4/tun.4
  projects/clang350-import/share/man/man4/uhci.4
  projects/clang350-import/share/man/man4/umass.4
  projects/clang350-import/share/man/man4/ural.4
  projects/clang350-import/share/man/man4/usfs.4
  projects/clang350-import/share/man/man4/virtio_console.4
  projects/clang350-import/share/man/man4/virtio_random.4
  projects/clang350-import/share/man/man4/vxlan.4
  projects/clang350-import/share/man/man4/wpi.4
  projects/clang350-import/share/man/man4/wsp.4
  projects/clang350-import/share/man/man5/periodic.conf.5
  projects/clang350-import/share/man/man5/pf.conf.5
  projects/clang350-import/share/man/man5/pf.os.5
  projects/clang350-import/share/man/man5/rc.conf.5
  projects/clang350-import/share/man/man5/services.5
  projects/clang350-import/share/man/man5/src.conf.5
  projects/clang350-import/share/man/man7/c99.7
  projects/clang350-import/share/man/man7/environ.7
  projects/clang350-import/share/man/man7/tuning.7
  projects/clang350-import/share/man/man8/rc.8
  projects/clang350-import/share/man/man9/BUF_ISLOCKED.9
  projects/clang350-import/share/man/man9/BUS_BIND_INTR.9
  projects/clang350-import/share/man/man9/BUS_DESCRIBE_INTR.9
  projects/clang350-import/share/man/man9/DB_COMMAND.9
  projects/clang350-import/share/man/man9/EVENTHANDLER.9
  projects/clang350-import/share/man/man9/Makefile
  projects/clang350-import/share/man/man9/VFS.9
  projects/clang350-import/share/man/man9/VFS_CHECKEXP.9
  projects/clang350-import/share/man/man9/VFS_FHTOVP.9
  projects/clang350-import/share/man/man9/VFS_SET.9
  projects/clang350-import/share/man/man9/VOP_LOCK.9
  projects/clang350-import/share/man/man9/VOP_VPTOCNP.9
  projects/clang350-import/share/man/man9/accf_data.9
  projects/clang350-import/share/man/man9/accf_dns.9
  projects/clang350-import/share/man/man9/acl.9
  projects/clang350-import/share/man/man9/alq.9
  projects/clang350-import/share/man/man9/devfs_set_cdevpriv.9
  projects/clang350-import/share/man/man9/eventtimers.9
  projects/clang350-import/share/man/man9/ieee80211_crypto.9
  projects/clang350-import/share/man/man9/ifnet.9
  projects/clang350-import/share/man/man9/kqueue.9
  projects/clang350-import/share/man/man9/lock.9
  projects/clang350-import/share/man/man9/locking.9
  projects/clang350-import/share/man/man9/mbuf.9
  projects/clang350-import/share/man/man9/mod_cc.9
  projects/clang350-import/share/man/man9/refcount.9
  projects/clang350-import/share/man/man9/usbdi.9
  projects/clang350-import/share/man/man9/vm_page_busy.9
  projects/clang350-import/share/man/man9/vnet.9
  projects/clang350-import/share/man/man9/vnode.9
  projects/clang350-import/share/man/man9/zone.9
  projects/clang350-import/share/misc/committers-ports.dot
  projects/clang350-import/share/mk/bsd.lib.mk
  projects/clang350-import/share/mk/src.opts.mk
  projects/clang350-import/sys/amd64/amd64/trap.c
  projects/clang350-import/sys/amd64/conf/NOTES
  projects/clang350-import/sys/amd64/include/vmm.h   (contents, props changed)
  projects/clang350-import/sys/amd64/vmm/amd/svm.c   (contents, props changed)
  projects/clang350-import/sys/amd64/vmm/intel/vmcs.c
  projects/clang350-import/sys/amd64/vmm/intel/vmcs.h
  projects/clang350-import/sys/amd64/vmm/intel/vmx.c
  projects/clang350-import/sys/amd64/vmm/intel/vmx_msr.c
  projects/clang350-import/sys/amd64/vmm/io/vatpic.c
  projects/clang350-import/sys/amd64/vmm/vmm.c
  projects/clang350-import/sys/arm/allwinner/a20/std.a20
  projects/clang350-import/sys/arm/allwinner/std.a10
  projects/clang350-import/sys/arm/altera/socfpga/std.socfpga
  projects/clang350-import/sys/arm/arm/db_trace.c
  projects/clang350-import/sys/arm/arm/dump_machdep.c
  projects/clang350-import/sys/arm/arm/exception.S
  projects/clang350-import/sys/arm/arm/gdb_machdep.c
  projects/clang350-import/sys/arm/arm/genassym.c
  projects/clang350-import/sys/arm/arm/gic.c
  projects/clang350-import/sys/arm/arm/identcpu.c
  projects/clang350-import/sys/arm/arm/intr.c
  projects/clang350-import/sys/arm/arm/machdep.c
  projects/clang350-import/sys/arm/arm/mp_machdep.c
  projects/clang350-import/sys/arm/arm/nexus.c
  projects/clang350-import/sys/arm/arm/stack_machdep.c
  projects/clang350-import/sys/arm/arm/swtch.S
  projects/clang350-import/sys/arm/arm/trap.c
  projects/clang350-import/sys/arm/arm/vm_machdep.c
  projects/clang350-import/sys/arm/at91/at91_machdep.c
  projects/clang350-import/sys/arm/broadcom/bcm2835/bcm2835_intr.c
  projects/clang350-import/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
  projects/clang350-import/sys/arm/broadcom/bcm2835/bcm2835_mbox.h
  projects/clang350-import/sys/arm/broadcom/bcm2835/files.bcm2835
  projects/clang350-import/sys/arm/broadcom/bcm2835/std.bcm2835
  projects/clang350-import/sys/arm/conf/APALIS-IMX6
  projects/clang350-import/sys/arm/conf/ARMADAXP
  projects/clang350-import/sys/arm/conf/BEAGLEBONE
  projects/clang350-import/sys/arm/conf/CHROMEBOOK-PEACH-PIT
  projects/clang350-import/sys/arm/conf/CNS11XXNAS
  projects/clang350-import/sys/arm/conf/CUBIEBOARD
  projects/clang350-import/sys/arm/conf/CUBIEBOARD2
  projects/clang350-import/sys/arm/conf/DIGI-CCWMX53
  projects/clang350-import/sys/arm/conf/DOCKSTAR
  projects/clang350-import/sys/arm/conf/DREAMPLUG-1001
  projects/clang350-import/sys/arm/conf/EA3250
  projects/clang350-import/sys/arm/conf/EFIKA_MX
  projects/clang350-import/sys/arm/conf/EXYNOS5.common
  projects/clang350-import/sys/arm/conf/HL201
  projects/clang350-import/sys/arm/conf/IMX53
  projects/clang350-import/sys/arm/conf/IMX53-QSB
  projects/clang350-import/sys/arm/conf/IMX6
  projects/clang350-import/sys/arm/conf/PANDABOARD
  projects/clang350-import/sys/arm/conf/RK3188
  projects/clang350-import/sys/arm/conf/RPI-B
  projects/clang350-import/sys/arm/conf/SAM9260EK
  projects/clang350-import/sys/arm/conf/SOCKIT
  projects/clang350-import/sys/arm/conf/SOCKIT-BERI
  projects/clang350-import/sys/arm/conf/VERSATILEPB
  projects/clang350-import/sys/arm/conf/VYBRID
  projects/clang350-import/sys/arm/conf/WANDBOARD-DUAL
  projects/clang350-import/sys/arm/conf/WANDBOARD-QUAD
  projects/clang350-import/sys/arm/conf/WANDBOARD-SOLO
  projects/clang350-import/sys/arm/conf/ZEDBOARD
  projects/clang350-import/sys/arm/freescale/imx/imx51_machdep.c
  projects/clang350-import/sys/arm/freescale/imx/imx53_machdep.c
  projects/clang350-import/sys/arm/freescale/imx/imx6_machdep.c
  projects/clang350-import/sys/arm/freescale/imx/std.imx51
  projects/clang350-import/sys/arm/freescale/imx/std.imx53
  projects/clang350-import/sys/arm/freescale/imx/std.imx6
  projects/clang350-import/sys/arm/freescale/vybrid/std.vybrid
  projects/clang350-import/sys/arm/include/asm.h
  projects/clang350-import/sys/arm/include/cpuconf.h
  projects/clang350-import/sys/arm/include/db_machdep.h
  projects/clang350-import/sys/arm/include/frame.h
  projects/clang350-import/sys/arm/include/intr.h
  projects/clang350-import/sys/arm/include/machdep.h
  projects/clang350-import/sys/arm/include/pcb.h
  projects/clang350-import/sys/arm/include/smp.h
  projects/clang350-import/sys/arm/include/sysreg.h
  projects/clang350-import/sys/arm/lpc/lpc_intc.c
  projects/clang350-import/sys/arm/mv/mpic.c
  projects/clang350-import/sys/arm/mv/std-pj4b.mv
  projects/clang350-import/sys/arm/rockchip/std.rk30xx
  projects/clang350-import/sys/arm/samsung/exynos/std.exynos5250
  projects/clang350-import/sys/arm/samsung/exynos/std.exynos5420
  projects/clang350-import/sys/arm/ti/aintc.c
  projects/clang350-import/sys/arm/ti/am335x/am335x_usbss.c
  projects/clang350-import/sys/arm/ti/std.ti
  projects/clang350-import/sys/arm/ti/ti_gpio.c
  projects/clang350-import/sys/arm/ti/ti_gpio.h
  projects/clang350-import/sys/arm/ti/ti_i2c.c
  projects/clang350-import/sys/arm/ti/ti_sdhci.c
  projects/clang350-import/sys/arm/ti/ti_wdt.c
  projects/clang350-import/sys/arm/xilinx/std.zynq7
  projects/clang350-import/sys/boot/amd64/boot1.efi/Makefile
  projects/clang350-import/sys/boot/amd64/boot1.efi/generate-fat.sh
  projects/clang350-import/sys/boot/amd64/efi/Makefile
  projects/clang350-import/sys/boot/arm/uboot/Makefile
  projects/clang350-import/sys/boot/common/console.c
  projects/clang350-import/sys/boot/common/loader.8
  projects/clang350-import/sys/boot/fdt/dts/arm/am335x.dtsi
  projects/clang350-import/sys/boot/fdt/dts/arm/rpi.dts
  projects/clang350-import/sys/boot/forth/brand.4th.8
  projects/clang350-import/sys/boot/forth/delay.4th.8
  projects/clang350-import/sys/boot/forth/loader.conf
  projects/clang350-import/sys/boot/forth/menu.4th.8
  projects/clang350-import/sys/boot/forth/menusets.4th.8
  projects/clang350-import/sys/boot/forth/version.4th.8
  projects/clang350-import/sys/boot/i386/libi386/spinconsole.c
  projects/clang350-import/sys/boot/powerpc/uboot/Makefile
  projects/clang350-import/sys/boot/uboot/common/main.c
  projects/clang350-import/sys/cam/ctl/ctl.c
  projects/clang350-import/sys/cam/ctl/ctl.h
  projects/clang350-import/sys/cam/ctl/ctl_backend.c
  projects/clang350-import/sys/cam/ctl/ctl_backend.h
  projects/clang350-import/sys/cam/ctl/ctl_backend_block.c
  projects/clang350-import/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/clang350-import/sys/cam/ctl/ctl_frontend.c
  projects/clang350-import/sys/cam/ctl/ctl_frontend_cam_sim.c
  projects/clang350-import/sys/cam/ctl/ctl_frontend_internal.c
  projects/clang350-import/sys/cam/ctl/ctl_tpc.c
  projects/clang350-import/sys/cam/ctl/ctl_tpc.h
  projects/clang350-import/sys/cam/ctl/ctl_tpc_local.c
  projects/clang350-import/sys/cam/ctl/scsi_ctl.c
  projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
  projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/clang350-import/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  projects/clang350-import/sys/cddl/dev/dtrace/i386/dtrace_subr.c
  projects/clang350-import/sys/cddl/dev/dtrace/mips/dtrace_subr.c
  projects/clang350-import/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
  projects/clang350-import/sys/conf/NOTES
  projects/clang350-import/sys/conf/files
  projects/clang350-import/sys/conf/newvers.sh
  projects/clang350-import/sys/conf/options
  projects/clang350-import/sys/dev/ahci/ahci.c
  projects/clang350-import/sys/dev/ahci/ahci.h
  projects/clang350-import/sys/dev/ath/if_ath_sysctl.c
  projects/clang350-import/sys/dev/beri/virtio/virtio.c
  projects/clang350-import/sys/dev/bge/if_bge.c
  projects/clang350-import/sys/dev/cpuctl/cpuctl.c
  projects/clang350-import/sys/dev/fdt/fdt_common.c
  projects/clang350-import/sys/dev/fxp/if_fxp.c
  projects/clang350-import/sys/dev/fxp/if_fxpreg.h
  projects/clang350-import/sys/dev/fxp/if_fxpvar.h
  projects/clang350-import/sys/dev/gpio/gpio_if.m
  projects/clang350-import/sys/dev/ipmi/ipmi_kcs.c
  projects/clang350-import/sys/dev/isci/isci_controller.c
  projects/clang350-import/sys/dev/isci/isci_sysctl.c
  projects/clang350-import/sys/dev/iscsi/iscsi.c
  projects/clang350-import/sys/dev/iwn/if_iwn.c
  projects/clang350-import/sys/dev/mmc/mmc.c
  projects/clang350-import/sys/dev/ofw/ofw_cpu.c
  projects/clang350-import/sys/dev/pci/pci.c
  projects/clang350-import/sys/dev/sdhci/sdhci.c
  projects/clang350-import/sys/dev/sdhci/sdhci.h
  projects/clang350-import/sys/dev/usb/quirk/usb_quirk.c
  projects/clang350-import/sys/dev/usb/usbdevs
  projects/clang350-import/sys/dev/vt/hw/efifb/efifb.c
  projects/clang350-import/sys/dev/vt/hw/vga/vt_vga.c
  projects/clang350-import/sys/dev/vt/vt.h
  projects/clang350-import/sys/dev/vt/vt_core.c
  projects/clang350-import/sys/dev/wpi/if_wpi.c
  projects/clang350-import/sys/dev/wpi/if_wpireg.h
  projects/clang350-import/sys/fs/ext2fs/ext2_vnops.c
  projects/clang350-import/sys/fs/msdosfs/msdosfs_vnops.c
  projects/clang350-import/sys/fs/nandfs/nandfs_vnops.c
  projects/clang350-import/sys/fs/nfs/nfs_commonkrpc.c
  projects/clang350-import/sys/fs/nfs/nfs_commonsubs.c
  projects/clang350-import/sys/fs/nfs/nfsport.h
  projects/clang350-import/sys/fs/nfsclient/nfs.h
  projects/clang350-import/sys/fs/nfsclient/nfs_clnode.c
  projects/clang350-import/sys/fs/nfsclient/nfs_clport.c
  projects/clang350-import/sys/fs/nfsclient/nfs_clvfsops.c
  projects/clang350-import/sys/fs/nfsclient/nfs_clvnops.c
  projects/clang350-import/sys/fs/nfsserver/nfs_nfsdport.c
  projects/clang350-import/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/clang350-import/sys/fs/tmpfs/tmpfs_vnops.c
  projects/clang350-import/sys/geom/sched/README
  projects/clang350-import/sys/geom/sched/g_sched.c
  projects/clang350-import/sys/geom/sched/g_sched.h
  projects/clang350-import/sys/geom/sched/gs_rr.c
  projects/clang350-import/sys/i386/i386/trap.c
  projects/clang350-import/sys/i386/xen/clock.c
  projects/clang350-import/sys/kern/kern_sig.c
  projects/clang350-import/sys/kern/subr_fattime.c
  projects/clang350-import/sys/kern/uipc_sockbuf.c
  projects/clang350-import/sys/kern/uipc_socket.c
  projects/clang350-import/sys/kern/vfs_default.c
  projects/clang350-import/sys/kern/vfs_vnops.c
  projects/clang350-import/sys/mips/beri/beri_machdep.c
  projects/clang350-import/sys/mips/mips/trap.c
  projects/clang350-import/sys/modules/Makefile
  projects/clang350-import/sys/modules/cryptodev/Makefile
  projects/clang350-import/sys/modules/dtrace/Makefile
  projects/clang350-import/sys/modules/dtrace/dtraceall/dtraceall.c
  projects/clang350-import/sys/modules/geom/geom_sched/gs_sched/Makefile
  projects/clang350-import/sys/modules/geom/geom_sched/gsched_rr/Makefile
  projects/clang350-import/sys/modules/if_gif/Makefile
  projects/clang350-import/sys/net/if_gif.c
  projects/clang350-import/sys/net/if_gif.h
  projects/clang350-import/sys/net/if_gre.c
  projects/clang350-import/sys/net/if_gre.h
  projects/clang350-import/sys/net/if_stf.c
  projects/clang350-import/sys/net80211/ieee80211_output.c
  projects/clang350-import/sys/net80211/ieee80211_power.c
  projects/clang350-import/sys/net80211/ieee80211_proto.h
  projects/clang350-import/sys/net80211/ieee80211_scan.c
  projects/clang350-import/sys/net80211/ieee80211_sta.c
  projects/clang350-import/sys/netinet/in_gif.c
  projects/clang350-import/sys/netinet/in_systm.h
  projects/clang350-import/sys/netinet/ip_gre.c
  projects/clang350-import/sys/netinet/ip_icmp.c
  projects/clang350-import/sys/netinet/ip_icmp.h
  projects/clang350-import/sys/netinet/sctp_usrreq.c
  projects/clang350-import/sys/netinet/sctputil.c
  projects/clang350-import/sys/netinet6/in6_gif.c
  projects/clang350-import/sys/netinet6/ip6_gre.c
  projects/clang350-import/sys/netipsec/ipsec.c
  projects/clang350-import/sys/netipsec/ipsec.h
  projects/clang350-import/sys/netipsec/key.c
  projects/clang350-import/sys/netipsec/key_debug.c
  projects/clang350-import/sys/nfs/bootp_subr.c
  projects/clang350-import/sys/powerpc/aim/trap.c
  projects/clang350-import/sys/sys/dtrace_bsd.h
  projects/clang350-import/sys/sys/mbuf.h
  projects/clang350-import/sys/sys/param.h
  projects/clang350-import/sys/sys/sem.h
  projects/clang350-import/sys/sys/time.h
  projects/clang350-import/sys/sys/vnode.h
  projects/clang350-import/sys/teken/libteken/teken.3
  projects/clang350-import/sys/ufs/ufs/ufs_vnops.c
  projects/clang350-import/sys/vm/vm_page.c
  projects/clang350-import/sys/vm/vm_page.h
  projects/clang350-import/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang350-import/tools/tools/ether_reflect/ether_reflect.1
  projects/clang350-import/tools/tools/sysbuild/sysbuild.sh
  projects/clang350-import/tools/tools/vimage/vimage.8
  projects/clang350-import/usr.bin/dpv/dpv.1
  projects/clang350-import/usr.bin/iscsictl/iscsi.conf.5
  projects/clang350-import/usr.bin/last/last.1
  projects/clang350-import/usr.bin/man/man.1
  projects/clang350-import/usr.bin/man/man.sh
  projects/clang350-import/usr.bin/mandoc/Makefile
  projects/clang350-import/usr.bin/mkcsmapper/mkcsmapper.1
  projects/clang350-import/usr.bin/mkesdb/mkesdb.1
  projects/clang350-import/usr.bin/patch/patch.c
  projects/clang350-import/usr.bin/patch/pch.c
  projects/clang350-import/usr.bin/patch/util.c
  projects/clang350-import/usr.bin/patch/util.h
  projects/clang350-import/usr.bin/rup/rup.1
  projects/clang350-import/usr.bin/rusers/rusers.1
  projects/clang350-import/usr.bin/rwall/rwall.1
  projects/clang350-import/usr.bin/script/script.1
  projects/clang350-import/usr.bin/seq/seq.1
  projects/clang350-import/usr.bin/seq/seq.c
  projects/clang350-import/usr.bin/setchannel/setchannel.1
  projects/clang350-import/usr.bin/showmount/showmount.8
  projects/clang350-import/usr.sbin/bluetooth/btpand/btpand.8
  projects/clang350-import/usr.sbin/bsdinstall/scripts/zfsboot
  projects/clang350-import/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
  projects/clang350-import/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3
  projects/clang350-import/usr.sbin/ctladm/ctladm.c
  projects/clang350-import/usr.sbin/ctld/login.c
  projects/clang350-import/usr.sbin/freebsd-update/freebsd-update.sh
  projects/clang350-import/usr.sbin/gpioctl/gpioctl.8
  projects/clang350-import/usr.sbin/gssd/gssd.8
  projects/clang350-import/usr.sbin/iscsid/login.c
  projects/clang350-import/usr.sbin/jail/jail.8
  projects/clang350-import/usr.sbin/kldxref/kldxref.c
  projects/clang350-import/usr.sbin/nandsim/nandsim.8
  projects/clang350-import/usr.sbin/nfsuserd/nfsuserd.8
  projects/clang350-import/usr.sbin/rpc.umntall/rpc.umntall.8
  projects/clang350-import/usr.sbin/rtadvctl/rtadvctl.8
  projects/clang350-import/usr.sbin/rtadvd/rtadvd.conf.5
Directory Properties:
  projects/clang350-import/   (props changed)
  projects/clang350-import/cddl/   (props changed)
  projects/clang350-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang350-import/contrib/binutils/   (props changed)
  projects/clang350-import/contrib/bzip2/   (props changed)
  projects/clang350-import/contrib/ee/   (props changed)
  projects/clang350-import/contrib/gcc/   (props changed)
  projects/clang350-import/contrib/mdocml/   (props changed)
  projects/clang350-import/contrib/ntp/   (props changed)
  projects/clang350-import/etc/   (props changed)
  projects/clang350-import/gnu/lib/   (props changed)
  projects/clang350-import/gnu/usr.bin/gdb/   (props changed)
  projects/clang350-import/include/   (props changed)
  projects/clang350-import/lib/libc/   (props changed)
  projects/clang350-import/lib/libutil/   (props changed)
  projects/clang350-import/sbin/   (props changed)
  projects/clang350-import/share/   (props changed)
  projects/clang350-import/share/man/man4/   (props changed)
  projects/clang350-import/sys/   (props changed)
  projects/clang350-import/sys/amd64/vmm/   (props changed)
  projects/clang350-import/sys/boot/   (props changed)
  projects/clang350-import/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang350-import/sys/conf/   (props changed)
  projects/clang350-import/usr.sbin/jail/   (props changed)
  projects/clang350-import/usr.sbin/rtadvctl/   (props changed)
  projects/clang350-import/usr.sbin/rtadvd/   (props changed)

Modified: projects/clang350-import/Makefile.inc1
==============================================================================
--- projects/clang350-import/Makefile.inc1	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/Makefile.inc1	Sat Dec 27 14:58:52 2014	(r276302)
@@ -1367,6 +1367,11 @@ _share=	share/syscons/scrnmaps
 _gcc_tools= gnu/usr.bin/cc/cc_tools
 .endif
 
+.if ${MK_INFO} != "no"
+_texinfo=	gnu/usr.bin/texinfo/libtxi \
+		gnu/usr.bin/texinfo/makeinfo
+.endif
+
 .if ${MK_RESCUE} != "no"
 _rescue= rescue/rescue
 .endif
@@ -1398,6 +1403,16 @@ build-tools: .MAKE
 		${MAKE} DIRPRFX=${_tool}/ depend && \
 		${MAKE} DIRPRFX=${_tool}/ all
 .endfor
+.for _tool in \
+    ${_texinfo}
+	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
+		cd ${.CURDIR}/${_tool} && \
+		${MAKE} DIRPRFX=${_tool}/ obj && \
+		${MAKE} DIRPRFX=${_tool}/ depend && \
+		${MAKE} DIRPRFX=${_tool}/ all && \
+		${MAKE} DIRPRFX=${_tool}/ install DESTDIR=${WORLDTMP}
+.endfor
+
 
 #
 # kernel-tools: Build kernel-building tools

Modified: projects/clang350-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang350-import/ObsoleteFiles.inc	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/ObsoleteFiles.inc	Sat Dec 27 14:58:52 2014	(r276302)
@@ -38,7 +38,7 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
-# 20141204: new clang import which bumps version from 3.4.1 to 3.5.0.
+# 20141227: new clang import which bumps version from 3.4.1 to 3.5.0.
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.4.1/altivec.h
@@ -74,6 +74,35 @@ OLD_FILES+=usr/include/clang/3.4.1/x86in
 OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.4.1
+# 20141226: Remove gpib/ieee488
+OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
+OLD_FILES+=usr/include/dev/ieee488/tnt4882.h
+OLD_FILES+=usr/include/dev/ieee488/ugpib.h
+OLD_FILES+=usr/include/dev/ieee488/upd7210.h
+OLD_DIRS+=usr/include/dev/ieee488
+OLD_FILES+=usr/include/gpib/gpib.h
+OLD_DIRS+=usr/include/gpib
+OLD_FILES+=usr/lib/libgpib.a
+OLD_FILES+=usr/lib/libgpib_p.a
+OLD_FILES+=usr/lib/libgpib.so
+OLD_LIBS+=usr/lib/libgpib.so.3
+OLD_FILES+=usr/lib/libgpib_p.a
+OLD_FILES+=share/man/man4/pcii.4.gz
+OLD_FILES+=share/man/man4/gpib.4.gz
+OLD_FILES+=share/man/man4/tnt4882.4.gz
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_FILES+=usr/lib32/libgpib.a
+OLD_FILES+=usr/lib32/libgpib_p.a
+OLD_FILES+=usr/lib32/libgpib.so
+OLD_LIBS+=usr/lib32/libgpib.so.3
+.endif
+
+# 20141224: libxo moved to /lib
+OLD_LIBS+=usr/lib/libxo.so.0
+# 20141223: remove in6_gif.h, in_gif.h and if_stf.h
+OLD_FILES+=usr/include/net/if_stf.h
+OLD_FILES+=usr/include/netinet/in_gif.h
+OLD_FILES+=usr/include/netinet6/in6_gif.h
 # 20141202: update to mandoc CVS 20141201
 OLD_FILES+=usr.bin/preconv
 OLD_FILES+=share/man/man1/preconv.1.gz

Modified: projects/clang350-import/UPDATING
==============================================================================
--- projects/clang350-import/UPDATING	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/UPDATING	Sat Dec 27 14:58:52 2014	(r276302)
@@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20141222:
+	The old NFS client and server (kernel options NFSCLIENT, NFSSERVER)
+	kernel sources have been removed. The .h files remain, since some
+	utilities include them. This will need to be fixed later.
+	If "mount -t oldnfs ..." is attempted, it will fail.
+	If the "-o" option on mountd(8), nfsd(8) or nfsstat(1) is used,
+	the utilities will report errors.
+
 20141121:
 	The handling of LOCAL_LIB_DIRS has been altered to skip addition of
 	directories to top level SUBDIR variable when their parent

Modified: projects/clang350-import/bin/sh/error.c
==============================================================================
--- projects/clang350-import/bin/sh/error.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/bin/sh/error.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -90,13 +90,14 @@ exraise(int e)
 
 
 /*
- * Called from trap.c when a SIGINT is received.  (If the user specifies
- * that SIGINT is to be trapped or ignored using the trap builtin, then
- * this routine is not called.)  Suppressint is nonzero when interrupts
- * are held using the INTOFF macro.  If SIGINTs are not suppressed and
- * the shell is not a root shell, then we want to be terminated if we
- * get here, as if we were terminated directly by a SIGINT.  Arrange for
- * this here.
+ * Called from trap.c when a SIGINT is received and not suppressed, or when
+ * an interrupt is pending and interrupts are re-enabled using INTON.
+ * (If the user specifies that SIGINT is to be trapped or ignored using the
+ * trap builtin, then this routine is not called.)  Suppressint is nonzero
+ * when interrupts are held using the INTOFF macro.  If SIGINTs are not
+ * suppressed and the shell is not a root shell, then we want to be
+ * terminated if we get here, as if we were terminated directly by a SIGINT.
+ * Arrange for this here.
  */
 
 void
@@ -104,16 +105,6 @@ onint(void)
 {
 	sigset_t sigs;
 
-	/*
-	 * The !in_dotrap here is safe.  The only way we can arrive here
-	 * with in_dotrap set is that a trap handler set SIGINT to SIG_DFL
-	 * and killed itself.
-	 */
-
-	if (suppressint && !in_dotrap) {
-		intpending++;
-		return;
-	}
 	intpending = 0;
 	sigemptyset(&sigs);
 	sigprocmask(SIG_SETMASK, &sigs, NULL);
@@ -130,6 +121,7 @@ onint(void)
 	else {
 		signal(SIGINT, SIG_DFL);
 		kill(getpid(), SIGINT);
+		_exit(128 + SIGINT);
 	}
 }
 

Modified: projects/clang350-import/bin/sh/error.h
==============================================================================
--- projects/clang350-import/bin/sh/error.h	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/bin/sh/error.h	Sat Dec 27 14:58:52 2014	(r276302)
@@ -75,11 +75,12 @@ extern volatile sig_atomic_t intpending;
 #define is_int_on() suppressint
 #define SETINTON(s) suppressint = (s)
 #define FORCEINTON {suppressint = 0; if (intpending) onint();}
+#define SET_PENDING_INT intpending = 1
 #define CLEAR_PENDING_INT intpending = 0
 #define int_pending() intpending
 
 void exraise(int) __dead2;
-void onint(void);
+void onint(void) __dead2;
 void warning(const char *, ...) __printflike(1, 2);
 void error(const char *, ...) __printf0like(1, 2) __dead2;
 void exerror(int, const char *, ...) __printf0like(2, 3) __dead2;

Modified: projects/clang350-import/bin/sh/eval.c
==============================================================================
--- projects/clang350-import/bin/sh/eval.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/bin/sh/eval.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -539,13 +539,13 @@ expredir(union node *n)
 		case NFROMTO:
 		case NAPPEND:
 		case NCLOBBER:
-			expandarg(redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR);
+			expandarg(redir->nfile.fname, &fn, EXP_TILDE);
 			redir->nfile.expfname = fn.list->text;
 			break;
 		case NFROMFD:
 		case NTOFD:
 			if (redir->ndup.vname) {
-				expandarg(redir->ndup.vname, &fn, EXP_TILDE | EXP_REDIR);
+				expandarg(redir->ndup.vname, &fn, EXP_TILDE);
 				fixredir(redir, fn.list->text, 1);
 			}
 			break;

Modified: projects/clang350-import/bin/sh/expand.c
==============================================================================
--- projects/clang350-import/bin/sh/expand.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/bin/sh/expand.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -171,17 +171,12 @@ expandarg(union node *arg, struct arglis
 	STPUTC('\0', expdest);
 	p = grabstackstr(expdest);
 	exparg.lastp = &exparg.list;
-	/*
-	 * TODO - EXP_REDIR
-	 */
 	if (flag & EXP_FULL) {
 		ifsbreakup(p, &exparg);
 		*exparg.lastp = NULL;
 		exparg.lastp = &exparg.list;
 		expandmeta(exparg.list, flag);
 	} else {
-		if (flag & EXP_REDIR) /*XXX - for now, just remove escapes */
-			rmescapes(p);
 		sp = (struct strlist *)stalloc(sizeof (struct strlist));
 		sp->text = p;
 		*exparg.lastp = sp;
@@ -209,7 +204,7 @@ expandarg(union node *arg, struct arglis
  * expansion, and tilde expansion if requested via EXP_TILDE/EXP_VARTILDE.
  * Processing ends at a CTLENDVAR or CTLENDARI character as well as '\0'.
  * This is used to expand word in ${var+word} etc.
- * If EXP_FULL, EXP_CASE or EXP_REDIR are set, keep and/or generate CTLESC
+ * If EXP_FULL or EXP_CASE are set, keep and/or generate CTLESC
  * characters to allow for further processing.
  * If EXP_FULL is set, also preserve CTLQUOTEMARK characters.
  */
@@ -217,7 +212,7 @@ static char *
 argstr(char *p, int flag)
 {
 	char c;
-	int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);	/* do CTLESC */
+	int quotes = flag & (EXP_FULL | EXP_CASE);	/* do CTLESC */
 	int firsteq = 1;
 	int split_lit;
 	int lit_quoted;
@@ -303,7 +298,7 @@ exptilde(char *p, int flag)
 	char c, *startp = p;
 	struct passwd *pw;
 	char *home;
-	int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);
+	int quotes = flag & (EXP_FULL | EXP_CASE);
 
 	while ((c = *p) != '\0') {
 		switch(c) {
@@ -437,7 +432,7 @@ expbackq(union node *cmd, int quoted, in
 	char lastc;
 	int startloc = dest - stackblock();
 	char const *syntax = quoted? DQSYNTAX : BASESYNTAX;
-	int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);
+	int quotes = flag & (EXP_FULL | EXP_CASE);
 	size_t nnl;
 
 	INTOFF;
@@ -637,7 +632,7 @@ evalvar(char *p, int flag)
 	int varlen;
 	int varlenb;
 	int easy;
-	int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);
+	int quotes = flag & (EXP_FULL | EXP_CASE);
 
 	varflags = (unsigned char)*p++;
 	subtype = varflags & VSTYPE;
@@ -862,7 +857,7 @@ varisset(const char *name, int nulok)
 static void
 strtodest(const char *p, int flag, int subtype, int quoted)
 {
-	if (flag & (EXP_FULL | EXP_CASE | EXP_REDIR) && subtype != VSLENGTH)
+	if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH)
 		STPUTS_QUOTES(p, quoted ? DQSYNTAX : BASESYNTAX, expdest);
 	else
 		STPUTS(p, expdest);
@@ -1104,7 +1099,6 @@ expandmeta(struct strlist *str, int flag
 	struct strlist **savelastp;
 	struct strlist *sp;
 	char c;
-	/* TODO - EXP_REDIR */
 
 	while (str) {
 		savelastp = exparg.lastp;

Modified: projects/clang350-import/bin/sh/expand.h
==============================================================================
--- projects/clang350-import/bin/sh/expand.h	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/bin/sh/expand.h	Sat Dec 27 14:58:52 2014	(r276302)
@@ -50,7 +50,6 @@ struct arglist {
 #define EXP_FULL	0x1	/* perform word splitting & file globbing */
 #define EXP_TILDE	0x2	/* do normal tilde expansion */
 #define	EXP_VARTILDE	0x4	/* expand tildes in an assignment */
-#define	EXP_REDIR	0x8	/* file glob for a redirection (1 match only) */
 #define EXP_CASE	0x10	/* keeps quotes around for CASE pattern */
 #define EXP_SPLIT_LIT	0x20	/* IFS split literal text ${v+-a b c} */
 #define EXP_LIT_QUOTED	0x40	/* for EXP_SPLIT_LIT, start off quoted */

Modified: projects/clang350-import/bin/sh/trap.c
==============================================================================
--- projects/clang350-import/bin/sh/trap.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/bin/sh/trap.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$");
 static char sigmode[NSIG];	/* current value of signal */
 volatile sig_atomic_t pendingsig;	/* indicates some signal received */
 volatile sig_atomic_t pendingsig_waitcmd;	/* indicates SIGINT/SIGQUIT received */
-int in_dotrap;			/* do we execute in a trap handler? */
+static int in_dotrap;			/* do we execute in a trap handler? */
 static char *volatile trap[NSIG];	/* trap handler commands */
 static volatile sig_atomic_t gotsig[NSIG];
 				/* indicates specified signal received */
@@ -380,7 +380,15 @@ onsig(int signo)
 {
 
 	if (signo == SIGINT && trap[SIGINT] == NULL) {
-		onint();
+		/*
+		 * The !in_dotrap here is safe.  The only way we can arrive
+		 * here with in_dotrap set is that a trap handler set SIGINT to
+		 * SIG_DFL and killed itself.
+		 */
+		if (suppressint && !in_dotrap)
+			SET_PENDING_INT;
+		else
+			onint();
 		return;
 	}
 

Modified: projects/clang350-import/bin/sh/trap.h
==============================================================================
--- projects/clang350-import/bin/sh/trap.h	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/bin/sh/trap.h	Sat Dec 27 14:58:52 2014	(r276302)
@@ -35,7 +35,6 @@
 
 extern volatile sig_atomic_t pendingsig;
 extern volatile sig_atomic_t pendingsig_waitcmd;
-extern int in_dotrap;
 
 void clear_traps(void);
 int have_traps(void);

Modified: projects/clang350-import/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/clang350-import/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -4509,11 +4509,12 @@ zpool_do_status(int argc, char **argv)
 }
 
 typedef struct upgrade_cbdata {
-	int	cb_first;
-	char	cb_poolname[ZPOOL_MAXNAMELEN];
-	int	cb_argc;
-	uint64_t cb_version;
-	char	**cb_argv;
+	boolean_t	cb_first;
+	boolean_t	cb_unavail;
+	char		cb_poolname[ZPOOL_MAXNAMELEN];
+	int		cb_argc;
+	uint64_t	cb_version;
+	char		**cb_argv;
 } upgrade_cbdata_t;
 
 #ifdef __FreeBSD__
@@ -4629,6 +4630,14 @@ upgrade_cb(zpool_handle_t *zhp, void *ar
 	boolean_t printnl = B_FALSE;
 	int ret;
 
+	if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) {
+		(void) fprintf(stderr, gettext("cannot upgrade '%s': pool is "
+		    "currently unavailable.\n\n"), zpool_get_name(zhp));
+		cbp->cb_unavail = B_TRUE;
+		/* Allow iteration to continue. */
+		return (0);
+	}
+
 	config = zpool_get_config(zhp, NULL);
 	verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION,
 	    &version) == 0);
@@ -4690,12 +4699,41 @@ upgrade_cb(zpool_handle_t *zhp, void *ar
 }
 
 static int
+upgrade_list_unavail(zpool_handle_t *zhp, void *arg)
+{
+	upgrade_cbdata_t *cbp = arg;
+
+	if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) {
+		if (cbp->cb_first) {
+			(void) fprintf(stderr, gettext("The following pools "
+			    "are unavailable and cannot be upgraded as this "
+			    "time.\n\n"));
+			(void) fprintf(stderr, gettext("POOL\n"));
+			(void) fprintf(stderr, gettext("------------\n"));
+			cbp->cb_first = B_FALSE;
+		}
+		(void) printf(gettext("%s\n"), zpool_get_name(zhp));
+		cbp->cb_unavail = B_TRUE;
+	}
+	return (0);
+}
+
+static int
 upgrade_list_older_cb(zpool_handle_t *zhp, void *arg)
 {
 	upgrade_cbdata_t *cbp = arg;
 	nvlist_t *config;
 	uint64_t version;
 
+	if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) {
+		/*
+		 * This will have been reported by upgrade_list_unavail so
+		 * just allow iteration to continue.
+		 */
+		cbp->cb_unavail = B_TRUE;
+		return (0);
+	}
+
 	config = zpool_get_config(zhp, NULL);
 	verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION,
 	    &version) == 0);
@@ -4729,6 +4767,15 @@ upgrade_list_disabled_cb(zpool_handle_t 
 	nvlist_t *config;
 	uint64_t version;
 
+	if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) {
+		/*
+		 * This will have been reported by upgrade_list_unavail so
+		 * just allow iteration to continue.
+		 */
+		cbp->cb_unavail = B_TRUE;
+		return (0);
+	}
+
 	config = zpool_get_config(zhp, NULL);
 	verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION,
 	    &version) == 0);
@@ -4782,10 +4829,17 @@ upgrade_one(zpool_handle_t *zhp, void *d
 	uint64_t cur_version;
 	int ret;
 
+	if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) {
+		(void) fprintf(stderr, gettext("cannot upgrade '%s': pool is "
+		    "is currently unavailable.\n\n"), zpool_get_name(zhp));
+		cbp->cb_unavail = B_TRUE;
+		return (1);
+	}
+
 	if (strcmp("log", zpool_get_name(zhp)) == 0) {
 		(void) printf(gettext("'log' is now a reserved word\n"
 		    "Pool 'log' must be renamed using export and import"
-		    " to upgrade.\n"));
+		    " to upgrade.\n\n"));
 		return (1);
 	}
 
@@ -4829,7 +4883,7 @@ upgrade_one(zpool_handle_t *zhp, void *d
 #endif	/* __FreeBSD __*/
 		} else if (cur_version == SPA_VERSION) {
 			(void) printf(gettext("Pool '%s' already has all "
-			    "supported features enabled.\n"),
+			    "supported features enabled.\n\n"),
 			    zpool_get_name(zhp));
 		}
 	}
@@ -4986,11 +5040,13 @@ zpool_do_upgrade(int argc, char **argv)
 		ret = zpool_iter(g_zfs, upgrade_cb, &cb);
 		if (ret == 0 && cb.cb_first) {
 			if (cb.cb_version == SPA_VERSION) {
-				(void) printf(gettext("All pools are already "
-				    "formatted using feature flags.\n\n"));
-				(void) printf(gettext("Every feature flags "
+				(void) printf(gettext("All %spools are already "
+				    "formatted using feature flags.\n\n"),
+				    cb.cb_unavail ? gettext("available ") : "");
+				(void) printf(gettext("Every %sfeature flags "
 				    "pool already has all supported features "
-				    "enabled.\n"));
+				    "enabled.\n"),
+				    cb.cb_unavail ? gettext("available ") : "");
 			} else {
 				(void) printf(gettext("All pools are already "
 				    "formatted with version %llu or higher.\n"),
@@ -4999,12 +5055,21 @@ zpool_do_upgrade(int argc, char **argv)
 		}
 	} else if (argc == 0) {
 		cb.cb_first = B_TRUE;
+		ret = zpool_iter(g_zfs, upgrade_list_unavail, &cb);
+		assert(ret == 0);
+
+		if (!cb.cb_first) {
+			(void) fprintf(stderr, "\n");
+		}
+
+		cb.cb_first = B_TRUE;
 		ret = zpool_iter(g_zfs, upgrade_list_older_cb, &cb);
 		assert(ret == 0);
 
 		if (cb.cb_first) {
-			(void) printf(gettext("All pools are formatted "
-			    "using feature flags.\n\n"));
+			(void) printf(gettext("All %spools are formatted using "
+			    "feature flags.\n\n"), cb.cb_unavail ?
+			    gettext("available ") : "");
 		} else {
 			(void) printf(gettext("\nUse 'zpool upgrade -v' "
 			    "for a list of available legacy versions.\n"));
@@ -5015,13 +5080,14 @@ zpool_do_upgrade(int argc, char **argv)
 		assert(ret == 0);
 
 		if (cb.cb_first) {
-			(void) printf(gettext("Every feature flags pool has "
-			    "all supported features enabled.\n"));
+			(void) printf(gettext("Every %sfeature flags pool has "
+			    "all supported features enabled.\n"),
+			    cb.cb_unavail ? gettext("available ") : "");
 		} else {
 			(void) printf(gettext("\n"));
 		}
 	} else {
-		ret = for_each_pool(argc, argv, B_FALSE, NULL,
+		ret = for_each_pool(argc, argv, B_TRUE, NULL,
 		    upgrade_one, &cb);
 	}
 

Modified: projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
==============================================================================
--- projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -127,6 +127,7 @@ dtrace_dof_init(void)
 	int efd;
 	char *s;
 	size_t shstridx;
+	uint64_t aligned_filesz;
 #endif
 
 	if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL)
@@ -171,6 +172,7 @@ dtrace_dof_init(void)
 			if (s != NULL && strcmp(s, ".SUNW_dof") == 0) {
 				dofdata = elf_getdata(scn, NULL);
 				dof = dofdata->d_buf;
+				break;
 			}
 		}
 	}
@@ -182,7 +184,9 @@ dtrace_dof_init(void)
 	}
 
 	while ((char *) dof < (char *) dofdata->d_buf + dofdata->d_size) {
-		dof_next = (void *) ((char *) dof + dof->dofh_filesz);
+		aligned_filesz = (shdr.sh_addralign == 0 ? dof->dofh_filesz :
+		    roundup2(dof->dofh_filesz, shdr.sh_addralign));
+		dof_next = (void *) ((char *) dof + aligned_filesz);
 #endif
 
 	if (dof->dofh_ident[DOF_ID_MAG0] != DOF_MAG_MAG0 ||

Modified: projects/clang350-import/cddl/usr.bin/ctfconvert/ctfconvert.1
==============================================================================
--- projects/clang350-import/cddl/usr.bin/ctfconvert/ctfconvert.1	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/cddl/usr.bin/ctfconvert/ctfconvert.1	Sat Dec 27 14:58:52 2014	(r276302)
@@ -74,8 +74,8 @@ Write the output to file in
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
-.Xr ctfmerge 1 ,
-.Xr ctfdump 1
+.Xr ctfdump 1 ,
+.Xr ctfmerge 1
 .Sh HISTORY
 The
 .Nm

Modified: projects/clang350-import/contrib/binutils/gas/expr.c
==============================================================================
--- projects/clang350-import/contrib/binutils/gas/expr.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/binutils/gas/expr.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -1040,6 +1040,15 @@ operand (expressionS *expressionP, enum 
 	      {
 		for (i = 0; i < expressionP->X_add_number; ++i)
 		  generic_bignum[i] = ~generic_bignum[i];
+
+		/* Extend the bignum to at least the size of .octa.  */
+		if (expressionP->X_add_number < SIZE_OF_LARGE_NUMBER)
+		  {
+		    expressionP->X_add_number = SIZE_OF_LARGE_NUMBER;
+		    for (; i < expressionP->X_add_number; ++i)
+		      generic_bignum[i] = ~(LITTLENUM_TYPE) 0;
+		  }
+
 		if (c == '-')
 		  for (i = 0; i < expressionP->X_add_number; ++i)
 		    {
@@ -1050,14 +1059,12 @@ operand (expressionS *expressionP, enum 
 	      }
 	    else if (c == '!')
 	      {
-		int nonzero = 0;
 		for (i = 0; i < expressionP->X_add_number; ++i)
-		  {
-		    if (generic_bignum[i])
-		      nonzero = 1;
-		    generic_bignum[i] = 0;
-		  }
-		generic_bignum[0] = nonzero;
+		  if (generic_bignum[i] != 0)
+		    break;
+		expressionP->X_add_number = i >= expressionP->X_add_number;
+		expressionP->X_op = O_constant;
+		expressionP->X_unsigned = 1;
 	      }
 	  }
 	else if (expressionP->X_op != O_illegal

Modified: projects/clang350-import/contrib/binutils/gas/input-scrub.c
==============================================================================
--- projects/clang350-import/contrib/binutils/gas/input-scrub.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/binutils/gas/input-scrub.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -335,7 +335,7 @@ input_scrub_next_buffer (char **bufp)
 
   if (partial_size)
     {
-      memcpy (buffer_start + BEFORE_SIZE, partial_where,
+      memmove (buffer_start + BEFORE_SIZE, partial_where,
 	      (unsigned int) partial_size);
       memcpy (buffer_start + BEFORE_SIZE, save_source, AFTER_SIZE);
     }

Modified: projects/clang350-import/contrib/binutils/gas/read.c
==============================================================================
--- projects/clang350-import/contrib/binutils/gas/read.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/binutils/gas/read.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -4117,15 +4117,32 @@ emit_expr (expressionS *exp, unsigned in
       unsigned int size;
       LITTLENUM_TYPE *nums;
 
-      know (nbytes % CHARS_PER_LITTLENUM == 0);
-
       size = exp->X_add_number * CHARS_PER_LITTLENUM;
       if (nbytes < size)
 	{
-	  as_warn (_("bignum truncated to %d bytes"), nbytes);
+	  int i = nbytes / CHARS_PER_LITTLENUM;
+	  if (i != 0)
+	    {
+	      LITTLENUM_TYPE sign = 0;
+	      if ((generic_bignum[--i]
+		   & (1 << (LITTLENUM_NUMBER_OF_BITS - 1))) != 0)
+		sign = ~(LITTLENUM_TYPE) 0;
+	      while (++i < exp->X_add_number)
+		if (generic_bignum[i] != sign)
+		  break;
+	    }
+	  if (i < exp->X_add_number)
+	    as_warn (_("bignum truncated to %d bytes"), nbytes);
 	  size = nbytes;
 	}
 
+      if (nbytes == 1)
+	{
+	  md_number_to_chars (p, (valueT) generic_bignum[0], 1);
+	  return;
+	}
+      know (nbytes % CHARS_PER_LITTLENUM == 0);
+
       if (target_big_endian)
 	{
 	  while (nbytes > size)

Modified: projects/clang350-import/contrib/bzip2/bzip2.1
==============================================================================
--- projects/clang350-import/contrib/bzip2/bzip2.1	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/bzip2/bzip2.1	Sat Dec 27 14:58:52 2014	(r276302)
@@ -1,4 +1,3 @@
-.PU
 .TH bzip2 1
 .SH NAME
 bzip2, bunzip2 \- a block-sorting file compressor, v1.0.6

Modified: projects/clang350-import/contrib/ee/ee.1
==============================================================================
--- projects/clang350-import/contrib/ee/ee.1	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/ee/ee.1	Sat Dec 27 14:58:52 2014	(r276302)
@@ -7,7 +7,7 @@
 .\"  $Header: /home/hugh/sources/old_ae/RCS/ee.1,v 1.22 2001/12/16 04:49:27 hugh Exp $
 .\"
 .\"
-.TH ee 1 "" "" "" ""
+.TH ee 1 "" "" ""
 .SH NAME
 ee \- easy editor
 .SH SYNOPSIS

Modified: projects/clang350-import/contrib/elftoolchain/common/elfdefinitions.h
==============================================================================
--- projects/clang350-import/contrib/elftoolchain/common/elfdefinitions.h	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/elftoolchain/common/elfdefinitions.h	Sat Dec 27 14:58:52 2014	(r276302)
@@ -770,6 +770,8 @@ _ELF_DEFINE_EM(EM_ETPU,             178,
 	"Freescale Extended Time Processing Unit")			\
 _ELF_DEFINE_EM(EM_SLE9X,            179,				\
 	"Infineon Technologies SLE9X core")				\
+_ELF_DEFINE_EM(EM_AARCH64,          183,				\
+	"AArch64 (64-bit ARM)")						\
 _ELF_DEFINE_EM(EM_AVR32,            185,				\
 	"Atmel Corporation 32-bit microprocessor family")		\
 _ELF_DEFINE_EM(EM_STM8,             186,				\

Modified: projects/clang350-import/contrib/elftoolchain/elfcopy/sections.c
==============================================================================
--- projects/clang350-import/contrib/elftoolchain/elfcopy/sections.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/elftoolchain/elfcopy/sections.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -762,8 +762,8 @@ resync_sections(struct elfcopy *ecp)
 				s->off = roundup(off, s->align);
 		} else {
 			if (s->loadable)
-				warnx("moving loadable section,"
-				    "is this intentional?");
+				warnx("moving loadable section %s, "
+				    "is this intentional?", s->name);
 			s->off = roundup(off, s->align);
 		}
 
@@ -1139,12 +1139,6 @@ add_to_shstrtab(struct elfcopy *ecp, con
 	struct section *s;
 
 	s = ecp->shstrtab;
-	if (s->buf == NULL) {
-		insert_to_strtab(s, "");
-		insert_to_strtab(s, ".symtab");
-		insert_to_strtab(s, ".strtab");
-		insert_to_strtab(s, ".shstrtab");
-	}
 	insert_to_strtab(s, name);
 }
 
@@ -1206,6 +1200,11 @@ init_shstrtab(struct elfcopy *ecp)
 	s->loadable = 0;
 	s->type = SHT_STRTAB;
 	s->vma = 0;
+
+	insert_to_strtab(s, "");
+	insert_to_strtab(s, ".symtab");
+	insert_to_strtab(s, ".strtab");
+	insert_to_strtab(s, ".shstrtab");
 }
 
 void

Modified: projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3
==============================================================================
--- projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3	Sat Dec 27 14:58:52 2014	(r276302)
@@ -247,6 +247,7 @@ constants.
 .It Fn dwarf_get_VIS_name
 .Dv DW_VIS_*
 constants.
+.El
 .Sh RETURN VALUES
 These functions return
 .Dv DW_DLV_OK on success.

Modified: projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3
==============================================================================
--- projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3	Sat Dec 27 14:58:52 2014	(r276302)
@@ -102,6 +102,7 @@ One of the arguments
 or
 .Ar cu_die_offset
 was NULL.
+.El
 .Sh EXAMPLE
 To loop through all the address lookup table entries, use:
 .Bd -literal -offset indent

Modified: projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_hasattr.3
==============================================================================
--- projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_hasattr.3	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_hasattr.3	Sat Dec 27 14:58:52 2014	(r276302)
@@ -85,6 +85,7 @@ Either of argument
 or
 .Va ret_bool
 was NULL.
+.El
 .Sh SEE ALSO
 .Xr dwarf 3 ,
 .Xr dwarf_attr 3 ,

Modified: projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_whatattr.3
==============================================================================
--- projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_whatattr.3	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/elftoolchain/libdwarf/dwarf_whatattr.3	Sat Dec 27 14:58:52 2014	(r276302)
@@ -72,6 +72,7 @@ Either of argument
 or
 .Va retcode
 was NULL.
+.El
 .Sh SEE ALSO
 .Xr dwarf 3 ,
 .Xr dwarf_attr 3 ,

Modified: projects/clang350-import/contrib/elftoolchain/libelf/elf.3
==============================================================================
--- projects/clang350-import/contrib/elftoolchain/libelf/elf.3	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/elftoolchain/libelf/elf.3	Sat Dec 27 14:58:52 2014	(r276302)
@@ -389,7 +389,6 @@ See
 .It Dv SHT_SUNW_move Ta Dv ELF_T_MOVE Ta ELF move records.
 .It Dv SHT_SUNW_syminfo Ta Dv ELF_T_SYMINFO Ta Additional symbol flags.
 .El
-.TE
 .Ss Functional Grouping
 This section contains a brief overview of the available functionality
 in the ELF library.

Modified: projects/clang350-import/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- projects/clang350-import/contrib/elftoolchain/readelf/readelf.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/elftoolchain/readelf/readelf.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -487,6 +487,7 @@ elf_machine(unsigned int mach)
 	case EM_SEP: return "Sharp embedded microprocessor";
 	case EM_ARCA: return "Arca RISC Microprocessor";
 	case EM_UNICORE: return "Microprocessor series from PKU-Unity Ltd";
+	case EM_AARCH64: return "AArch64";
 	default:
 		snprintf(s_mach, sizeof(s_mach), "<unknown: %#x>", mach);
 		return (s_mach);
@@ -1041,6 +1042,67 @@ r_type(unsigned int mach, unsigned int t
 		case 37: return "R_386_TLS_TPOFF32";
 		default: return "";
 		}
+	case EM_AARCH64:
+		switch(type) {
+		case 0: return "R_AARCH64_NONE";
+		case 257: return "R_AARCH64_ABS64";
+		case 258: return "R_AARCH64_ABS32";
+		case 259: return "R_AARCH64_ABS16";
+		case 260: return "R_AARCH64_PREL64";
+		case 261: return "R_AARCH64_PREL32";
+		case 262: return "R_AARCH64_PREL16";
+		case 263: return "R_AARCH64_MOVW_UABS_G0";
+		case 264: return "R_AARCH64_MOVW_UABS_G0_NC";
+		case 265: return "R_AARCH64_MOVW_UABS_G1";
+		case 266: return "R_AARCH64_MOVW_UABS_G1_NC";
+		case 267: return "R_AARCH64_MOVW_UABS_G2";
+		case 268: return "R_AARCH64_MOVW_UABS_G2_NC";
+		case 269: return "R_AARCH64_MOVW_UABS_G3";
+		case 270: return "R_AARCH64_MOVW_SABS_G0";
+		case 271: return "R_AARCH64_MOVW_SABS_G1";
+		case 272: return "R_AARCH64_MOVW_SABS_G2";
+		case 273: return "R_AARCH64_LD_PREL_LO19";
+		case 274: return "R_AARCH64_ADR_PREL_LO21";
+		case 275: return "R_AARCH64_ADR_PREL_PG_HI21";
+		case 276: return "R_AARCH64_ADR_PREL_PG_HI21_NC";
+		case 277: return "R_AARCH64_ADD_ABS_LO12_NC";
+		case 278: return "R_AARCH64_LDST8_ABS_LO12_NC";
+		case 279: return "R_AARCH64_TSTBR14";
+		case 280: return "R_AARCH64_CONDBR19";
+		case 282: return "R_AARCH64_JUMP26";
+		case 283: return "R_AARCH64_CALL26";
+		case 284: return "R_AARCH64_LDST16_ABS_LO12_NC";
+		case 285: return "R_AARCH64_LDST32_ABS_LO12_NC";
+		case 286: return "R_AARCH64_LDST64_ABS_LO12_NC";
+		case 287: return "R_AARCH64_MOVW_PREL_G0";
+		case 288: return "R_AARCH64_MOVW_PREL_G0_NC";
+		case 289: return "R_AARCH64_MOVW_PREL_G1";
+		case 290: return "R_AARCH64_MOVW_PREL_G1_NC";
+		case 291: return "R_AARCH64_MOVW_PREL_G2";
+		case 292: return "R_AARCH64_MOVW_PREL_G2_NC";
+		case 293: return "R_AARCH64_MOVW_PREL_G3";
+		case 299: return "R_AARCH64_LDST128_ABS_LO12_NC";
+		case 300: return "R_AARCH64_MOVW_GOTOFF_G0";
+		case 301: return "R_AARCH64_MOVW_GOTOFF_G0_NC";
+		case 302: return "R_AARCH64_MOVW_GOTOFF_G1";
+		case 303: return "R_AARCH64_MOVW_GOTOFF_G1_NC";
+		case 304: return "R_AARCH64_MOVW_GOTOFF_G2";
+		case 305: return "R_AARCH64_MOVW_GOTOFF_G2_NC";
+		case 306: return "R_AARCH64_MOVW_GOTOFF_G3";
+		case 307: return "R_AARCH64_GOTREL64";
+		case 308: return "R_AARCH64_GOTREL32";
+		case 309: return "R_AARCH64_GOT_LD_PREL19";
+		case 310: return "R_AARCH64_LD64_GOTOFF_LO15";
+		case 311: return "R_AARCH64_ADR_GOT_PAGE";
+		case 312: return "R_AARCH64_LD64_GOT_LO12_NC";
+		case 313: return "R_AARCH64_LD64_GOTPAGE_LO15";
+		case 1024: return "R_AARCH64_COPY";
+		case 1025: return "R_AARCH64_GLOB_DAT";
+		case 1026: return "R_AARCH64_JUMP_SLOT";
+		case 1027: return "R_AARCH64_RELATIVE";
+		case 1031: return "R_AARCH64_TLSDESC";
+		default: return "";
+		}
 	case EM_ARM:
 		switch(type) {
 		case 0: return "R_ARM_NONE";

Modified: projects/clang350-import/contrib/gcc/config/arm/arm.c
==============================================================================
--- projects/clang350-import/contrib/gcc/config/arm/arm.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/gcc/config/arm/arm.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -604,6 +604,8 @@ static const struct processors all_archi
   {"armv6k",  mpcore,	  "6K",  FL_CO_PROC |             FL_FOR_ARCH6K, NULL},
   {"armv6z",  arm1176jzs, "6Z",  FL_CO_PROC |             FL_FOR_ARCH6Z, NULL},
   {"armv6zk", arm1176jzs, "6ZK", FL_CO_PROC |             FL_FOR_ARCH6ZK, NULL},
+  /* Clang compatibility... define __ARM_ARCH_7A__, but codegen is still 6ZK. */
+  {"armv7a",  arm1176jzs, "7A",  FL_CO_PROC |             FL_FOR_ARCH6ZK, NULL},
   {"ep9312",  ep9312,     "4T",  FL_LDSCHED | FL_CIRRUS | FL_FOR_ARCH4, NULL},
   {"iwmmxt",  iwmmxt,     "5TE", FL_LDSCHED | FL_STRONG | FL_FOR_ARCH5TE | FL_XSCALE | FL_IWMMXT , NULL},
   {NULL, arm_none, NULL, 0 , NULL}

Modified: projects/clang350-import/contrib/libxo/libxo/libxo.c
==============================================================================
--- projects/clang350-import/contrib/libxo/libxo/libxo.c	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/libxo/libxo/libxo.c	Sat Dec 27 14:58:52 2014	(r276302)
@@ -956,9 +956,6 @@ xo_warn_hcv (xo_handle_t *xop, int code,
     }
     memcpy(newfmt + plen, fmt, len);
 
-    /* Add a newline to the fmt string */
-    if (!(xop->xo_flags & XOF_WARN_XML))
-	newfmt[len++ + plen] = '\n';
     newfmt[len + plen] = '\0';
 
     if (xop->xo_flags & XOF_WARN_XML) {
@@ -1010,6 +1007,7 @@ xo_warn_hcv (xo_handle_t *xop, int code,
 
     } else {
 	vfprintf(stderr, newfmt, vap);
+	fprintf(stderr, ": %s\n", strerror(code));
     }
 }
 

Modified: projects/clang350-import/contrib/libxo/libxo/xo_create.3
==============================================================================
--- projects/clang350-import/contrib/libxo/libxo/xo_create.3	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/libxo/libxo/xo_create.3	Sat Dec 27 14:58:52 2014	(r276302)
@@ -76,7 +76,7 @@ https://github.com/Juniper/libxo/release
 .Sh SEE ALSO
 .Xr xo_emit 3
 and
-.Xf xo_set_options 3 .
+.Xr xo_set_options 3 .
 .Sh HISTORY
 The
 .Fa libxo

Modified: projects/clang350-import/contrib/libxo/libxo/xo_emit.3
==============================================================================
--- projects/clang350-import/contrib/libxo/libxo/xo_emit.3	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/libxo/libxo/xo_emit.3	Sat Dec 27 14:58:52 2014	(r276302)
@@ -35,7 +35,7 @@ but using a more complex format descript
 .Pp
 .Fn xo_emit
 uses the default output handle, as described in
-.Xf libxo 3 ,
+.Xr libxo 3 ,
 where
 .Fn xo_emit_h
 uses an explicit handle.

Modified: projects/clang350-import/contrib/libxo/libxo/xo_open_container.3
==============================================================================
--- projects/clang350-import/contrib/libxo/libxo/xo_open_container.3	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/libxo/libxo/xo_open_container.3	Sat Dec 27 14:58:52 2014	(r276302)
@@ -105,7 +105,7 @@ container, a warning will be generated.
         <div class="data"
              data-tag="host-name">my-host.example.org</div>
 .Ed
-.SH EMITTING HIERARCHY
+.Sh EMITTING HIERARCHY
 To create a container, use the
 .Fn xo_open_container
 and
@@ -131,7 +131,7 @@ traditional C strings can be used direct
 The close functions with the
 .Dq _d
 suffix are used in
-.Dq Do The Right Thing
+.Dq \&Do The Right Thing
 mode, where the name of the open containers, lists, and
 instances are maintained internally by
 .Em libxo
@@ -161,7 +161,7 @@ Some user may find tracking the names of
 instances inconvenient.
 .Em libxo
 offers
-.Dq Do The Right Thing
+.Dq \&Do The Right Thing
 mode, where
 .Em libxo
 will track the names of open containers, lists, and instances so

Modified: projects/clang350-import/contrib/mdocml/INSTALL
==============================================================================
--- projects/clang350-import/contrib/mdocml/INSTALL	Sat Dec 27 14:50:53 2014	(r276301)
+++ projects/clang350-import/contrib/mdocml/INSTALL	Sat Dec 27 14:58:52 2014	(r276302)
@@ -1,13 +1,12 @@
-$Id: INSTALL,v 1.5 2014/08/18 13:27:47 kristaps Exp $
+$Id: INSTALL,v 1.9 2014/12/11 07:44:46 schwarze Exp $
 
 About mdocml, the portable mandoc distribution
 ----------------------------------------------
 The mandoc manpage compiler toolset is a suite of tools compiling
 mdoc(7), the roff(7) macro language of choice for BSD manual pages,
 and man(7), the predominant historical language for UNIX manuals.
-The toolset does not yet implement man(1); that is only scheduled
-for the next release, 1.13.2.  It can, however, already serve to
-translate source manpages to the output displayed by man(1).
+Since the present version 1.13.2, it includes a man(1) manual viewer
+in addition to the apropos(1) manual page search tool.
 For general information, see <http://mdocml.bsd.lv/>.
 
 In this document, we describe the installation and deployment of
@@ -22,7 +21,7 @@ tech@ mailing list, too.
 
 Enjoy using the mandoc toolset!
 
-Ingo Schwarze, Karlsruhe, August 2014
+Ingo Schwarze, Karlsruhe, December 2014
 
 
 Installation
@@ -59,8 +58,8 @@ should work.  If the build fails, look a
 and go back to step 2.
 
 4. Run "make -n install" and check whether everything will be
-installed to the intended places.  Otherwise, put some *DIR variables
-into "configure.local" and go back to step 2.
+installed to the intended places.  Otherwise, put some *DIR or *NM*
+variables into "configure.local" and go back to step 2.
 
 5. Run "sudo make install".  If you intend to build a binary
 package using some kind of fake root mechanism, you may need a
@@ -70,14 +69,14 @@ in the "Makefile" to understand how DEST
 6. To set up a man.cgi(8) server, read its manual page.
 
 7. To use mandoc(1) as your man(1) formatter, read the "Deployment"
-section below.
+sections below.
 
 
 Understanding mandoc dependencies
 ---------------------------------
-The mandoc(1), preconv(1), and demandoc(1) utilities have no external
-dependencies.  However, makewhatis(8) and apropos(1) depend on the
-following software:
+The mandoc(1) and demandoc(1) utilities have no external dependencies.
+However, makewhatis(8), apropos(1), and man(1) depend on the following
+software:
 
 1. The SQLite database system, see <http://sqlite.org/>.
 The recommended version of SQLite is 3.8.4.3 or newer.  The mandoc
@@ -89,14 +88,14 @@ fails due to the missing sqlite3_errstr(
 problems, apropos(1) is fully usable with SQLite 3.7.5.  Versions
 older than 3.7.5 may or may not work, they have not been tested.
 
-1.2. The fts(3) directory traversion functions.
+2. The fts(3) directory traversion functions.
 If your system does not have them, the bundled compatibility version
 will be used, so you need not worry in that case.  But be careful: the
 glibc version of fts(3) is known to be broken on 32bit platforms,
 see <https://sourceware.org/bugzilla/show_bug.cgi?id=15838>.
 If you run into that problem, set "HAVE_FTS=0" in configure.local.
 
-1.3. Marc Espie's ohash(3) library.
+3. Marc Espie's ohash(3) library.
 If your system does not have it, the bundled compatibility version
 will be used, so you probably need not worry about it.
 
@@ -145,11 +144,39 @@ in unusual headers.  You can also look a
 check that no "#define HAVE_*" differ from your expectations.
 
 
-Deployment
-----------
-If you want to integrate the mandoc(1) tools with your existing
-man(1) system as a formatter, then contact us first: on systems without
-mandoc(1) as the default, you may have your work cut out for you!
+Deployment using the integrated man(1) viewer
+---------------------------------------------
+This mode of deployment requires database support.  In case of
+doubt, look at the section "user settings related to database
+support" in the file configure.local.example.
+
+Deployment requires the following steps:
+
+1. Build and install mandoc as described above in steps 2 to 5
+below "Installation".
+
+2. If your system uses manpath(1), make sure it is configured
+correctly, in particular, it returns all directory trees where
+manual pages are installed.  If your system uses man.conf(5), make
+sure it contains a "_whatdb" line for each directory tree, and the
+order of these lines meets your wishes.
+
+3. Run the command "sudo makewhatis" to build mandoc.db(5) databases
+in all the directory trees configured in step 2.
+
+At this point, your new man(1), apropos(1), and whatis(1) should work.

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

More information about the svn-src-projects mailing list