From e2417a21a02562655d760005e9827f1190bb652f Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 11 Jan 2024 18:27:20 +0000
Subject: [PATCH] libc: separate syscall and non-syscall symbols

Put declerations of _ and __sys_ prefixed stubs at the top and
everything else at the bottom.  Sort the bottom list with sort(1).
This paves the way to generate the syscall symbol list.

Reviewed by:	kib
Sponsored by:	DARPA
Differential Revision:	https://reviews.freebsd.org/D43386
---
 lib/libc/sys/Symbol.map | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map
index f17aae279b8d..a2b8c2d40fc1 100644
--- a/lib/libc/sys/Symbol.map
+++ b/lib/libc/sys/Symbol.map
@@ -425,6 +425,7 @@ FBSD_1.7 {
 };
 
 FBSDprivate_1.0 {
+	/* System call stubs */
 	___acl_aclcheck_fd;
 	__sys___acl_aclcheck_fd;
 	___acl_aclcheck_file;
@@ -536,8 +537,12 @@ FBSDprivate_1.0 {
 	__sys_connect;
 	_cpuset;
 	__sys_cpuset;
+	_cpuset_getdomain;
+	__sys_cpuset_getdomain;
 	_cpuset_getid;
 	__sys_cpuset_getid;
+	_cpuset_setdomain;
+	__sys_cpuset_setdomain;
 	_cpuset_setid;
 	__sys_cpuset_setid;
 	_cpuset_getaffinity;
@@ -966,7 +971,6 @@ FBSDprivate_1.0 {
 	_sigtimedwait;
 	__sys_sigtimedwait;
 	_sigwait;
-	__sigwait;
 	__sys_sigwait;
 	_sigwaitinfo;
 	__sys_sigwaitinfo;
@@ -1040,14 +1044,13 @@ FBSDprivate_1.0 {
 	__sys_write;
 	_writev;
 	__sys_writev;
-	__set_error_selector;
-	nlm_syscall;
-	gssd_syscall;
+
+	/* Things that aren't system calls (in sort(1) order) */
 	__libc_interposing_slot;
 	__libc_sigwait;
-	_cpuset_getdomain;
-	__sys_cpuset_getdomain;
-	_cpuset_setdomain;
-	__sys_cpuset_setdomain;
+	__set_error_selector;
+	__sigwait;
+	gssd_syscall;
+	nlm_syscall;
 	rpctls_syscall;
 };