Index: head/lib/libc/aarch64/Symbol.map
===================================================================
--- head/lib/libc/aarch64/Symbol.map	(revision 297237)
+++ head/lib/libc/aarch64/Symbol.map	(revision 297238)
@@ -1,42 +1,40 @@
 /*
  * $FreeBSD$
  */
 
 /*
  * This only needs to contain symbols that are not listed in
  * symbol maps from other parts of libc (i.e., not found in
  * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
  */
 FBSD_1.0 {
 	/* PSEUDO syscalls */
 	_exit;
 
 	_setjmp;
 	_longjmp;
 	fabs;
 	__flt_rounds;
 	fpgetmask;
 	fpsetmask;
 	__infinity;
 	__nan;
 	setjmp;
 	longjmp;
 	sigsetjmp;
 	siglongjmp;
 	htonl;
 	htons;
 	ntohl;
 	ntohs;
 	vfork;
 	brk;
 	sbrk;
 	makecontext;
 };
 
 FBSDprivate_1.0 {
 	_set_tp;
 	_end;
-	curbrk;
-	minbrk;
 	__makecontext;
 };
Index: head/lib/libc/amd64/Symbol.map
===================================================================
--- head/lib/libc/amd64/Symbol.map	(revision 297237)
+++ head/lib/libc/amd64/Symbol.map	(revision 297238)
@@ -1,72 +1,70 @@
 /*
  * $FreeBSD$
  */
 
 /*
  * This only needs to contain symbols that are not listed in
  * symbol maps from other parts of libc (i.e., not found in
  * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
  */
 FBSD_1.0 {
 	/* PSEUDO syscalls */
 	_exit;
 
 	.mcount;
 	_setjmp;
 	_longjmp;
 	fabs;
 	__flt_rounds;
 	fpgetmask;
 	fpgetprec;
 	fpgetround;
 	fpgetsticky;
 	fpsetmask;
 	fpsetprec;
 	fpsetround;
 	__infinity;
 	__nan;
 	makecontext;
 	rfork_thread;
 	setjmp;
 	longjmp;
 	sigsetjmp;
 	siglongjmp;
 	htonl;
 	htons;
 	ntohl;
 	ntohs;
 	amd64_get_fsbase;
 	amd64_get_gsbase;
 	amd64_set_fsbase;
 	amd64_set_gsbase;
 	brk;
 	exect;
 	sbrk;
 	vfork;
 };
 
 /*
  *
  * FreeBSD private ABI
  *
  */
 FBSDprivate_1.0 {
 	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
 
 	_set_tp;
 	___longjmp;
 	__makecontext;
 	__longjmp;
 	__signalcontext;
 	signalcontext;
 	__siglongjmp;
-	.curbrk;
-	.minbrk;
 	_brk;
 	_end;
 	__sys_vfork;
 	_vfork;
 };
Index: head/lib/libc/arm/Symbol.map
===================================================================
--- head/lib/libc/arm/Symbol.map	(revision 297237)
+++ head/lib/libc/arm/Symbol.map	(revision 297238)
@@ -1,86 +1,84 @@
 /*
  * $FreeBSD$
  */
 
 /*
  * This only needs to contain symbols that are not listed in
  * symbol maps from other parts of libc (i.e., not found in
  * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
  */
 FBSD_1.0 {
 	/* PSEUDO syscalls */
 	_exit;
 
 	__mcount;
 	_setjmp;
 	_longjmp;
 	alloca;
 	fabs;
 	__infinity;
 	__nan;
 	makecontext;
 	setjmp;
 	longjmp;
 	sigsetjmp;
 	siglongjmp;
 	htonl;
 	htons;
 	ntohl;
 	ntohs;
 	vfork;
 	brk;
 	cerror;		/* XXX - Should this be .cerror (see sys/cerror.S)? */
 	sbrk;
 };
 
 FBSD_1.3 {
 	__flt_rounds;
 };
 
 FBSD_1.4 {
 	__gnu_Unwind_Find_exidx;
 	dl_unwind_find_exidx;
 };
 
 FBSDprivate_1.0 {
 	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
 
 	_set_tp;
 	__aeabi_read_tp;
 	___longjmp;
 	__makecontext;
 	__longjmp;
 	signalcontext;
 	_signalcontext;
 	__siglongjmp;
 	__sys_vfork;
 	_vfork;
 	_brk;
 	_end;
-	curbrk;
-	minbrk;
 	_sbrk;
 
 	/* softfloat */
 	__addsf3;
 	__adddf3;
 	__subsf3;
 	__subdf3;
 	__mulsf3;
 	__muldf3;
 	__divsf3;
 	__divdf3;
 	__floatsisf;
 	__floatsidf;
 	__fixsfsi;
 	__fixdfsi;
 	__fixunssfsi;
 	__fixunsdfsi;
 	__extendsfdf2;
 	__truncdfsf2;
 
 	_libc_arm_fpu_present;
 };
