Move _b functions into the 11.x symbol version namespace.

3 files changed, 16 insertions, 5 deletions

diff --git a/lib/libc/Versions.def b/lib/libc/Versions.def
index bbd59a4..bb36fb8 100644
--- a/lib/libc/Versions.def
+++ b/lib/libc/Versions.def
@@ -23,6 +23,11 @@ FBSD_1.2 {
 FBSD_1.3 {
 } FBSD_1.2;
 
+# This version was first added to 11.0-current.
+FBSD_1.4 {
+} FBSD_1.3;
+
+
 # This is our private namespace.  Any global interfaces that are
 # strictly for use only by other FreeBSD applications and libraries
 # are listed here.  We use a separate namespace so we can write
diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map
index 86ed5fb..77413d6 100644
--- a/lib/libc/gen/Symbol.map
+++ b/lib/libc/gen/Symbol.map
@@ -392,7 +392,6 @@ FBSD_1.3 {
 	nvis;
 	pwcache_userdb;
 	pwcache_groupdb;
-	scandir_b;
 	snvis;
 	strenvisx;
 	strnunvis;
@@ -410,6 +409,10 @@ FBSD_1.3 {
 	waitid;
 };
 
+FBSD_1.4 {
+	scandir_b;
+};
+
 FBSDprivate_1.0 {
 	/* needed by thread libraries */
 	__thr_jtable;
diff --git a/lib/libc/stdlib/Symbol.map b/lib/libc/stdlib/Symbol.map
index 9734b49..d28a8e9 100644
--- a/lib/libc/stdlib/Symbol.map
+++ b/lib/libc/stdlib/Symbol.map
@@ -86,14 +86,10 @@ FBSD_1.0 {
 
 FBSD_1.3 {
 	at_quick_exit;
-	atexit_b;
 	atof_l;
 	atoi_l;
 	atol_l;
 	atoll_l;
-	heapsort_b;
-	mergesort_b;
-	qsort_b;
 	quick_exit;
 	strtod_l;
 	strtof_l;
@@ -108,6 +104,13 @@ FBSD_1.3 {
 	strtouq_l;
 };
 
+FBSD_1.4 {
+	atexit_b;
+	heapsort_b;
+	mergesort_b;
+	qsort_b;
+};
+
 FBSDprivate_1.0 {
 	__system;
 	_system;