From 6e83504c603157e9fc1660d2a1556036492662fc Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 19 Apr 2024 22:21:46 +0100
Subject: [PATCH] Revert "lib{c,sys}: normalize export of openat, setcontext,
 and swapcontext"

I put the symbols in the wrong file (should have been
lib/libc/sys/Symbol.map), added a duplicate pdfork entry due to a botch
rebase, and there seems to be a issue with gcc13/binutils not exposing
the symbols so revert the whole thing while I debug.

This reverts commit ee632fb9eb4a060a4087a7f5425bfe36e65cda61.
---
 lib/libc/sys/openat.c      | 1 +
 lib/libc/sys/setcontext.c  | 1 +
 lib/libc/sys/swapcontext.c | 1 +
 lib/libsys/Symbol.sys.map  | 4 ----
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/libc/sys/openat.c b/lib/libc/sys/openat.c
index 389360a5a9f5..1cd8e7d90745 100644
--- a/lib/libc/sys/openat.c
+++ b/lib/libc/sys/openat.c
@@ -37,6 +37,7 @@
 __weak_reference(__sys_openat, __openat);
 __sym_compat(openat, __impl_openat, FBSD_1.1);
 __weak_reference(openat, __impl_openat);
+__sym_default(openat, openat, FBSD_1.2);
 
 #pragma weak openat
 int
diff --git a/lib/libc/sys/setcontext.c b/lib/libc/sys/setcontext.c
index 301cca84c4f9..96b5dc115067 100644
--- a/lib/libc/sys/setcontext.c
+++ b/lib/libc/sys/setcontext.c
@@ -36,6 +36,7 @@
 __weak_reference(__sys_setcontext, __setcontext);
 __sym_compat(setcontext, __impl_setcontext, FBSD_1.0);
 __weak_reference(setcontext, __impl_setcontext);
+__sym_default(setcontext, setcontext, FBSD_1.2);
 
 #pragma weak setcontext
 int
diff --git a/lib/libc/sys/swapcontext.c b/lib/libc/sys/swapcontext.c
index 42793a516c70..b69a5b19e698 100644
--- a/lib/libc/sys/swapcontext.c
+++ b/lib/libc/sys/swapcontext.c
@@ -38,6 +38,7 @@
 __weak_reference(__sys_swapcontext, __swapcontext);
 __sym_compat(swapcontext, __impl_swapcontext, FBSD_1.0);
 __weak_reference(swapcontext, __impl_swapcontext);
+__sym_default(swapcontext, swapcontext, FBSD_1.2);
 
 #pragma weak swapcontext
 int
diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map
index 359570c413a4..822c007d32f1 100644
--- a/lib/libsys/Symbol.sys.map
+++ b/lib/libsys/Symbol.sys.map
@@ -301,8 +301,6 @@ FBSD_1.2 {
 	cap_getmode;
 	getloginclass;
 	getpagesizes;
-	openat;
-	pdfork;
 	pdgetpid;
 	pdkill;
 	posix_fallocate;
@@ -311,9 +309,7 @@ FBSD_1.2 {
 	rctl_get_limits;
 	rctl_add_rule;
 	rctl_remove_rule;
-	setcontext;
 	setloginclass;
-	swapcontext;
 };
 
 FBSD_1.3 {