Index: head/lib/libc/i386/Symbol.map
===================================================================
--- head/lib/libc/i386/Symbol.map	(revision 297237)
+++ head/lib/libc/i386/Symbol.map	(revision 297238)
@@ -1,69 +1,67 @@
 /*
  * $FreeBSD$
  */
 
 /*
  * This only needs to contain symbols that are not listed in
  * symbol maps from other parts of libc (i.e., not found in
  * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
  */
 FBSD_1.0 {
 	/* PSEUDO syscalls */
 	_exit;
 
 	.mcount;
 	_setjmp;
 	_longjmp;
 	alloca;
 	fabs;
 	__flt_rounds;
 	__nan;
 	__infinity;
 	makecontext;
 	rfork_thread;
 	setjmp;
 	longjmp;
 	sigsetjmp;
 	siglongjmp;
 	htonl;
 	htons;
 	ntohl;
 	ntohs;
 	vfork;
 	brk;
 	exect;
 	i386_clr_watch;
 	i386_get_fsbase;
 	i386_get_gsbase;
 	i386_get_ioperm;
 	i386_get_ldt;
 	i386_set_fsbase;
 	i386_set_gsbase;
 	i386_set_ioperm;
 	i386_set_ldt;
 	i386_set_watch;
 	i386_vm86;
 	sbrk;
 	___tls_get_addr;
 };
 
 FBSDprivate_1.0 {
 	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
 
 	_set_tp;
 	___longjmp;
 	__makecontext;
 	__longjmp;
 	__signalcontext;
 	signalcontext;
 	__siglongjmp;
 	__sys_vfork;
 	_vfork;
 	_end;
 	_brk;
-	.curbrk;
-	.minbrk;
 };
Index: head/lib/libc/mips/Symbol.map
===================================================================
--- head/lib/libc/mips/Symbol.map	(revision 297237)
+++ head/lib/libc/mips/Symbol.map	(revision 297238)
@@ -1,77 +1,75 @@
 /*
  * $FreeBSD$
  */
 
 /*
  * This only needs to contain symbols that are not listed in
  * symbol maps from other parts of libc (i.e., not found in
  * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
  */
 FBSD_1.0 {
 	/* PSEUDO syscalls */
 	_exit;
 
 	_setjmp;
 	_longjmp;
 	alloca;
 	fabs;
 	__infinity;
 	__nan;
 	makecontext;
 	setjmp;
 	longjmp;
 	sigsetjmp;
 	siglongjmp;
 	htonl;
 	htons;
 	ntohl;
 	ntohs;
 	vfork;
 	brk;
 	cerror;		/* XXX - Should this be .cerror (see sys/cerror.S)? */
 	sbrk;
 };
 
 FBSDprivate_1.0 {
 	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
 
 	_set_tp;
 	___longjmp;
 	__umodsi3;
 	__modsi3;
 	__udivsi3;
 	__divsi3;
 	__makecontext;
 	__longjmp;
 	signalcontext;
 	_signalcontext;
 	__siglongjmp;
 	__sys_vfork;
 	_vfork;
 	_end;
-	__curbrk;
-	minbrk;
 	_brk;
 	_sbrk;
 
 	/* softfloat */
 	__addsf3;
 	__adddf3;
 	__subsf3;
 	__subdf3;
 	__mulsf3;
 	__muldf3;
 	__divsf3;
 	__divdf3;
 	__floatsisf;
 	__floatsidf;
 	__fixsfsi;
 	__fixdfsi;
 	__fixunssfsi;
 	__fixunsdfsi;
 	__extendsfdf2;
 	__truncdfsf2;
 };
Index: head/lib/libc/powerpc/Symbol.map
===================================================================
--- head/lib/libc/powerpc/Symbol.map	(revision 297237)
+++ head/lib/libc/powerpc/Symbol.map	(revision 297238)
@@ -1,62 +1,60 @@
 /*
  * $FreeBSD$
  */
 
 /*
  * This only needs to contain symbols that are not listed in
  * symbol maps from other parts of libc (i.e., not found in
  * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
  */
 FBSD_1.0 {
 	/* PSEUDO syscalls */
 	_exit;
 
 	_mcount;
 	_setjmp;
 	_longjmp;
 	fabs;
 	__flt_rounds;
 	fpgetmask;
 	fpgetround;
 	fpgetsticky;
 	fpsetmask;
 	fpsetround;
 	__infinity;
 	__nan;
 	makecontext;
 	setjmp;
 	longjmp;
 	sigsetjmp;
 	siglongjmp;
 	htonl;
 	htons;
 	ntohl;
 	ntohs;
 	brk;
 	exect;
 	sbrk;
 	vfork;
 };
 
 FBSD_1.3 {
 	__eabi;
 };
 
 FBSDprivate_1.0 {
 	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
 
 	_set_tp;
 	_fpgetsticky;
 	__makecontext;
 	__longjmp;
 	signalcontext;
 	__signalcontext;
 	__syncicache;
 	_end;
-	.curbrk;
-	.minbrk;
 	.cerror;
 };
