svn commit: r285924 - in projects/clang-trunk: bin/ls contrib/elftoolchain/common contrib/elftoolchain/readelf etc/devd etc/mtree gnu/usr.bin/rcs gnu/usr.bin/rcs/ident lib/libc/posix1e lib/libc/std...

Mon Jul 27 22:20:41 UTC 2015

Author: dim
Date: Mon Jul 27 22:20:28 2015
New Revision: 285924
URL: https://svnweb.freebsd.org/changeset/base/285924

Log:
  Merge ^/head r285793 through r285923.

Added:
  projects/clang-trunk/share/man/man4/cyapa.4
     - copied unchanged from r285923, head/share/man/man4/cyapa.4
  projects/clang-trunk/share/man/man4/isl.4
     - copied unchanged from r285923, head/share/man/man4/isl.4
  projects/clang-trunk/share/man/man4/pms.4
     - copied unchanged from r285923, head/share/man/man4/pms.4
  projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbobject.c
     - copied unchanged from r285923, head/sys/contrib/dev/acpica/components/debugger/dbobject.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/dispatcher/dsdebug.c
     - copied unchanged from r285923, head/sys/contrib/dev/acpica/components/dispatcher/dsdebug.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/utilities/utnonansi.c
     - copied unchanged from r285923, head/sys/contrib/dev/acpica/components/utilities/utnonansi.c
  projects/clang-trunk/sys/dev/cyapa/
     - copied from r285923, head/sys/dev/cyapa/
  projects/clang-trunk/sys/dev/isl/
     - copied from r285923, head/sys/dev/isl/
  projects/clang-trunk/sys/modules/i2c/cyapa/
     - copied from r285923, head/sys/modules/i2c/cyapa/
  projects/clang-trunk/sys/modules/i2c/isl/
     - copied from r285923, head/sys/modules/i2c/isl/
  projects/clang-trunk/usr.bin/ident/
     - copied from r285923, head/usr.bin/ident/
Deleted:
  projects/clang-trunk/gnu/usr.bin/rcs/ident/
  projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmobject.c
