c18n: Move rfork/thr_exit/vfork pseudo system calls to libsys

This adds the missing symbols to libsys, and they were not exported from libc anyway.
bsdjhb · Aug 21, 2024 · 07be96c · 07be96c
1 parent 0dd2f04
commit 07be96c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
@@ -39,11 +39,3 @@ SRCS+= \
 .if !${MACHINE_ABI:Mpurecap}
 SRCS+=	brk.c
 .endif
-
-# Pseudo implementations of functions we don't currently fully support
-.ifdef CHERI_LIB_C18N
-SRCS+= \
-	rfork_c18n.c \
-	thr_exit_c18n.c \
-	vfork_c18n.c
-.endif
diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys
@@ -104,6 +104,12 @@ INTERPOSED = \
 	writev
 
 .ifdef CHERI_LIB_C18N
+# Pseudo implementations of system calls we don't currently fully support
+SRCS+= \
+	rfork_c18n.c \
+	thr_exit_c18n.c \
+	vfork_c18n.c
+
 PSEUDO+= \
 	rfork
 NOASM+=	\

diff --git a/lib/libc/sys/rfork_c18n.c → lib/libsys/rfork_c18n.c b/lib/libc/sys/rfork_c18n.c → lib/libsys/rfork_c18n.c
diff --git a/lib/libc/sys/thr_exit_c18n.c → lib/libsys/thr_exit_c18n.c b/lib/libc/sys/thr_exit_c18n.c → lib/libsys/thr_exit_c18n.c
diff --git a/lib/libc/sys/vfork_c18n.c → lib/libsys/vfork_c18n.c b/lib/libc/sys/vfork_c18n.c → lib/libsys/vfork_c18n.c