Index: head/lib/libc/powerpc64/Symbol.map
===================================================================
--- head/lib/libc/powerpc64/Symbol.map	(revision 297237)
+++ head/lib/libc/powerpc64/Symbol.map	(revision 297238)
@@ -1,58 +1,56 @@
 /*
  * $FreeBSD$
  */
 
 /*
  * This only needs to contain symbols that are not listed in
  * symbol maps from other parts of libc (i.e., not found in
  * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
  */
 FBSD_1.0 {
 	/* PSEUDO syscalls */
 	_exit;
 
 	_mcount;
 	_setjmp;
 	_longjmp;
 	fabs;
 	__flt_rounds;
 	fpgetmask;
 	fpgetround;
 	fpgetsticky;
 	fpsetmask;
 	fpsetround;
 	__infinity;
 	__nan;
 	makecontext;
 	setjmp;
 	longjmp;
 	sigsetjmp;
 	siglongjmp;
 	htonl;
 	htons;
 	ntohl;
 	ntohs;
 	brk;
 	exect;
 	sbrk;
 	vfork;
 };
 
 FBSDprivate_1.0 {
 	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
 
 	_set_tp;
 	_fpgetsticky;
 	__makecontext;
 	__longjmp;
 	signalcontext;
 	__signalcontext;
 	__syncicache;
 	_end;
-	_curbrk;
-	_minbrk;
 	_cerror;
 };
Index: head/lib/libc/riscv/Symbol.map
===================================================================
--- head/lib/libc/riscv/Symbol.map	(revision 297237)
+++ head/lib/libc/riscv/Symbol.map	(revision 297238)
@@ -1,42 +1,40 @@
 /*
  * $FreeBSD$
  */
 
 /*
  * This only needs to contain symbols that are not listed in
  * symbol maps from other parts of libc (i.e., not found in
  * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
  */
 FBSD_1.0 {
 	/* PSEUDO syscalls */
 	_exit;
 
 	_setjmp;
 	_longjmp;
 	fabs;
 	__flt_rounds;
 	fpgetmask;
 	fpsetmask;
 	__infinity;
 	__nan;
 	setjmp;
 	longjmp;
 	sigsetjmp;
 	siglongjmp;
 	htonl;
 	htons;
 	ntohl;
 	ntohs;
 	vfork;
 	brk;
 	sbrk;
 	makecontext;
 };
 
 FBSDprivate_1.0 {
 	_set_tp;
 	_end;
-	curbrk;
-	minbrk;
 	__makecontext;
 };
Index: head/lib/libc/sparc64/Symbol.map
===================================================================
--- head/lib/libc/sparc64/Symbol.map	(revision 297237)
+++ head/lib/libc/sparc64/Symbol.map	(revision 297238)
@@ -1,98 +1,96 @@
 /*
  * $FreeBSD$
  */
 
 /*
  * This only needs to contain symbols that are not listed in
  * symbol maps from other parts of libc (i.e., not found in
  * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
  */
 FBSD_1.0 {
 	/* PSEUDO syscalls */
 	_exit;
 
 	_mcount;
 	_setjmp;
 	_longjmp;
 	fabs;
 	__flt_rounds;
 	fpgetmask;
 	fpgetround;
 	fpgetsticky;
 	fpsetmask;
 	fpsetround;
 	__infinity;
 	__nan;
 	makecontext;
 	setjmp;
 	longjmp;
 	sigsetjmp;
 	siglongjmp;
 	htonl;
 	htons;
 	ntohl;
 	ntohs;
 	brk;
 	exect;
 	sbrk;
 	vfork;
 
 	/* SCD libc 64 psABI */
 	_Qp_sqrt;
 	_Qp_add;
 	_Qp_div;
 	_Qp_mul;
 	_Qp_sub;
 	_Qp_dtoq;
 	_Qp_itoq;
 	_Qp_stoq;
 	_Qp_xtoq;
 	_Qp_uitoq;
 	_Qp_uxtoq;
 	_Qp_qtod;
 	_Qp_qtoi;
 	_Qp_qtos;
 	_Qp_qtox;
 	_Qp_qtoui;
 	_Qp_qtoux;
 	_Qp_feq;
 	_Qp_fge;
 	_Qp_fgt;
 	_Qp_fle;
 	_Qp_flt;
 	_Qp_fne;
 	_Qp_cmp;
 	_Qp_cmpe;
 	__dtoul;
 	__sparc_utrap_install;
 };
 
 FBSDprivate_1.0 {
 	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
 
 	_set_tp;
 	___longjmp;
 	__makecontext;
 	__longjmp;
 	signalcontext;
 	__signalcontext;
 	__siglongjmp;
-	.curbrk;
-	.minbrk;
 	__sys_brk;
 	_brk;
 	.cerror;
 	__sys_exect;
 	_exect;
 	_end;
 	__sys_sbrk;
 	_sbrk;
 	__sys_vfork;
 	_vfork;
 
 	/* used in src/lib/csu/sparc64/crt1.c */
 	__sparc_utrap_setup;
 };