Modified:
  projects/clang-trunk/bin/ls/print.c
  projects/clang-trunk/contrib/elftoolchain/common/elfdefinitions.h
  projects/clang-trunk/contrib/elftoolchain/readelf/readelf.c
  projects/clang-trunk/etc/devd/usb.conf
  projects/clang-trunk/etc/mtree/BSD.tests.dist
  projects/clang-trunk/gnu/usr.bin/rcs/Makefile
  projects/clang-trunk/lib/libc/posix1e/mac.3
  projects/clang-trunk/lib/libc/posix1e/mac.conf.5
  projects/clang-trunk/lib/libc/stdlib/system.3
  projects/clang-trunk/lib/libc/sys/reboot.2
  projects/clang-trunk/lib/libc/sys/shutdown.2
  projects/clang-trunk/lib/libiconv_modules/BIG5/Makefile
  projects/clang-trunk/lib/libiconv_modules/EUC/Makefile
  projects/clang-trunk/lib/libiconv_modules/EUCTW/Makefile
  projects/clang-trunk/lib/libiconv_modules/UTF1632/Makefile
  projects/clang-trunk/lib/libiconv_modules/UTF7/Makefile
  projects/clang-trunk/lib/libiconv_modules/iconv_std/Makefile
  projects/clang-trunk/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/clang-trunk/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/clang-trunk/release/doc/share/xml/sponsor.ent
  projects/clang-trunk/sbin/init/init.8
  projects/clang-trunk/sbin/mount_nfs/mount_nfs.c
  projects/clang-trunk/sbin/nvmecontrol/logpage.c
  projects/clang-trunk/share/man/man4/Makefile
  projects/clang-trunk/share/man/man4/capsicum.4
  projects/clang-trunk/share/man/man4/mac.4
  projects/clang-trunk/share/man/man4/mac_ifoff.4
  projects/clang-trunk/share/man/man4/mac_mls.4
  projects/clang-trunk/share/man/man4/mac_none.4
  projects/clang-trunk/share/man/man4/mac_partition.4
  projects/clang-trunk/share/man/man4/mac_seeotheruids.4
  projects/clang-trunk/share/man/man4/mac_stub.4
  projects/clang-trunk/share/man/man4/mac_test.4
  projects/clang-trunk/share/man/man4/procdesc.4
  projects/clang-trunk/share/man/man5/device.hints.5
  projects/clang-trunk/share/man/man5/pf.conf.5
  projects/clang-trunk/share/man/man9/mac.9
  projects/clang-trunk/sys/amd64/include/atomic.h
  projects/clang-trunk/sys/arm/ti/am335x/am335x_lcd.c
  projects/clang-trunk/sys/arm/ti/am335x/am335x_scm_padconf.h
  projects/clang-trunk/sys/arm/ti/am335x/tda19988.c
  projects/clang-trunk/sys/boot/common/loader.8
  projects/clang-trunk/sys/boot/forth/loader.conf
  projects/clang-trunk/sys/cam/cam_periph.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_clock.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_fd.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_file.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_futex.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_sock.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_syscalldefs.h
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_thread.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_util.h
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_proto.h
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_syscall.h
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_syscalls.c
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_sysent.c
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_systrace_args.c
  projects/clang-trunk/sys/compat/cloudabi64/syscalls.master
  projects/clang-trunk/sys/conf/files
  projects/clang-trunk/sys/contrib/cloudabi/syscalldefs_md.h
  projects/clang-trunk/sys/contrib/cloudabi/syscalldefs_mi.h
  projects/clang-trunk/sys/contrib/dev/acpica/acpica_prep.sh
  projects/clang-trunk/sys/contrib/dev/acpica/changes.txt
  projects/clang-trunk/sys/contrib/dev/acpica/common/adisasm.c
  projects/clang-trunk/sys/contrib/dev/acpica/common/dmrestag.c
  projects/clang-trunk/sys/contrib/dev/acpica/common/dmtable.c
  projects/clang-trunk/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/clang-trunk/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslascii.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/asllookup.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslmessages.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslmethod.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslnamesp.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/asloffset.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslopcodes.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslopt.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/asloptions.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslstubs.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslxref.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/dtcompiler.h
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/dttable.c
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/prparser.l
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/prparser.y
  projects/clang-trunk/sys/contrib/dev/acpica/compiler/prscan.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbinput.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbnames.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbutils.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbxface.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmnames.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/executer/excreate.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/executer/exdebug.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/executer/exdump.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/namespace/nsnames.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/namespace/nsparse.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/namespace/nsutils.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/namespace/nsxfname.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/parser/psargs.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/parser/psloop.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/parser/psobject.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/parser/psparse.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/parser/psutils.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/parser/psxface.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/resources/rscreate.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/utilities/utdebug.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/utilities/utdelete.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/utilities/utinit.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/utilities/utmisc.c
  projects/clang-trunk/sys/contrib/dev/acpica/components/utilities/utstring.c
  projects/clang-trunk/sys/contrib/dev/acpica/include/acdebug.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acdisasm.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acdispat.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acglobal.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acinterp.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/aclocal.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acmacros.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acnamesp.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acobject.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acoutput.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acparser.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acpiosxf.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acpixf.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acstruct.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/actbl2.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/actypes.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/acutils.h
  projects/clang-trunk/sys/contrib/dev/acpica/include/platform/acenvex.h
  projects/clang-trunk/sys/dev/acpica/acpi.c
  projects/clang-trunk/sys/dev/e1000/if_em.c
  projects/clang-trunk/sys/dev/gpio/gpiobus.c
  projects/clang-trunk/sys/dev/mpt/mpt.c
  projects/clang-trunk/sys/dev/mpt/mpt.h
  projects/clang-trunk/sys/dev/nvme/nvme_ctrlr.c
  projects/clang-trunk/sys/dev/ofw/ofw_bus_subr.c
  projects/clang-trunk/sys/dev/proto/proto_busdma.c
  projects/clang-trunk/sys/dev/sfxge/common/hunt_impl.h
  projects/clang-trunk/sys/dev/sfxge/common/hunt_mac.c
  projects/clang-trunk/sys/dev/sfxge/common/hunt_nic.c
  projects/clang-trunk/sys/dev/uart/uart_bus.h
  projects/clang-trunk/sys/dev/uart/uart_core.c
  projects/clang-trunk/sys/dev/usb/controller/xhci.c
  projects/clang-trunk/sys/dev/usb/controller/xhci_pci.c
  projects/clang-trunk/sys/dev/usb/net/if_urndis.c
  projects/clang-trunk/sys/dev/vt/colors/vt_termcolors.c
  projects/clang-trunk/sys/dev/vt/hw/efifb/efifb.c
  projects/clang-trunk/sys/dev/vt/hw/fb/vt_early_fb.c
  projects/clang-trunk/sys/dev/vt/hw/fb/vt_fb.c
  projects/clang-trunk/sys/dev/vt/vt_core.c
  projects/clang-trunk/sys/fs/tmpfs/tmpfs_subr.c
  projects/clang-trunk/sys/geom/part/g_part.c
  projects/clang-trunk/sys/kern/kern_rmlock.c
  projects/clang-trunk/sys/kern/subr_witness.c
  projects/clang-trunk/sys/kern/uipc_sem.c
  projects/clang-trunk/sys/kern/uipc_socket.c
  projects/clang-trunk/sys/kern/uipc_syscalls.c
  projects/clang-trunk/sys/kern/vfs_bio.c
  projects/clang-trunk/sys/kern/vfs_cluster.c
  projects/clang-trunk/sys/modules/i2c/Makefile
  projects/clang-trunk/sys/netinet/sctp_indata.c
  projects/clang-trunk/sys/netinet/sctp_input.c
  projects/clang-trunk/sys/netinet/sctp_os_bsd.h
  projects/clang-trunk/sys/netinet/sctp_output.c
  projects/clang-trunk/sys/netinet/sctp_output.h
  projects/clang-trunk/sys/netinet/sctp_usrreq.c
  projects/clang-trunk/sys/netinet/tcp_output.c
  projects/clang-trunk/sys/netinet6/sctp6_usrreq.c
  projects/clang-trunk/sys/sparc64/include/smp.h
  projects/clang-trunk/sys/sparc64/sparc64/machdep.c
  projects/clang-trunk/sys/sparc64/sparc64/mp_machdep.c
  projects/clang-trunk/sys/sparc64/sparc64/tick.c
  projects/clang-trunk/sys/sys/buf.h
  projects/clang-trunk/sys/sys/capsicum.h
  projects/clang-trunk/sys/sys/elf_common.h
  projects/clang-trunk/sys/sys/param.h
  projects/clang-trunk/sys/ufs/ffs/ffs_rawread.c
  projects/clang-trunk/sys/ufs/ffs/ffs_vfsops.c
  projects/clang-trunk/sys/ufs/ffs/ffs_vnops.c
  projects/clang-trunk/sys/vm/swap_pager.c
  projects/clang-trunk/sys/vm/vm_object.c
  projects/clang-trunk/sys/vm/vm_object.h
  projects/clang-trunk/sys/vm/vm_pager.c
  projects/clang-trunk/sys/vm/vnode_pager.c
  projects/clang-trunk/tests/sys/fifo/fifo_misc.c
  projects/clang-trunk/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang-trunk/tools/bus_space/C/lang.c
  projects/clang-trunk/tools/bus_space/C/libbus.h
  projects/clang-trunk/tools/bus_space/Python/lang.c
  projects/clang-trunk/tools/bus_space/bus.c
  projects/clang-trunk/tools/bus_space/bus.h
  projects/clang-trunk/tools/bus_space/busdma.c
  projects/clang-trunk/usr.bin/Makefile
  projects/clang-trunk/usr.bin/ar/ar.1
  projects/clang-trunk/usr.bin/ar/ar.c
  projects/clang-trunk/usr.bin/elfdump/elfdump.c
  projects/clang-trunk/usr.bin/grep/Makefile
  projects/clang-trunk/usr.bin/man/man.sh
  projects/clang-trunk/usr.bin/truss/amd64-fbsd.c
  projects/clang-trunk/usr.bin/truss/amd64-fbsd32.c
  projects/clang-trunk/usr.bin/truss/arm-fbsd.c
  projects/clang-trunk/usr.bin/truss/i386-fbsd.c
  projects/clang-trunk/usr.bin/truss/mips-fbsd.c
  projects/clang-trunk/usr.bin/truss/powerpc-fbsd.c
  projects/clang-trunk/usr.bin/truss/powerpc64-fbsd.c
  projects/clang-trunk/usr.bin/truss/sparc64-fbsd.c
  projects/clang-trunk/usr.sbin/acpi/acpidb/Makefile
  projects/clang-trunk/usr.sbin/acpi/iasl/Makefile
  projects/clang-trunk/usr.sbin/jail/jail.8
