MFH

Sponsored by:	The FreeBSD Foundation

26 files changed, 39 insertions, 47 deletions

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 17b9720..3b72a1b 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -6,6 +6,9 @@ SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
+# Force building of libc_pic.a
+MK_TOOLCHAIN=	yes
+
 LIBC_SRCTOP?= ${.CURDIR}
 
 # Pick the current architecture directory for libc. In general, this is
diff --git a/lib/libc/aarch64/Symbol.map b/lib/libc/aarch64/Symbol.map
index 84c38d8..0c00ec2 100644
--- a/lib/libc/aarch64/Symbol.map
+++ b/lib/libc/aarch64/Symbol.map
@@ -36,7 +36,5 @@ FBSD_1.0 {
 FBSDprivate_1.0 {
 	_set_tp;
 	_end;
-	curbrk;
-	minbrk;
 	__makecontext;
 };
diff --git a/lib/libc/amd64/Symbol.map b/lib/libc/amd64/Symbol.map
index bbf6113..5354d66 100644
--- a/lib/libc/amd64/Symbol.map
+++ b/lib/libc/amd64/Symbol.map
@@ -63,8 +63,6 @@ FBSDprivate_1.0 {
 	__signalcontext;
 	signalcontext;
 	__siglongjmp;
-	.curbrk;
-	.minbrk;
 	_brk;
 	_end;
 	__sys_vfork;
diff --git a/lib/libc/arm/Symbol.map b/lib/libc/arm/Symbol.map
index cf65492..3c5c80f 100644
--- a/lib/libc/arm/Symbol.map
+++ b/lib/libc/arm/Symbol.map
@@ -29,7 +29,6 @@ FBSD_1.0 {
 	ntohs;
 	vfork;
 	brk;
-	cerror;		/* XXX - Should this be .cerror (see sys/cerror.S)? */
 	sbrk;
 };
 
@@ -60,8 +59,6 @@ FBSDprivate_1.0 {
 	_vfork;
 	_brk;
 	_end;
-	curbrk;
-	minbrk;
 	_sbrk;
 
 	/* softfloat */
diff --git a/lib/libc/db/mpool/Makefile.inc b/lib/libc/db/mpool/Makefile.inc
index bab7e6d..76ec0eb 100644
--- a/lib/libc/db/mpool/Makefile.inc
+++ b/lib/libc/db/mpool/Makefile.inc
@@ -3,4 +3,7 @@
 
 .PATH: ${LIBC_SRCTOP}/db/mpool
 
-SRCS+=	mpool.c mpool-compat.c
+SRCS+=	mpool.c
+.if ${MK_SYMVER} == yes
+SRCS+=	mpool-compat.c
+.endif
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 7de8ce3..a68f5c7 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -49,7 +49,6 @@ SRCS+=	__getosreldate.c \
 	fstab.c \
 	ftok.c \
 	fts.c \
-	fts-compat.c \
 	ftw.c \
 	getbootfile.c \
 	getbsize.c \
@@ -137,7 +136,6 @@ SRCS+=	__getosreldate.c \
 	ualarm.c \
 	ulimit.c \
 	uname.c \
-	unvis-compat.c \
 	usleep.c \
 	utime.c \
 	utxdb.c \
@@ -147,6 +145,10 @@ SRCS+=	__getosreldate.c \
 	waitpid.c \
 	waitid.c \
 	wordexp.c
+.if ${MK_SYMVER} == yes
+SRCS+=	fts-compat.c \
+	unvis-compat.c
+.endif
 
 .PATH: ${LIBC_SRCTOP}/../../contrib/libc-pwcache
 SRCS+=	pwcache.c pwcache.h
diff --git a/lib/libc/i386/Symbol.map b/lib/libc/i386/Symbol.map
index 78be4c4..20dbc3e 100644
--- a/lib/libc/i386/Symbol.map
+++ b/lib/libc/i386/Symbol.map
@@ -64,6 +64,4 @@ FBSDprivate_1.0 {
 	_vfork;
 	_end;
 	_brk;
-	.curbrk;
-	.minbrk;
 };
diff --git a/lib/libc/iconv/Makefile.inc b/lib/libc/iconv/Makefile.inc
index 5442f79..3b24737 100644
--- a/lib/libc/iconv/Makefile.inc
+++ b/lib/libc/iconv/Makefile.inc
@@ -14,7 +14,11 @@ SRCS+=	citrus_bcs.c citrus_bcs_strtol.c citrus_bcs_strtoul.c \
 	citrus_esdb.c citrus_hash.c citrus_iconv.c citrus_lookup.c \
 	citrus_lookup_factory.c citrus_mapper.c citrus_memstream.c \
 	citrus_mmap.c citrus_module.c citrus_none.c citrus_pivot_factory.c \
-	citrus_prop.c citrus_stdenc.c bsd_iconv.c iconv_compat.c
+	citrus_prop.c citrus_stdenc.c bsd_iconv.c
+.if ${MK_SYMVER} == yes
+SRCS+=	iconv_compat.c
+.endif
+
 SYM_MAPS+= ${LIBC_SRCTOP}/iconv/Symbol.map
 
 .if ${MK_ICONV} == yes
diff --git a/lib/libc/locale/euc.c b/lib/libc/locale/euc.c
index c2a2e3b..2fe4046 100644
--- a/lib/libc/locale/euc.c
+++ b/lib/libc/locale/euc.c
@@ -132,7 +132,7 @@ _EUC_CN_init(struct xlocale_ctype *l, _RuneLocale *rl)
 
 	l->runes = rl;
 	l->__mb_cur_max = 4;
-	l->__mb_sb_limit = 256;
+	l->__mb_sb_limit = 128;
 	return (0);
 }
 
@@ -226,7 +226,7 @@ _EUC_JP_init(struct xlocale_ctype *l, _RuneLocale *rl)
 
 	l->runes = rl;
 	l->__mb_cur_max = 3;
-	l->__mb_sb_limit = 196;
+	l->__mb_sb_limit = 128;
 	return (0);
 }
 
@@ -273,7 +273,7 @@ _EUC_TW_init(struct xlocale_ctype *l, _RuneLocale *rl)
 
 	l->runes = rl;
 	l->__mb_cur_max = 4;
-	l->__mb_sb_limit = 256;
+	l->__mb_sb_limit = 128;
 	return (0);
 }
 
