21 files changed, 89 insertions, 185 deletions

diff --git a/lib/libc/Makefile.depend b/lib/libc/Makefile.depend
index 02168e8..c38d79a 100644
--- a/lib/libc/Makefile.depend
+++ b/lib/libc/Makefile.depend
@@ -15,157 +15,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-cancelpoints_sem.So: cancelpoints_sem.c
-cancelpoints_sem.o: cancelpoints_sem.c
-cancelpoints_sem.po: cancelpoints_sem.c
-cancelpoints_sem_new.So: cancelpoints_sem_new.c
-cancelpoints_sem_new.o: cancelpoints_sem_new.c
-cancelpoints_sem_new.po: cancelpoints_sem_new.c
-crypt_clnt.So: crypt.h
-crypt_clnt.So: crypt_clnt.c
-crypt_clnt.o: crypt.h
-crypt_clnt.o: crypt_clnt.c
-crypt_clnt.po: crypt.h
-crypt_clnt.po: crypt_clnt.c
-crypt_xdr.So: crypt.h
-crypt_xdr.So: crypt_xdr.c
-crypt_xdr.o: crypt.h
-crypt_xdr.o: crypt_xdr.c
-crypt_xdr.po: crypt.h
-crypt_xdr.po: crypt_xdr.c
-gdtoa_dmisc.So: gdtoa_dmisc.c
-gdtoa_dmisc.o: gdtoa_dmisc.c
-gdtoa_dmisc.po: gdtoa_dmisc.c
-gdtoa_dtoa.So: gdtoa_dtoa.c
-gdtoa_dtoa.o: gdtoa_dtoa.c
-gdtoa_dtoa.po: gdtoa_dtoa.c
-gdtoa_gdtoa.So: gdtoa_gdtoa.c
-gdtoa_gdtoa.o: gdtoa_gdtoa.c
-gdtoa_gdtoa.po: gdtoa_gdtoa.c
-gdtoa_gethex.So: gdtoa_gethex.c
-gdtoa_gethex.o: gdtoa_gethex.c
-gdtoa_gethex.po: gdtoa_gethex.c
-gdtoa_gmisc.So: gdtoa_gmisc.c
-gdtoa_gmisc.o: gdtoa_gmisc.c
-gdtoa_gmisc.po: gdtoa_gmisc.c
-gdtoa_hd_init.So: gdtoa_hd_init.c
-gdtoa_hd_init.o: gdtoa_hd_init.c
-gdtoa_hd_init.po: gdtoa_hd_init.c
-gdtoa_hexnan.So: gdtoa_hexnan.c
-gdtoa_hexnan.o: gdtoa_hexnan.c
-gdtoa_hexnan.po: gdtoa_hexnan.c
-gdtoa_misc.So: gdtoa_misc.c
-gdtoa_misc.o: gdtoa_misc.c
-gdtoa_misc.po: gdtoa_misc.c
-gdtoa_smisc.So: gdtoa_smisc.c
-gdtoa_smisc.o: gdtoa_smisc.c
-gdtoa_smisc.po: gdtoa_smisc.c
-gdtoa_strtod.So: gdtoa_strtod.c
-gdtoa_strtod.o: gdtoa_strtod.c
-gdtoa_strtod.po: gdtoa_strtod.c
-gdtoa_strtodg.So: gdtoa_strtodg.c
-gdtoa_strtodg.o: gdtoa_strtodg.c
-gdtoa_strtodg.po: gdtoa_strtodg.c
-gdtoa_strtof.So: gdtoa_strtof.c
-gdtoa_strtof.o: gdtoa_strtof.c
-gdtoa_strtof.po: gdtoa_strtof.c
-gdtoa_strtord.So: gdtoa_strtord.c
-gdtoa_strtord.o: gdtoa_strtord.c
-gdtoa_strtord.po: gdtoa_strtord.c
-gdtoa_strtorx.So: gdtoa_strtorx.c
-gdtoa_strtorx.o: gdtoa_strtorx.c
-gdtoa_strtorx.po: gdtoa_strtorx.c
-gdtoa_sum.So: gdtoa_sum.c
-gdtoa_sum.o: gdtoa_sum.c
-gdtoa_sum.po: gdtoa_sum.c
-gdtoa_ulp.So: gdtoa_ulp.c
-gdtoa_ulp.o: gdtoa_ulp.c
-gdtoa_ulp.po: gdtoa_ulp.c
-jemalloc_arena.So: jemalloc_arena.c
-jemalloc_arena.o: jemalloc_arena.c
-jemalloc_arena.po: jemalloc_arena.c
-jemalloc_atomic.So: jemalloc_atomic.c
-jemalloc_atomic.o: jemalloc_atomic.c
-jemalloc_atomic.po: jemalloc_atomic.c
-jemalloc_base.So: jemalloc_base.c
-jemalloc_base.o: jemalloc_base.c
-jemalloc_base.po: jemalloc_base.c
-jemalloc_bitmap.So: jemalloc_bitmap.c
-jemalloc_bitmap.o: jemalloc_bitmap.c
-jemalloc_bitmap.po: jemalloc_bitmap.c
-jemalloc_chunk.So: jemalloc_chunk.c
-jemalloc_chunk.o: jemalloc_chunk.c
-jemalloc_chunk.po: jemalloc_chunk.c
-jemalloc_chunk_dss.So: jemalloc_chunk_dss.c
-jemalloc_chunk_dss.o: jemalloc_chunk_dss.c
-jemalloc_chunk_dss.po: jemalloc_chunk_dss.c
-jemalloc_chunk_mmap.So: jemalloc_chunk_mmap.c
-jemalloc_chunk_mmap.o: jemalloc_chunk_mmap.c
-jemalloc_chunk_mmap.po: jemalloc_chunk_mmap.c
-jemalloc_ckh.So: jemalloc_ckh.c
-jemalloc_ckh.o: jemalloc_ckh.c
-jemalloc_ckh.po: jemalloc_ckh.c
-jemalloc_ctl.So: jemalloc_ctl.c
-jemalloc_ctl.o: jemalloc_ctl.c
-jemalloc_ctl.po: jemalloc_ctl.c
-jemalloc_extent.So: jemalloc_extent.c
-jemalloc_extent.o: jemalloc_extent.c
-jemalloc_extent.po: jemalloc_extent.c
-jemalloc_hash.So: jemalloc_hash.c
-jemalloc_hash.o: jemalloc_hash.c
-jemalloc_hash.po: jemalloc_hash.c
-jemalloc_huge.So: jemalloc_huge.c
-jemalloc_huge.o: jemalloc_huge.c
-jemalloc_huge.po: jemalloc_huge.c
-jemalloc_jemalloc.So: jemalloc_jemalloc.c
-jemalloc_jemalloc.o: jemalloc_jemalloc.c
-jemalloc_jemalloc.po: jemalloc_jemalloc.c
-jemalloc_mb.So: jemalloc_mb.c
-jemalloc_mb.o: jemalloc_mb.c
-jemalloc_mb.po: jemalloc_mb.c
-jemalloc_mutex.So: jemalloc_mutex.c
-jemalloc_mutex.o: jemalloc_mutex.c
-jemalloc_mutex.po: jemalloc_mutex.c
-jemalloc_pages.So: jemalloc_pages.c
-jemalloc_pages.o: jemalloc_pages.c
-jemalloc_pages.po: jemalloc_pages.c
-jemalloc_prof.So: jemalloc_prof.c
-jemalloc_prof.o: jemalloc_prof.c
-jemalloc_prof.po: jemalloc_prof.c
-jemalloc_quarantine.So: jemalloc_quarantine.c
-jemalloc_quarantine.o: jemalloc_quarantine.c
-jemalloc_quarantine.po: jemalloc_quarantine.c
-jemalloc_rtree.So: jemalloc_rtree.c
-jemalloc_rtree.o: jemalloc_rtree.c
-jemalloc_rtree.po: jemalloc_rtree.c
-jemalloc_stats.So: jemalloc_stats.c
-jemalloc_stats.o: jemalloc_stats.c
-jemalloc_stats.po: jemalloc_stats.c
-jemalloc_tcache.So: jemalloc_tcache.c
-jemalloc_tcache.o: jemalloc_tcache.c
-jemalloc_tcache.po: jemalloc_tcache.c
-jemalloc_tsd.So: jemalloc_tsd.c
-jemalloc_tsd.o: jemalloc_tsd.c
-jemalloc_tsd.po: jemalloc_tsd.c
-jemalloc_util.So: jemalloc_util.c
-jemalloc_util.o: jemalloc_util.c
-jemalloc_util.po: jemalloc_util.c
-nslexer.So: nslexer.c
-nslexer.So: nsparser.h
-nslexer.o: nslexer.c
-nslexer.o: nsparser.h
-nslexer.po: nslexer.c
-nslexer.po: nsparser.h
-nsparser.So: nsparser.c
-nsparser.o: nsparser.c
-nsparser.po: nsparser.c
-subr_acl_nfs4.So: subr_acl_nfs4.c
-subr_acl_nfs4.o: subr_acl_nfs4.c
-subr_acl_nfs4.po: subr_acl_nfs4.c
-yp_xdr.So: yp.h
-yp_xdr.So: yp_xdr.c
-yp_xdr.o: yp.h
-yp_xdr.o: yp_xdr.c
-yp_xdr.po: yp.h
-yp_xdr.po: yp_xdr.c
 .endif
diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
index f0db406..d42105d 100644
--- a/lib/libc/db/btree/bt_split.c
+++ b/lib/libc/db/btree/bt_split.c
@@ -236,9 +236,12 @@ __bt_split(BTREE *t, PAGE *sp, const DBT *key, const DBT *data, int flags,
 			WR_BINTERNAL(dest, nksize ? nksize : bl->ksize,
 			    rchild->pgno, bl->flags & P_BIGKEY);
 			memmove(dest, bl->bytes, nksize ? nksize : bl->ksize);
-			if (bl->flags & P_BIGKEY &&
-			    bt_preserve(t, *(pgno_t *)bl->bytes) == RET_ERROR)
-				goto err1;
+			if (bl->flags & P_BIGKEY) {
+				pgno_t pgno;
+				memcpy(&pgno, bl->bytes, sizeof(pgno));
+				if (bt_preserve(t, pgno) == RET_ERROR)
+					goto err1;
+			}
 			break;
 		case P_RINTERNAL:
 			/*
@@ -544,9 +547,12 @@ bt_broot(BTREE *t, PAGE *h, PAGE *l, PAGE *r)
 		 * If the key is on an overflow page, mark the overflow chain
 		 * so it isn't deleted when the leaf copy of the key is deleted.
 		 */
-		if (bl->flags & P_BIGKEY &&
-		    bt_preserve(t, *(pgno_t *)bl->bytes) == RET_ERROR)
-			return (RET_ERROR);
+	if (bl->flags & P_BIGKEY) {
+			pgno_t pgno;
+			memcpy(&pgno, bl->bytes, sizeof(pgno));
+			if (bt_preserve(t, pgno) == RET_ERROR)
+				return (RET_ERROR);
+		}
 		break;
 	case P_BINTERNAL:
 		bi = GETBINTERNAL(r, 0);
diff --git a/lib/libc/db/recno/rec_put.c b/lib/libc/db/recno/rec_put.c
index 441cced..68e6e85 100644
--- a/lib/libc/db/recno/rec_put.c
+++ b/lib/libc/db/recno/rec_put.c
@@ -140,8 +140,7 @@ einval:		errno = EINVAL;
 			return (RET_ERROR);
 		if (nrec > t->bt_nrecs + 1) {
 			if (F_ISSET(t, R_FIXLEN)) {
-				if ((tdata.data =
-				    (void *)malloc(t->bt_reclen)) == NULL)
+				if ((tdata.data = malloc(t->bt_reclen)) == NULL)
 					return (RET_ERROR);
 				tdata.size = t->bt_reclen;
 				memset(tdata.data, t->bt_bval, tdata.size);
@@ -208,7 +207,7 @@ __rec_iput(BTREE *t, recno_t nrec, const DBT *data, u_int flags)
 			return (RET_ERROR);
 		tdata.data = db;
 		tdata.size = NOVFLSIZE;
-		*(pgno_t *)db = pg;
+		memcpy(db, &pg, sizeof(pg));
 		*(u_int32_t *)(db + sizeof(pgno_t)) = data->size;
 		dflags = P_BIGDATA;
 		data = &tdata;
diff --git a/lib/libc/locale/mbtowc.c b/lib/libc/locale/mbtowc.c
index 70fc19e..376d6cf 100644
--- a/lib/libc/locale/mbtowc.c
+++ b/lib/libc/locale/mbtowc.c
@@ -32,6 +32,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <errno.h>
 #include <stdlib.h>
 #include <wchar.h>
 #include "mblocal.h"
@@ -49,9 +50,15 @@ mbtowc_l(wchar_t * __restrict pwc, const char * __restrict s, size_t n, locale_t
 		return (0);
 	}
 	rval = XLOCALE_CTYPE(locale)->__mbrtowc(pwc, s, n, &locale->mbtowc);
-	if (rval == (size_t)-1 || rval == (size_t)-2)
+	switch (rval) {
+	case (size_t)-2:
+		errno = EILSEQ;
+		/* FALLTHROUGH */
+	case (size_t)-1:
 		return (-1);
-	return ((int)rval);
+	default:
+		return ((int)rval);
+	}
 }
 int
 mbtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n)
diff --git a/lib/libc/net/sctp_recvmsg.3 b/lib/libc/net/sctp_recvmsg.3
index 945797d..a8b0734 100644
--- a/lib/libc/net/sctp_recvmsg.3
+++ b/lib/libc/net/sctp_recvmsg.3
@@ -285,10 +285,10 @@ is not connected and is a one-to-one style socket.
 .Xr getsockopt 2 ,
 .Xr recv 2 ,
 .Xr select 2 ,
+.Xr sendmsg 2 ,
 .Xr setsockopt 2 ,
 .Xr socket 2 ,
 .Xr write 2 ,
 .Xr sctp_send 3 ,
 .Xr sctp_sendmsg 3 ,
-.Xr sendmsg 3 ,
 .Xr sctp 4
diff --git a/lib/libc/net/sctp_sendmsg.3 b/lib/libc/net/sctp_sendmsg.3
index bc61061..65f790a 100644
--- a/lib/libc/net/sctp_sendmsg.3
+++ b/lib/libc/net/sctp_sendmsg.3
@@ -314,10 +314,10 @@ is not connected and is a one-to-one style socket.
 .Xr getsockopt 2 ,
 .Xr recv 2 ,
 .Xr select 2 ,
+.Xr sendmsg 2 ,
 .Xr socket 2 ,
 .Xr write 2 ,
 .Xr sctp_connectx 3 ,
-.Xr sendmsg 3 ,
 .Xr sctp 4
 .Sh BUGS
 Because in the one-to-many style socket
diff --git a/lib/libc/posix1e/acl.3 b/lib/libc/posix1e/acl.3
index d37cd14..2c7ebd6 100644
--- a/lib/libc/posix1e/acl.3
+++ b/lib/libc/posix1e/acl.3
@@ -209,7 +209,7 @@ This function is described in
 and may be used to set the tag type of an ACL.
 .It Fn acl_strip_np
 This function is described in
-.Xr acl-strip_np 3 ,
+.Xr acl_strip_np 3 ,
 and may be used to remove extended entries from an ACL.
 .It Xo
 .Fn acl_to_text ,
diff --git a/lib/libc/posix1e/acl_delete_flag_np.3 b/lib/libc/posix1e/acl_delete_flag_np.3
index 6a613eb..3e298a4 100644
--- a/lib/libc/posix1e/acl_delete_flag_np.3
+++ b/lib/libc/posix1e/acl_delete_flag_np.3
@@ -64,7 +64,7 @@ value.
 .Sh SEE ALSO
 .Xr acl 3 ,
 .Xr acl_add_flag_np 3 ,
-.Xr acl_clear_flag_nps 3 ,
+.Xr acl_clear_flags_np 3 ,
 .Xr acl_get_flagset_np 3 ,
 .Xr acl_set_flagset_np 3 ,
 .Xr posix1e 3
diff --git a/lib/libc/posix1e/posix1e.3 b/lib/libc/posix1e/posix1e.3
index 257b6f5..02fb3ef 100644
--- a/lib/libc/posix1e/posix1e.3
+++ b/lib/libc/posix1e/posix1e.3
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 15, 2014
+.Dd February 25, 2016
 .Dt POSIX1E 3
 .Os
 .Sh NAME
@@ -94,7 +94,7 @@ for mandatory access control labels.
 .Xr acl 3 ,
 .Xr extattr 3 ,
 .Xr libbsm 3 ,
-.Xr libcapsicum 3 ,
+.Xr libcasper 3 ,
 .Xr mac 3 ,
 .Xr capsicum 4 ,
 .Xr ffs 7 ,
diff --git a/lib/libc/powerpc/_fpmath.h b/lib/libc/powerpc/_fpmath.h
index 6d80eb4..4b7971e 100644
--- a/lib/libc/powerpc/_fpmath.h
+++ b/lib/libc/powerpc/_fpmath.h
@@ -29,10 +29,17 @@
 union IEEEl2bits {
 	long double	e;
 	struct {
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+		unsigned int	manl	:32;
+		unsigned int	manh	:20;
+		unsigned int	exp	:11;
+		unsigned int	sign	:1;
+#else	/* _BYTE_ORDER == _LITTLE_ENDIAN */
 		unsigned int		sign	:1;
 		unsigned int		exp	:11;
 		unsigned int		manh	:20;
 		unsigned int		manl	:32;
+#endif
 	} bits;
 };
 
diff --git a/lib/libc/powerpc/gen/infinity.c b/lib/libc/powerpc/gen/infinity.c
index cf1695e..f532438 100644
--- a/lib/libc/powerpc/gen/infinity.c
+++ b/lib/libc/powerpc/gen/infinity.c
@@ -11,7 +11,20 @@ __FBSDID("$FreeBSD$");
 #include <math.h>
 
 /* bytes for +Infinity on powerpc */
-const union __infinity_un __infinity = { { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 } };
+const union __infinity_un __infinity = {
+#if BYTE_ORDER == BIG_ENDIAN
+	{ 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }
+#else
+	{ 0, 0, 0, 0, 0, 0, 0xf0, 0x7f }
+#endif
+};
 
 /* bytes for NaN */
-const union __nan_un __nan = { { 0xff, 0xc0, 0, 0 } };
+const union __nan_un __nan = {
+#if BYTE_ORDER == BIG_ENDIAN
+	{0xff, 0xc0, 0, 0}
+#else
+	{ 0, 0, 0xc0, 0xff }
+#endif
+};
+
diff --git a/lib/libc/powerpc64/_fpmath.h b/lib/libc/powerpc64/_fpmath.h
index 6d80eb4..4b7971e 100644
--- a/lib/libc/powerpc64/_fpmath.h
+++ b/lib/libc/powerpc64/_fpmath.h
@@ -29,10 +29,17 @@
 union IEEEl2bits {
 	long double	e;
 	struct {
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+		unsigned int	manl	:32;
+		unsigned int	manh	:20;
+		unsigned int	exp	:11;
+		unsigned int	sign	:1;
+#else	/* _BYTE_ORDER == _LITTLE_ENDIAN */
 		unsigned int		sign	:1;
 		unsigned int		exp	:11;
 		unsigned int		manh	:20;
 		unsigned int		manl	:32;
+#endif
 	} bits;
 };
 
diff --git a/lib/libc/powerpc64/gen/infinity.c b/lib/libc/powerpc64/gen/infinity.c
index cf1695e..f532438 100644
--- a/lib/libc/powerpc64/gen/infinity.c
+++ b/lib/libc/powerpc64/gen/infinity.c
@@ -11,7 +11,20 @@ __FBSDID("$FreeBSD$");
 #include <math.h>
 
 /* bytes for +Infinity on powerpc */
-const union __infinity_un __infinity = { { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 } };
+const union __infinity_un __infinity = {
+#if BYTE_ORDER == BIG_ENDIAN
+	{ 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }
+#else
+	{ 0, 0, 0, 0, 0, 0, 0xf0, 0x7f }
+#endif
+};
 
 /* bytes for NaN */
-const union __nan_un __nan = { { 0xff, 0xc0, 0, 0 } };
+const union __nan_un __nan = {
+#if BYTE_ORDER == BIG_ENDIAN
+	{0xff, 0xc0, 0, 0}
+#else
+	{ 0, 0, 0xc0, 0xff }
+#endif
+};
+
diff --git a/lib/libc/rpc/getrpcent.3 b/lib/libc/rpc/getrpcent.3
index 1a999eb..e36d31c 100644
--- a/lib/libc/rpc/getrpcent.3
+++ b/lib/libc/rpc/getrpcent.3
@@ -2,7 +2,7 @@
 .\" $NetBSD: getrpcent.3,v 1.6 1998/02/05 18:49:06 perry Exp $
 .\" $FreeBSD$
 .\"
-.Dd December 14, 1987
+.Dd February 26, 2016
 .Dt GETRPCENT 3
 .Os
 .Sh NAME
@@ -19,7 +19,7 @@
 .Ft struct rpcent *
 .Fn getrpcent void
 .Ft struct rpcent *
-.Fn getrpcbyname "char *name"
+.Fn getrpcbyname "const char *name"
 .Ft struct rpcent *
 .Fn getrpcbynumber "int number"
 .Ft void
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index 72c5da8..2bfe1ab 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -969,7 +969,7 @@ getrpc(int (*fn)(union key, struct rpcent *, char *, size_t, struct rpcent **),
 }
 
 struct rpcent *
-getrpcbyname(char *name)
+getrpcbyname(const char *name)
 {
 	union key key;
 
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
index 9ce3f8d..1c60950 100644
--- a/lib/libc/rpc/svc_simple.c
+++ b/lib/libc/rpc/svc_simple.c
@@ -272,7 +272,7 @@ universal(struct svc_req *rqstp, SVCXPRT *transp)
 			/* decode arguments into a CLEAN buffer */
 			xdrbuf = pl->p_xdrbuf;
 			/* Zero the arguments: reqd ! */
-			(void) memset(xdrbuf, 0, sizeof (pl->p_recvsz));
+			(void) memset(xdrbuf, 0, (size_t)pl->p_recvsz);
 			/*
 			 * Assuming that sizeof (xdrbuf) would be enough
 			 * for the arguments; if not then the program
diff --git a/lib/libc/stdlib/jemalloc/Makefile.inc b/lib/libc/stdlib/jemalloc/Makefile.inc
index f322f98..8c4c12a 100644
--- a/lib/libc/stdlib/jemalloc/Makefile.inc
+++ b/lib/libc/stdlib/jemalloc/Makefile.inc
@@ -4,8 +4,8 @@
 
 JEMALLOCSRCS:= jemalloc.c arena.c atomic.c base.c bitmap.c chunk.c \
 	chunk_dss.c chunk_mmap.c ckh.c ctl.c extent.c hash.c huge.c mb.c \
-	mutex.c pages.c prof.c quarantine.c rtree.c stats.c tcache.c tsd.c \
-	util.c
+	mutex.c nstime.c pages.c prng.c prof.c quarantine.c rtree.c stats.c \
+	tcache.c ticker.c tsd.c util.c
 
 SYM_MAPS+=${LIBC_SRCTOP}/stdlib/jemalloc/Symbol.map
 
diff --git a/lib/libc/stdlib/jemalloc/Symbol.map b/lib/libc/stdlib/jemalloc/Symbol.map
index c073068..087ca53 100644
--- a/lib/libc/stdlib/jemalloc/Symbol.map
+++ b/lib/libc/stdlib/jemalloc/Symbol.map
@@ -54,6 +54,11 @@ FBSD_1.3 {
 FBSD_1.4 {
 	sdallocx;
 	__sdallocx;
+	__aligned_alloc;
+	__malloc_stats_print;
+	__mallctl;
+	__mallctlnametomib;
+	__mallctlbymib;
 };
 
 FBSDprivate_1.0 {
diff --git a/lib/libc/string/strlcpy.3 b/lib/libc/string/strlcpy.3
index 76bf6b7..30a7588 100644
--- a/lib/libc/string/strlcpy.3
+++ b/lib/libc/string/strlcpy.3
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 4, 2013
+.Dd February 26, 2016
 .Dt STRLCPY 3
 .Os
 .Sh NAME
@@ -39,9 +39,9 @@
 .Sh SYNOPSIS
 .In string.h
 .Ft size_t
-.Fn strlcpy "char * restrict dst" "const char * restrict src" "size_t size"
+.Fn strlcpy "char * restrict dst" "const char * restrict src" "size_t dstsize"
 .Ft size_t
-.Fn strlcat "char * restrict dst" "const char * restrict src" "size_t size"
+.Fn strlcat "char * restrict dst" "const char * restrict src" "size_t dstsize"
 .Sh DESCRIPTION
 The
 .Fn strlcpy
diff --git a/lib/libc/sys/getdtablesize.2 b/lib/libc/sys/getdtablesize.2
index d52da83..c471891 100644
--- a/lib/libc/sys/getdtablesize.2
+++ b/lib/libc/sys/getdtablesize.2
@@ -54,7 +54,7 @@ if the limit was lowered after they were opened.
 .Xr closefrom 2 ,
 .Xr dup 2 ,
 .Xr getrlimit 2 ,
-.Xr sysconf 2
+.Xr sysconf 3
 .Sh HISTORY
 The
 .Fn getdtablesize
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index df4a0ec..ce8cc71 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -118,7 +118,7 @@ Instead of rebooting, unmount all filesystems except the one containing
 currently-running executable, and mount root filesystem using the same
 mechanism which is used during normal boot, based on
 vfs.root.mountfrom
-.Xr kenv 8
+.Xr kenv 1
 variable.
 .It Dv RB_RDONLY
 Initially mount the root file system read-only.