Directory Properties:
  projects/clang-trunk/   (props changed)
  projects/clang-trunk/contrib/elftoolchain/   (props changed)
  projects/clang-trunk/etc/   (props changed)
  projects/clang-trunk/lib/libc/   (props changed)
  projects/clang-trunk/sbin/   (props changed)
  projects/clang-trunk/share/   (props changed)
  projects/clang-trunk/share/man/man4/   (props changed)
  projects/clang-trunk/sys/   (props changed)
  projects/clang-trunk/sys/boot/   (props changed)
  projects/clang-trunk/sys/conf/   (props changed)
  projects/clang-trunk/sys/contrib/dev/acpica/   (props changed)
  projects/clang-trunk/usr.sbin/jail/   (props changed)

Modified: projects/clang-trunk/bin/ls/print.c
==============================================================================

--- projects/clang-trunk/bin/ls/print.c	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/bin/ls/print.c	Mon Jul 27 22:20:28 2015	(r285924)
@@ -192,7 +192,7 @@ printlong(const DISPLAY *dp)
 		if (f_numericonly) {
 			xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*u} {td:user/%-*s}{e:user/%ju}  {td:group/%-*s}{e:group/%ju}  ",
 				buf, (int) sp->st_mode & ALLPERMS, dp->s_nlink, sp->st_nlink,
-				dp->s_user, np->user, sp->st_uid, dp->s_group, np->group, sp->st_gid);
+				dp->s_user, np->user, (uintmax_t)sp->st_uid, dp->s_group, np->group, (uintmax_t)sp->st_gid);
 		} else {
 			xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*u} {t:user/%-*s}  {t:group/%-*s}  ",
 				buf, (int) sp->st_mode & ALLPERMS, dp->s_nlink, sp->st_nlink,
@@ -456,7 +456,7 @@ printtime(const char *field, time_t ftim
 	snprintf(fmt, sizeof(fmt), "{d:%s/%%hs} ", field);
 	xo_attr("value", "%ld", (long) ftime);
 	xo_emit(fmt, longstring);
-	snprintf(fmt, sizeof(fmt), "{en:%s/%%ld} ", field);
+	snprintf(fmt, sizeof(fmt), "{en:%s/%%ld}", field);
 	xo_emit(fmt, (long) ftime);
 }
 
@@ -486,7 +486,7 @@ printtype(u_int mode)
 		xo_emit("{D:=}{e:type/socket}");
 		return (1);
 	case S_IFWHT:
-		xo_emit("{D:%}{e:type/whiteout}");
+		xo_emit("{D:%%}{e:type/whiteout}");
 		return (1);
 	default:
 		break;