diff --git a/lib/libc/locale/mskanji.c b/lib/libc/locale/mskanji.c
index dc2d0e1..c7da4b5 100644
--- a/lib/libc/locale/mskanji.c
+++ b/lib/libc/locale/mskanji.c
@@ -83,7 +83,7 @@ _MSKanji_init(struct xlocale_ctype *l, _RuneLocale *rl)
 	l->__mbsinit = _MSKanji_mbsinit;
 	l->runes = rl;
 	l->__mb_cur_max = 2;
-	l->__mb_sb_limit = 256;
+	l->__mb_sb_limit = 224;
 	return (0);
 }
 
diff --git a/lib/libc/mips/Symbol.map b/lib/libc/mips/Symbol.map
index d7fbd0a..3868080 100644
--- a/lib/libc/mips/Symbol.map
+++ b/lib/libc/mips/Symbol.map
@@ -28,7 +28,6 @@ FBSD_1.0 {
 	ntohs;
 	vfork;
 	brk;
-	cerror;		/* XXX - Should this be .cerror (see sys/cerror.S)? */
 	sbrk;
 };
 
@@ -52,8 +51,6 @@ FBSDprivate_1.0 {
 	__sys_vfork;
 	_vfork;
 	_end;
-	__curbrk;
-	minbrk;
 	_brk;
 	_sbrk;
 
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index 6f51f08..304c465 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -35,7 +35,6 @@ YFLAGS+=-p_nsyy
 LFLAGS+=-P_nsyy
 
 CFLAGS.nslexer.c= -DYY_BUF_SIZE=1024
-CFLAGS+=	${CFLAGS.${.IMPSRC:T}}
 
 MAN+=	byteorder.3 ethers.3 eui64.3 \
 	getaddrinfo.3 gai_strerror.3 gethostbyname.3 \
diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc
index 2cc4158..85fed32 100644
--- a/lib/libc/posix1e/Makefile.inc
+++ b/lib/libc/posix1e/Makefile.inc
@@ -11,7 +11,6 @@ subr_acl_nfs4.c: ${LIBC_SRCTOP}/../../sys/kern/subr_acl_nfs4.c
 SRCS+=	acl_branding.c			\
 	acl_calc_mask.c			\
 	acl_copy.c			\
-	acl_compat.c			\
 	acl_delete.c			\
 	acl_delete_entry.c		\
 	acl_entry.c			\
@@ -36,6 +35,9 @@ SRCS+=	acl_branding.c			\
 	mac_get.c			\
 	mac_set.c			\
 	subr_acl_nfs4.c
+.if ${MK_SYMVER} == yes
+SRCS+=	acl_compat.c
+.endif
 
 SYM_MAPS+=${LIBC_SRCTOP}/posix1e/Symbol.map
 
diff --git a/lib/libc/powerpc/Symbol.map b/lib/libc/powerpc/Symbol.map
index 10b7c57..f695c81 100644
--- a/lib/libc/powerpc/Symbol.map
+++ b/lib/libc/powerpc/Symbol.map
@@ -56,7 +56,4 @@ FBSDprivate_1.0 {
 	__signalcontext;
 	__syncicache;
 	_end;
-	.curbrk;
-	.minbrk;
-	.cerror;
 };
diff --git a/lib/libc/powerpc64/Symbol.map b/lib/libc/powerpc64/Symbol.map
index 018a193..c429e84 100644
--- a/lib/libc/powerpc64/Symbol.map
+++ b/lib/libc/powerpc64/Symbol.map
@@ -52,7 +52,4 @@ FBSDprivate_1.0 {
 	__signalcontext;
 	__syncicache;
 	_end;
-	_curbrk;
-	_minbrk;
-	_cerror;
 };
diff --git a/lib/libc/riscv/Symbol.map b/lib/libc/riscv/Symbol.map
index 84c38d8..0c00ec2 100644
--- a/lib/libc/riscv/Symbol.map
+++ b/lib/libc/riscv/Symbol.map
@@ -36,7 +36,5 @@ FBSD_1.0 {
 FBSDprivate_1.0 {
 	_set_tp;
 	_end;
-	curbrk;
-	minbrk;
 	__makecontext;
 };
diff --git a/lib/libc/secure/Makefile.inc b/lib/libc/secure/Makefile.inc
index 6f18bde..e2e75c7 100644
--- a/lib/libc/secure/Makefile.inc
+++ b/lib/libc/secure/Makefile.inc
@@ -5,8 +5,9 @@
 .PATH: ${LIBC_SRCTOP}/secure
 
 # Sources common to both syscall interfaces:
-SRCS+=	\
-	stack_protector.c \
-	stack_protector_compat.c
+SRCS+=	stack_protector.c
+.if ${MK_SYMVER} == yes
+SRCS+=	stack_protector_compat.c
+.endif
 
 SYM_MAPS+=    ${LIBC_SRCTOP}/secure/Symbol.map
diff --git a/lib/libc/sparc64/Symbol.map b/lib/libc/sparc64/Symbol.map
index 4f90486..1dc3d15 100644
--- a/lib/libc/sparc64/Symbol.map
+++ b/lib/libc/sparc64/Symbol.map
@@ -80,11 +80,8 @@ FBSDprivate_1.0 {
 	signalcontext;
 	__signalcontext;
 	__siglongjmp;
-	.curbrk;
-	.minbrk;
 	__sys_brk;
 	_brk;
-	.cerror;
 	__sys_exect;
 	_exect;
 	_end;
diff --git a/lib/libc/stdio/open_memstream.3 b/lib/libc/stdio/open_memstream.3
index 1a0cb07..8e2c1e9 100644
--- a/lib/libc/stdio/open_memstream.3
+++ b/lib/libc/stdio/open_memstream.3
@@ -144,8 +144,8 @@ Memory for the stream or buffer could not be allocated.
 .Xr fopen 3 ,
 .Xr free 3 ,
 .Xr fseek 3 ,
-.Xr sbuf 3 ,
-.Xr stdio 3
+.Xr stdio 3 ,
+.Xr sbuf 9
 .Sh STANDARDS
 The
 .Fn open_memstream
diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc
index 3220cc9..9b53ba5 100644
--- a/lib/libc/stdtime/Makefile.inc
+++ b/lib/libc/stdtime/Makefile.inc
@@ -12,7 +12,6 @@ SYM_MAPS+= ${LIBC_SRCTOP}/stdtime/Symbol.map
 CFLAGS+= -I${LIBC_SRCTOP}/../../contrib/tzcode/stdtime -I${LIBC_SRCTOP}/stdtime
 
 CFLAGS.localtime.c= -fwrapv
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
 
 MAN+=	ctime.3 strftime.3 strptime.3 time2posix.3
 MAN+=	tzfile.5
diff --git a/lib/libc/sys/aio_return.2 b/lib/libc/sys/aio_return.2
index 2ef6c25..df55873 100644
--- a/lib/libc/sys/aio_return.2
+++ b/lib/libc/sys/aio_return.2
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 7, 2006
+.Dd March 21, 2016
 .Dt AIO_RETURN 2
 .Os
 .Sh NAME
@@ -34,7 +34,7 @@
 .Lb libc
 .Sh SYNOPSIS
 .In aio.h
-.Ft int
+.Ft ssize_t
 .Fn aio_return "struct aiocb *iocb"
 .Sh DESCRIPTION
 The
diff --git a/lib/libc/sys/aio_waitcomplete.2 b/lib/libc/sys/aio_waitcomplete.2
index 885b3d7..66e7208 100644
--- a/lib/libc/sys/aio_waitcomplete.2
+++ b/lib/libc/sys/aio_waitcomplete.2
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 19, 2000
+.Dd March 21, 2016
 .Dt AIO_WAITCOMPLETE 2
 .Os
 .Sh NAME
@@ -34,7 +34,7 @@
 .Lb libc
 .Sh SYNOPSIS
 .In aio.h
-.Ft int
+.Ft ssize_t
 .Fn aio_waitcomplete "struct aiocb **iocbp" "struct timespec *timeout"
 .Sh DESCRIPTION
 The
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index 4e5d92a..b02a672 100644
--- a/lib/libc/sys/ktrace.2
+++ b/lib/libc/sys/ktrace.2
@@ -28,7 +28,7 @@
 .\"     @(#)ktrace.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd October 10, 2011
+.Dd March 31, 2016
 .Dt KTRACE 2
 .Os
 .Sh NAME
@@ -94,6 +94,8 @@ generate much output).
 .It KTRFAC_PROCCTOR Ta "Trace process construction."
 .It KTRFAC_PROCDTOR Ta "Trace process destruction."
 .It KTRFAC_CAPFAIL Ta "Trace capability failures."
+.It KTRFAC_FAULT Ta "Trace page faults."
+.It KTRFAC_FAULTEND Ta "Trace the end of page faults."
 .It KTRFAC_INHERIT Ta "Inherit tracing to future children."
 .El
 .Pp
diff --git a/lib/libc/sys/modfind.2 b/lib/libc/sys/modfind.2
index 3f48579..38d09c4 100644
--- a/lib/libc/sys/modfind.2
+++ b/lib/libc/sys/modfind.2
@@ -49,7 +49,7 @@ The
 .Fn modfind
 system call
 returns the modid of the kernel module referenced by
-.Fa file .
+.Fa modname .
 Upon error,
 .Fn modfind
 returns -1 and sets
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 786f457..10ad660 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -103,7 +103,7 @@ be ignored.
 If the child was created by
 .Xr vfork 2
 system call or
-.Xr rfork(2)
+.Xr rfork 2
 call with the
 .Dv RFMEM
 flag specified, the debugging events are reported to the parent
diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile
index 09adf97..11ccca9 100644
--- a/lib/libc/tests/ssp/Makefile
+++ b/lib/libc/tests/ssp/Makefile
@@ -36,7 +36,7 @@ PROGS+=		h_memset
 #
 # sanitizer is not tested or supported for ARM right now. sbruno
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-.if ${COMPILER_TYPE} == "clang"
+.if ${COMPILER_TYPE} == "clang" && ${MK_TOOLCHAIN} == "yes"
 .if ${COMPILER_VERSION} < 30500 || 30700 <= ${COMPILER_VERSION}
 PROGS+=		h_raw
 .endif