Modified: projects/clang-trunk/contrib/elftoolchain/common/elfdefinitions.h
==============================================================================
--- projects/clang-trunk/contrib/elftoolchain/common/elfdefinitions.h	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/contrib/elftoolchain/common/elfdefinitions.h	Mon Jul 27 22:20:28 2015	(r285924)
@@ -813,7 +813,8 @@ _ELF_DEFINE_EM(EM_KM32,             210,
 _ELF_DEFINE_EM(EM_KMX32,            211, "KM211 KMX32 32-bit processor") \
 _ELF_DEFINE_EM(EM_KMX16,            212, "KM211 KMX16 16-bit processor") \
 _ELF_DEFINE_EM(EM_KMX8,             213, "KM211 KMX8 8-bit processor")  \
-_ELF_DEFINE_EM(EM_KVARC,            214, "KM211 KMX32 KVARC processor")
+_ELF_DEFINE_EM(EM_KVARC,            214, "KM211 KMX32 KVARC processor") \
+_ELF_DEFINE_EM(EM_RISCV,            243, "RISC-V")
 
 #undef	_ELF_DEFINE_EM
 #define	_ELF_DEFINE_EM(N, V, DESCR)	N = V ,

Modified: projects/clang-trunk/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- projects/clang-trunk/contrib/elftoolchain/readelf/readelf.c	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/contrib/elftoolchain/readelf/readelf.c	Mon Jul 27 22:20:28 2015	(r285924)
@@ -27,6 +27,7 @@
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <ar.h>
+#include <assert.h>
 #include <ctype.h>
 #include <dwarf.h>
 #include <err.h>
@@ -314,6 +315,7 @@ static const char *dwarf_reg(unsigned in
 static const char *dwarf_regname(struct readelf *re, unsigned int num);
 static struct dumpop *find_dumpop(struct readelf *re, size_t si,
     const char *sn, int op, int t);
+static int get_ent_count(struct section *s, int *ent_count);
 static char *get_regoff_str(struct readelf *re, Dwarf_Half reg,
     Dwarf_Addr off);
 static const char *get_string(struct readelf *re, int strtab, size_t off);
@@ -532,6 +534,7 @@ elf_machine(unsigned int mach)
 	case EM_ARCA: return "Arca RISC Microprocessor";
 	case EM_UNICORE: return "Microprocessor series from PKU-Unity Ltd";
 	case EM_AARCH64: return "AArch64";
+	case EM_RISCV: return "RISC-V";
 	default:
 		snprintf(s_mach, sizeof(s_mach), "<unknown: %#x>", mach);
 		return (s_mach);
@@ -2900,6 +2903,24 @@ dump_shdr(struct readelf *re)
 #undef	ST_CTL
 }
 
+/*
+ * Return number of entries in the given section. We'd prefer ent_count be a
+ * size_t *, but libelf APIs already use int for section indices.
+ */
+static int
+get_ent_count(struct section *s, int *ent_count)
+{
+	if (s->entsize == 0) {
+		warnx("section %s has entry size 0", s->name);
+		return (0);
+	} else if (s->sz / s->entsize > INT_MAX) {
+		warnx("section %s has invalid section count", s->name);
+		return (0);
+	}
+	*ent_count = (int)(s->sz / s->entsize);
+	return (1);
+}
+
 static void
 dump_dynamic(struct readelf *re)
 {
@@ -2928,8 +2949,8 @@ dump_dynamic(struct readelf *re)
 
 		/* Determine the actual number of table entries. */
 		nentries = 0;
-		jmax = (int) (s->sz / s->entsize);
-
+		if (!get_ent_count(s, &jmax))
+			continue;
 		for (j = 0; j < jmax; j++) {
 			if (gelf_getdyn(d, j, &dyn) != &dyn) {
 				warnx("gelf_getdyn failed: %s",
@@ -3175,7 +3196,9 @@ dump_rel(struct readelf *re, struct sect
 		else
 			printf("%-12s %-12s %-19s %-16s %s\n", REL_HDR);
 	}
-	len = d->d_size / s->entsize;
+	assert(d->d_size == s->sz);
+	if (!get_ent_count(s, &len))
+		return;
 	for (i = 0; i < len; i++) {
 		if (gelf_getrel(d, i, &r) != &r) {
 			warnx("gelf_getrel failed: %s", elf_errmsg(-1));
@@ -3231,7 +3254,9 @@ dump_rela(struct readelf *re, struct sec
 		else
 			printf("%-12s %-12s %-19s %-16s %s\n", RELA_HDR);
 	}
-	len = d->d_size / s->entsize;
+	assert(d->d_size == s->sz);
+	if (!get_ent_count(s, &len))
+		return;
 	for (i = 0; i < len; i++) {
 		if (gelf_getrela(d, i, &r) != &r) {
 			warnx("gelf_getrel failed: %s", elf_errmsg(-1));
@@ -3296,7 +3321,7 @@ dump_symtab(struct readelf *re, int i)
 	Elf_Data *d;
 	GElf_Sym sym;
 	const char *name;
-	int elferr, stab, j;
+	int elferr, stab, j, len;
 
 	s = &re->sl[i];
 	stab = s->link;
@@ -3309,12 +3334,14 @@ dump_symtab(struct readelf *re, int i)
 	}
 	if (d->d_size <= 0)
 		return;
+	if (!get_ent_count(s, &len))
+		return;
 	printf("Symbol table (%s)", s->name);
-	printf(" contains %ju entries:\n", s->sz / s->entsize);
+	printf(" contains %d entries:\n", len);
 	printf("%7s%9s%14s%5s%8s%6s%9s%5s\n", "Num:", "Value", "Size", "Type",
 	    "Bind", "Vis", "Ndx", "Name");
 
-	for (j = 0; (uint64_t)j < s->sz / s->entsize; j++) {
+	for (j = 0; j < len; j++) {
 		if (gelf_getsym(d, j, &sym) != &sym) {
 			warnx("gelf_getsym failed: %s", elf_errmsg(-1));
 			continue;
@@ -3352,7 +3379,7 @@ dump_symtabs(struct readelf *re)
 	Elf_Data *d;
 	struct section *s;
 	uint64_t dyn_off;
-	int elferr, i;
+	int elferr, i, len;
 
 	/*
 	 * If -D is specified, only dump the symbol table specified by
@@ -3377,8 +3404,10 @@ dump_symtabs(struct readelf *re)
 		}
 		if (d->d_size <= 0)
 			return;
+		if (!get_ent_count(s, &len))
+			return;
 
-		for (i = 0; (uint64_t)i < s->sz / s->entsize; i++) {
+		for (i = 0; i < len; i++) {
 			if (gelf_getdyn(d, i, &dyn) != &dyn) {
 				warnx("gelf_getdyn failed: %s", elf_errmsg(-1));
 				continue;
@@ -3566,7 +3595,8 @@ dump_gnu_hash(struct readelf *re, struct
 	maskwords = buf[2];
 	buf += 4;
 	ds = &re->sl[s->link];
-	dynsymcount = ds->sz / ds->entsize;
+	if (!get_ent_count(ds, &dynsymcount))
+		return;
 	nchain = dynsymcount - symndx;
 	if (d->d_size != 4 * sizeof(uint32_t) + maskwords *
 	    (re->ec == ELFCLASS32 ? sizeof(uint32_t) : sizeof(uint64_t)) +
@@ -3995,7 +4025,7 @@ dump_liblist(struct readelf *re)
 	char tbuf[20];
 	Elf_Data *d;
 	Elf_Lib *lib;
-	int i, j, k, elferr, first;
+	int i, j, k, elferr, first, len;
 
 	for (i = 0; (size_t) i < re->shnum; i++) {
 		s = &re->sl[i];
@@ -4012,8 +4042,10 @@ dump_liblist(struct readelf *re)
 		if (d->d_size <= 0)
 			continue;
 		lib = d->d_buf;
+		if (!get_ent_count(s, &len))
+			continue;
 		printf("\nLibrary list section '%s' ", s->name);
-		printf("contains %ju entries:\n", s->sz / s->entsize);
+		printf("contains %d entries:\n", len);
 		printf("%12s%24s%18s%10s%6s\n", "Library", "Time Stamp",
 		    "Checksum", "Version", "Flags");
 		for (j = 0; (uint64_t) j < s->sz / s->entsize; j++) {
@@ -4398,7 +4430,7 @@ static void
 dump_mips_reginfo(struct readelf *re, struct section *s)
 {
 	Elf_Data *d;
-	int elferr;
+	int elferr, len;
 
 	(void) elf_errno();
 	if ((d = elf_rawdata(s->scn, NULL)) == NULL) {
@@ -4410,9 +4442,10 @@ dump_mips_reginfo(struct readelf *re, st
 	}
 	if (d->d_size <= 0)
 		return;
+	if (!get_ent_count(s, &len))
+		return;
 
-	printf("\nSection '%s' contains %ju entries:\n", s->name,
-	    s->sz / s->entsize);
+	printf("\nSection '%s' contains %d entries:\n", s->name, len);
 	dump_mips_odk_reginfo(re, d->d_buf, d->d_size);
 }
 

Modified: projects/clang-trunk/etc/devd/usb.conf
==============================================================================
--- projects/clang-trunk/etc/devd/usb.conf	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/etc/devd/usb.conf	Mon Jul 27 22:20:28 2015	(r285924)
@@ -5436,6 +5436,15 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "intclass" "0x02";
+	match "intsubclass" "0x02";
+	match "intprotocol" "0xff";
+	action "kldload -n if_urndis";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "intclass" "0x03";
 	match "intsubclass" "0x01";
 	match "intprotocol" "0x01";
@@ -5576,5 +5585,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2687 USB entries processed
+# 2688 USB entries processed
 

Modified: projects/clang-trunk/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/clang-trunk/etc/mtree/BSD.tests.dist	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/etc/mtree/BSD.tests.dist	Mon Jul 27 22:20:28 2015	(r285924)
@@ -528,6 +528,8 @@
         ..
         gzip
         ..
+        ident
+        ..
         join
         ..
         jot

Modified: projects/clang-trunk/gnu/usr.bin/rcs/Makefile
==============================================================================
--- projects/clang-trunk/gnu/usr.bin/rcs/Makefile	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/gnu/usr.bin/rcs/Makefile	Mon Jul 27 22:20:28 2015	(r285924)
@@ -1,3 +1,5 @@
-SUBDIR= lib ci co ident merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze
+# $FreeBSD$
+
+SUBDIR= lib ci co merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze
 
 .include <bsd.subdir.mk>

Modified: projects/clang-trunk/lib/libc/posix1e/mac.3
==============================================================================
--- projects/clang-trunk/lib/libc/posix1e/mac.3	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/lib/libc/posix1e/mac.3	Mon Jul 27 22:20:28 2015	(r285924)
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 7, 2009
+.Dd July 25, 2015
 .Dt MAC 3
 .Os
 .Sh NAME
@@ -163,14 +163,3 @@ Support for Mandatory Access Control was
 as part of the
 .Tn TrustedBSD
 Project.
-.Sh BUGS
-The
-.Tn TrustedBSD
-MAC Framework and associated policies, interfaces, and
-applications are considered to be an experimental feature in
-.Fx .
-Sites considering production deployment should keep the experimental
-status of these services in mind during any deployment process.
-See also
-.Xr mac 9
-for related considerations regarding the kernel framework.

Modified: projects/clang-trunk/lib/libc/posix1e/mac.conf.5
==============================================================================
--- projects/clang-trunk/lib/libc/posix1e/mac.conf.5	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/lib/libc/posix1e/mac.conf.5	Mon Jul 27 22:20:28 2015	(r285924)
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 19, 2003
+.Dd July 25, 2015
 .Dt MAC.CONF 5
 .Os
 .Sh NAME
@@ -110,14 +110,3 @@ Support for Mandatory Access Control was
 as part of the
 .Tn TrustedBSD
 Project.
-.Sh BUGS
-The
-.Tn TrustedBSD
-MAC Framework and associated policies, interfaces, and
-applications are considered to be an experimental feature in
-.Fx .
-Sites considering production deployment should keep the experimental
-status of these services in mind during any deployment process.
-See also
-.Xr mac 9
-for related considerations regarding the kernel framework.

Modified: projects/clang-trunk/lib/libc/stdlib/system.3
==============================================================================
--- projects/clang-trunk/lib/libc/stdlib/system.3	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/lib/libc/stdlib/system.3	Mon Jul 27 22:20:28 2015	(r285924)
@@ -32,7 +32,7 @@
 .\"     @(#)system.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 4, 1993
+.Dd July 25, 2015
 .Dt SYSTEM 3
 .Os
 .Sh NAME
@@ -87,7 +87,8 @@ failed.
 .Xr execve 2 ,
 .Xr fork 2 ,
 .Xr waitpid 2 ,
-.Xr popen 3
+.Xr popen 3 ,
+.Xr posix_spawn 3
 .Sh STANDARDS
 The
 .Fn system
@@ -97,3 +98,14 @@ conforms to
 and is expected to be
 .St -p1003.2
 compatible.
+.Sh SECURITY CONSIDERATIONS
+The
+.Fn system
+function is easily misused in a manner that enables a malicious
+user to run arbitrary command,
+because all meta-characters supported by
+.Xr sh 1
+would be honored.
+User supplied parameters should always be carefully santized
+before they appear in
+.Fa string.

Modified: projects/clang-trunk/lib/libc/sys/reboot.2
==============================================================================
--- projects/clang-trunk/lib/libc/sys/reboot.2	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/lib/libc/sys/reboot.2	Mon Jul 27 22:20:28 2015	(r285924)
@@ -82,7 +82,7 @@ Dump kernel memory before rebooting; see
 .Xr savecore 8
 for more information.
 .It Dv RB_HALT
-the processor is simply halted; no reboot takes place.
+The processor is simply halted; no reboot takes place.
 This option should be used with caution.
 .It Dv RB_POWEROFF
 After halting, the shutdown code will do what it can to turn

Modified: projects/clang-trunk/lib/libc/sys/shutdown.2
==============================================================================
--- projects/clang-trunk/lib/libc/sys/shutdown.2	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/lib/libc/sys/shutdown.2	Mon Jul 27 22:20:28 2015	(r285924)
@@ -29,7 +29,7 @@
 .\"     @(#)shutdown.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd March 5, 2007
+.Dd July 27, 2015
 .Dt SHUTDOWN 2
 .Os
 .Sh NAME
@@ -79,40 +79,26 @@ The following protocol specific actions 
 based on the properties of the socket associated with the file descriptor
 .Fa s .
 .Bl -column ".Dv PF_INET6" ".Dv SOCK_STREAM" ".Dv IPPROTO_SCTP"
-.It Sy Domain Ta Sy Type Ta Sy Protocol Ta Sy Return value and action
+.It Sy Domain Ta Sy Type Ta Sy Protocol Ta Sy Action
 .It Dv PF_INET Ta Dv SOCK_DGRAM Ta Dv IPPROTO_SCTP Ta
-Return \-1.
-The global variable
-.Va errno
-will be set to
-.Er EOPNOTSUPP .
+Failure,
+as socket is not connected.
 .It Dv PF_INET Ta Dv SOCK_DGRAM Ta Dv IPPROTO_UDP Ta
-Return 0.
-ICMP messages will
-.Em not
-be generated.
+Failure,
+as socket is not connected.
 .It Dv PF_INET Ta Dv SOCK_STREAM Ta Dv IPPROTO_SCTP Ta
-Return 0.
 Send queued data and tear down association.
 .It Dv PF_INET Ta Dv SOCK_STREAM Ta Dv IPPROTO_TCP Ta
-Return 0.
 Send queued data, wait for ACK, then send FIN.
 .It Dv PF_INET6 Ta Dv SOCK_DGRAM Ta Dv IPPROTO_SCTP Ta
-Return \-1.
-The global variable
-.Va errno
-will be set to
-.Er EOPNOTSUPP .
+Failure,
+as socket is not connected.
 .It Dv PF_INET6 Ta Dv SOCK_DGRAM Ta Dv IPPROTO_UDP Ta
-Return 0.
-ICMP messages will
-.Em not
-be generated.
+Failure,
+as socket is not connected.
 .It Dv PF_INET6 Ta Dv SOCK_STREAM Ta Dv IPPROTO_SCTP Ta
-Return 0.
 Send queued data and tear down association.
 .It Dv PF_INET6 Ta Dv SOCK_STREAM Ta Dv IPPROTO_TCP Ta
-Return 0.
 Send queued data, wait for ACK, then send FIN.
 .El
 .\"
@@ -131,16 +117,10 @@ argument is not a valid file descriptor.
 The
 .Fa how
 argument is invalid.
-.It Bq Er EOPNOTSUPP
-The socket associated with the file descriptor
-.Fa s
-does not support this operation.
 .It Bq Er ENOTCONN
 The
 .Fa s
-argument specifies a
-.Dv SOCK_STREAM
-socket which is not connected.
+argument specifies a socket which is not connected.
 .It Bq Er ENOTSOCK
 The
 .Fa s

Modified: projects/clang-trunk/lib/libiconv_modules/BIG5/Makefile
==============================================================================
--- projects/clang-trunk/lib/libiconv_modules/BIG5/Makefile	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/lib/libiconv_modules/BIG5/Makefile	Mon Jul 27 22:20:28 2015	(r285924)
@@ -2,6 +2,6 @@
 
 SHLIB=	BIG5
 SRCS+=	citrus_big5.c
-CFLAGS.gcc+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>

Modified: projects/clang-trunk/lib/libiconv_modules/EUC/Makefile
==============================================================================
--- projects/clang-trunk/lib/libiconv_modules/EUC/Makefile	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/lib/libiconv_modules/EUC/Makefile	Mon Jul 27 22:20:28 2015	(r285924)
@@ -2,6 +2,6 @@
 
 SHLIB=	EUC
 SRCS+=	citrus_euc.c
-CFLAGS.gcc+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>

Modified: projects/clang-trunk/lib/libiconv_modules/EUCTW/Makefile
==============================================================================
--- projects/clang-trunk/lib/libiconv_modules/EUCTW/Makefile	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/lib/libiconv_modules/EUCTW/Makefile	Mon Jul 27 22:20:28 2015	(r285924)
@@ -2,6 +2,6 @@
 
 SHLIB=	EUCTW
 SRCS+=	citrus_euctw.c
-CFLAGS.gcc+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>

Modified: projects/clang-trunk/lib/libiconv_modules/UTF1632/Makefile
==============================================================================
--- projects/clang-trunk/lib/libiconv_modules/UTF1632/Makefile	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/lib/libiconv_modules/UTF1632/Makefile	Mon Jul 27 22:20:28 2015	(r285924)
@@ -2,6 +2,6 @@
 
 SHLIB=	UTF1632
 SRCS+=	citrus_utf1632.c
-CFLAGS.gcc+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>

Modified: projects/clang-trunk/lib/libiconv_modules/UTF7/Makefile
==============================================================================
--- projects/clang-trunk/lib/libiconv_modules/UTF7/Makefile	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/lib/libiconv_modules/UTF7/Makefile	Mon Jul 27 22:20:28 2015	(r285924)
@@ -2,6 +2,6 @@
 
 SHLIB=	UTF7
 SRCS+=	citrus_utf7.c
-CFLAGS.gcc+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>

Modified: projects/clang-trunk/lib/libiconv_modules/iconv_std/Makefile
==============================================================================
--- projects/clang-trunk/lib/libiconv_modules/iconv_std/Makefile	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/lib/libiconv_modules/iconv_std/Makefile	Mon Jul 27 22:20:28 2015	(r285924)
@@ -2,6 +2,6 @@
 
 SHLIB=	iconv_std
 SRCS+=	citrus_iconv_std.c
-CFLAGS.gcc+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>

Modified: projects/clang-trunk/release/doc/en_US.ISO8859-1/hardware/article.xml
==============================================================================
--- projects/clang-trunk/release/doc/en_US.ISO8859-1/hardware/article.xml	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/release/doc/en_US.ISO8859-1/hardware/article.xml	Mon Jul 27 22:20:28 2015	(r285924)
@@ -731,6 +731,8 @@
 
       &hwlist.nsp;
 
+      &hwlist.pms;
+
       &hwlist.pst;
 
       &hwlist.siis;

Modified: projects/clang-trunk/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- projects/clang-trunk/release/doc/en_US.ISO8859-1/relnotes/article.xml	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/release/doc/en_US.ISO8859-1/relnotes/article.xml	Mon Jul 27 22:20:28 2015	(r285924)
@@ -511,6 +511,11 @@
 
       <para revision="285329"><application>OpenSSL</application> has
 	been updated to version 1.0.1p.</para>
+
+      <para revision="285642" contrib="sponsor" sponsor="&dell;">The
+	&man.ssh.1; utility has been updated to re-implement hostname
+	canonicalization before locating the host in
+	<filename>known_hosts</filename>.</para>
     </sect2>
 
     <sect2 xml:id="userland-installer">
@@ -540,6 +545,24 @@
       <para revision="275874">The &man.bsdinstall.8; utility has been
 	updated to use the new &man.dpv.3; library to display progress
 	when extracting the &os; distributions.</para>
+
+      <para revision="285557" contrib="sponsor"
+	sponsor="&scaleengine;">Support for detecting and implementing
+	aligning partitions on 1Mb boundaries has been added to
+	&man.bsdinstall.8;.</para>
+
+      <para revision="285679" contrib="sponsor"
+	sponsor="&scaleengine;">Support for detecting and implementing
+	a workaround for various laptops and motherboards that do not
+	boot properly from <acronym>GPT</acronym>-partitioned disks
+	has been added to &man.bsdinstall.8;.  Additionally, the
+	<literal>active</literal> flag will be set on the partition
+	when needed.</para>
+
+      <para revision="285679" contrib="sponsor"
+	sponsor="&scaleengine;">Support for selecting the partitioning
+	scheme when installing on the <acronym>UFS</acronym>
+	filesystem has been added to &man.bsdinstall.8;.</para>
     </sect2>
 
     <sect2 xml:id="userland-rc">
@@ -803,7 +826,19 @@
       <para revision="281495" contrib="sponsor" sponsor="&ff;">The
 	<literal>PAE_TABLES</literal> kernel configuration option has
 	been added for &os;/&arch.i386;, which instructs &man.pmap.9;
-	to use <acronym>PAE</acronym> format for page tables.</para>
+	to use <acronym>PAE</acronym> format for page tables while
+	maintaining a 32-bit physical address size elsewhere in the
+	kernel.  The use of this option can enhance application-level
+	security by enabling the creation of <quote>no execute</quote>
+	mappings on modern &arch.i386; processors.  Unlike the
+	<literal>PAE</literal> option, <literal>PAE_TABLES</literal>
+	preserves kernel binary interface (<acronym>KBI</acronym>)
+	compatibility with non-<literal>PAE</literal> kernels,
+	allowing non-<literal>PAE</literal> kernel modules and drivers
+	to work with a <literal>PAE_TABLES</literal>-enabled kernel.
+	Additionally, system limits are tuned for 4GB maximum
+	<acronym>RAM</acronym>, avoiding kernel virtual address space
+	(<acronym>KVA</acronym>) exhaustion.</para>
 
       <para revision="282215">The <literal>SIFTR</literal> kernel
 	configuration has been added, allowing building &man.siftr.4;

Modified: projects/clang-trunk/release/doc/share/xml/sponsor.ent
==============================================================================
--- projects/clang-trunk/release/doc/share/xml/sponsor.ent	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/release/doc/share/xml/sponsor.ent	Mon Jul 27 22:20:28 2015	(r285924)
@@ -19,6 +19,7 @@
 
 <!ENTITY darpa		"DARPA">
 <!ENTITY darpa_afrl	"DARPA, AFRL">
+<!ENTITY dell		"Dell, Inc.">
 
 <!ENTITY ff		"The &os; Foundation">
 <!ENTITY ff.url		"https://www.FreeBSDFoundation.org/">

Modified: projects/clang-trunk/sbin/init/init.8
==============================================================================
--- projects/clang-trunk/sbin/init/init.8	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/sbin/init/init.8	Mon Jul 27 22:20:28 2015	(r285924)
@@ -31,7 +31,7 @@
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd March 14, 2012
+.Dd July 24, 2015
 .Dt INIT 8
 .Os
 .Sh NAME
@@ -284,6 +284,7 @@ will signal the original
 as follows:
 .Bl -column Run-level SIGTERM
 .It Sy "Run-level	Signal	Action"
+.It Cm 0 Ta Dv SIGUSR1 Ta "Halt"
 .It Cm 0 Ta Dv SIGUSR2 Ta "Halt and turn the power off"
 .It Cm 1 Ta Dv SIGTERM Ta "Go to single-user mode"
 .It Cm 6 Ta Dv SIGINT Ta "Reboot the machine"

Modified: projects/clang-trunk/sbin/mount_nfs/mount_nfs.c
==============================================================================
--- projects/clang-trunk/sbin/mount_nfs/mount_nfs.c	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/sbin/mount_nfs/mount_nfs.c	Mon Jul 27 22:20:28 2015	(r285924)
@@ -476,7 +476,8 @@ main(int argc, char *argv[])
 	build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
 
 	if (nmount(iov, iovlen, 0))
-		err(1, "%s, %s", mntpath, errmsg);
+		err(1, "nmount: %s%s%s", mntpath, errmsg[0] ? ", " : "",
+		    errmsg);
 
 	exit(0);
 }

Modified: projects/clang-trunk/sbin/nvmecontrol/logpage.c
==============================================================================
--- projects/clang-trunk/sbin/nvmecontrol/logpage.c	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/sbin/nvmecontrol/logpage.c	Mon Jul 27 22:20:28 2015	(r285924)
@@ -298,6 +298,8 @@ logpage(int argc, char *argv[])
 		open_dev(argv[optind], &fd, 1, 1);
 	}
 
+	read_controller_data(fd, &cdata);
+
 	/*
 	 * The log page attribtues indicate whether or not the controller
 	 * supports the SMART/Health information log page on a per
@@ -307,7 +309,6 @@ logpage(int argc, char *argv[])
 		if (log_page != NVME_LOG_HEALTH_INFORMATION)
 			errx(1, "log page %d valid only at controller level",
 			    log_page);
-		read_controller_data(fd, &cdata);
 		if (cdata.lpa.ns_smart == 0)
 			errx(1,
 			    "controller does not support per namespace "

Modified: projects/clang-trunk/share/man/man4/Makefile
==============================================================================
--- projects/clang-trunk/share/man/man4/Makefile	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/share/man/man4/Makefile	Mon Jul 27 22:20:28 2015	(r285924)
@@ -107,6 +107,7 @@ MAN=	aac.4 \
 	cxgb.4 \
 	cxgbe.4 \
 	cy.4 \
+	cyapa.4 \
 	da.4 \
 	dc.4 \
 	dcons.4 \
@@ -215,6 +216,7 @@ MAN=	aac.4 \
 	ipw.4 \
 	ipwfw.4 \
 	isci.4 \
+	isl.4 \
 	ismt.4 \
 	isp.4 \
 	ispfw.4 \
@@ -388,6 +390,7 @@ MAN=	aac.4 \
 	${_pflog.4} \
 	${_pfsync.4} \
 	pim.4 \
+	pms.4 \
 	polling.4 \
 	ppbus.4 \
 	ppc.4 \

Modified: projects/clang-trunk/share/man/man4/capsicum.4
==============================================================================
--- projects/clang-trunk/share/man/man4/capsicum.4	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/share/man/man4/capsicum.4	Mon Jul 27 22:20:28 2015	(r285924)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 19, 2013
+.Dd July 25, 2015
 .Dt CAPSICUM 4
 .Os
 .Sh NAME
@@ -125,7 +125,3 @@ and
 .An Kris Kennaway Aq Mt kris at FreeBSD.org
 at Google, Inc., and
 .An Pawel Jakub Dawidek Aq Mt pawel at dawidek.net .
-.Sh BUGS
-.Nm
-is considered experimental in
-.Fx .

Copied: projects/clang-trunk/share/man/man4/cyapa.4 (from r285923, head/share/man/man4/cyapa.4)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang-trunk/share/man/man4/cyapa.4	Mon Jul 27 22:20:28 2015	(r285924, copy of r285923, head/share/man/man4/cyapa.4)
@@ -0,0 +1,200 @@
+.\" Copyright (c) 2015 Michael Gmelin <freebsd at grem.de>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd July 25, 2015
+.Dt CYAPA 4
+.Os
+.Sh NAME
+.Nm cyapa
+.Nd Cypress APA trackpad with I2C interface driver
+.Sh SYNOPSIS
+To compile this driver into the kernel, place the following lines into
+the kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device cyapa"
+.Cd "device ig4"
+.Cd "device smbus"
+.Ed
+.Pp
+Alternatively, to load the driver as a module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+cyapa_load="YES"
+ig4_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the Cypress APA trackpad.
+It emulates the IntelliMouse PS/2 protocol.
+It supports basic mouse ioctls, so that
+.Xr moused 8
+is supported properly.
+.Ss Trackpad layout
+.Bd -literal
+                   2/3               1/3
+          +--------------------+------------+
+          |                    |   Middle   |
+          |                    |   Button   |
+          |       Left         |            |
+          |      Button        +------------+
+          |                    |   Right    |
+          |                    |   Button   |
+          +--------------------+............|
+          |     Thumb/Button Area           | 15%
+          +---------------------------------+
+.Ed
+.Ss Trackpad features
+.Bl -tag -width 8n
+.It Va Two finger scrolling
+Use two fingers for Z axis scrolling.
+.It Va Button down/second finger
+While one finger clicks and holds down the touchpad, the second finger can be
+used to move the mouse cursor.
+This can be useful for drawing or selecting text.
+.It Va Thumb/Button area
+The lower 15% of the trackpad will not affect the mouse cursor position.
+This allows for high precision clicking, by controlling the cursor with the
+index finger and pushing/holding the pad down with the thumb.
+.It Va Trackpad button
+Push physical button.
+The left two thirds of the pad issues a LEFT button event.
+The upper right corner issues a MIDDLE button event.
+The lower right corner issues a RIGHT button.
+Optionally, tap to click can be enabled (see below).
+.El
+.Sh SYSCTL VARIABLES
+These
+.Xr sysctl 8
+variables are available:
+.Bl -tag -width 8n
+.It Va debug.cyapa_idle_freq
+Scan frequency in idle mode, the default is 1.
+.It Va debug.cyapa_slow_freq
+Scan frequency in slow mode, the default is 20.
+.It Va debug.cyapa_norm_freq
+Scan frequency in normal mode, the default is 100.
+.It Va debug.cyapa_minpressure
+Minimum pressure to detect a finger, the default is 12.
+.It Va debug.cyapa_enable_tapclick
+Controls tap to click.
+Possible values:
+.Bl -tag -width 8n
+.It 0
+Tap to click is disabled.
+This is the default value.
+.It 1
+Tap to click always generates a left mouse button event.
+.It 2
+Tap to click generates left mouse button event if the left 2/3rds of the pad
+are tapped and a right mouse button event otherwise.
+.It 3
+Tap to click generates mouse button events as if the physical button was
+pressed (see
+.Sx DESCRIPTION
+above).
+.El
+.It Va debug.cyapa_tapclick_min_ticks
+Minimum tap duration in ticks to create a click, the default is 1.
+.It Va debug.cyapa_tapclick_max_ticks
+Maximum tap duration in ticks to create a click, the default is 8.
+.It Va debug.cyapa_move_min_ticks
+Minimum ticks before cursor movement occurs, the default is 4.
+.It Va debug.cyapa_scroll_wait_ticks
+Ticks to wait before starting to scroll, the default is 0.
+.It Va debug.cyapa_scroll_stick_ticks
+Ticks while preventing cursor movement on single finger after scroll,
+the default is 15.
+.It Va debug.cyapa_thumbarea_percent
+Size of bottom thumb area in percent, the default is 15.
+.It Va debug.cyapa_debug
+Setting this to a non-zero value enables debug output to console and syslog,
+the default is 0.
+.It Va debug.cyapa_reset
+Setting this to a non-zero value reinitializes the device.
+The sysctl resets to zero immediately.
+.El
+.Sh FILES
+.Nm
+creates
+.Pa /dev/cyapa0 ,
+which presents the mouse as an
+.Ar IntelliMouse PS/2
+device.
+It supports
+.Xr moused 8
+levels 0 through 2, level 1 is used by default.
+.Sh EXAMPLES
+To use
+.Nm
+with
+.Xr moused 8 ,
+add the following lines to the
+.Xr rc.conf 5
+file:
+.Pp
+.Dl moused_enable="YES"
+.Dl moused_port="/dev/cyapa0"
+.Pp
+If vertical scrolling is not desired, add
+.Pp
+.Dl moused_flags="-l0"
+.Pp
+to
+.Xr rc.conf 5 .
+.Pp
+Enable tap to click for the left and the right mouse button and
+disable the thumb area by adding these lines to the
+.Xr sysctl.conf 5
+file:
+.Pp
+.Dl debug.cyapa_thumbarea_percent=0
+.Dl debug.cyapa_enable_tapclick=2
+.Sh SEE ALSO
+.Xr ig4 4 ,
+.Xr moused 4 ,
+.Xr smbus 4 ,
+.Xr sysmouse 4
+.Sh AUTHORS
+.An -nosplit
+The original
+.Nm
+driver was written for DragonFly BSD by
+.An Matthew Dillon .
+.Pp
+It has been ported, modified, and enhanced for
+.Fx
+by
+.An Michael Gmelin Aq Mt freebsd at grem.de .
+.Pp
+This manual page was written by
+.An Michael Gmelin Aq Mt freebsd at grem.de .
+.Sh BUGS
+The
+.Nm
+driver detects the device based on its I2C address (0x67).
+This might have unforeseen consequences if the initialization sequence
+is sent to an unknown device at that address.

Copied: projects/clang-trunk/share/man/man4/isl.4 (from r285923, head/share/man/man4/isl.4)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang-trunk/share/man/man4/isl.4	Mon Jul 27 22:20:28 2015	(r285924, copy of r285923, head/share/man/man4/isl.4)
@@ -0,0 +1,104 @@
+.\" Copyright (c) 2015 Michael Gmelin <freebsd at grem.de>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd July 25, 2015
+.Dt ISL 4
+.Os
+.Sh NAME
+.Nm isl
+.Nd Intersil(TM) I2C ISL29018 sensor driver
+.Sh SYNOPSIS
+To compile this driver into the kernel, place the following lines into
+the kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device isl"
+.Cd "device ig4"
+.Cd "device smbus"
+.Ed
+.Pp
+Alternatively, to load the driver as a module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+isl_load="YES"
+ig4_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides access to sensor data provided by the Intersil(TM) I2C
+ISL29018 Digital Ambient Light Sensor and Proximity Sensor with Interrupt
+Function.
+Functionality is basic and provided through the
+.Xr sysctl 8
+interface.
+.Sh SYSCTL VARIABLES
+The following
+.Xr sysctl 8
+variables are available:
+.Bl -tag -width "dev.isl.X.resolution"
+.It Va dev.isl.X.als
+Current ALS (Ambient Light Sensor) readout.
+.It Va dev.isl.X.ir
+Current IR (InfraRed) sensor readout.
+.It Va dev.isl.X.prox
+Current proximity sensor readout.
+.It Va dev.isl.X.resolution
+Current sensor resolution.
+.It Va dev.isl.X.range
+Current sensor range.
+.El
+.Sh EXAMPLES
+.Ss Ambient light sensor read out
+.Bd -literal
+$ sysctl dev.isl.0.als
+dev.isl.0.als: 64
+.Ed
+.Ss Automatically adjust brightness
+This requires the port
+.Pa graphics/intel-backlight
+and only works with laptops using a supported Intel(R) GPU.
+.Bd -literal
+$ pkg install intel-backlight
+$ sh /usr/local/share/examples/intel-backlight/isl_backlight.sh
+.Ed
+.Sh SEE ALSO
+.Xr ig4 4 ,
+.Xr smbus 4
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Michael Gmelin Aq Mt freebsd at grem.de .
+.Pp
+This manual page was written by
+.An Michael Gmelin Aq Mt freebsd at grem.de .
+.Sh BUGS
+The
+.Nm
+driver detects the device based on its I2C address (0x44).
+This might have unforeseen consequences if the initialization sequence
+is sent to an unknown device at that address.

Modified: projects/clang-trunk/share/man/man4/mac.4
==============================================================================
--- projects/clang-trunk/share/man/man4/mac.4	Mon Jul 27 19:21:23 2015	(r285923)
+++ projects/clang-trunk/share/man/man4/mac.4	Mon Jul 27 22:20:28 2015	(r285924)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"

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