The branch main has been updated by brooks:
URL:
https://cgit.FreeBSD.org/src/commit/?id=cdecda8da32b67f2be34a4d2ea37f90986a45a00
commit cdecda8da32b67f2be34a4d2ea37f90986a45a00
Author: Brooks Davis <bro...@freebsd.org>
AuthorDate: 2023-11-15 21:44:43 +0000
Commit: Brooks Davis <bro...@freebsd.org>
CommitDate: 2024-02-05 20:34:56 +0000
libc: move rfork_thread(3) to libsys
rfork_thread(3) is assembly that makes syscalls directly and uses
cerror so it belongs in libsys.
Reviewed by: kib, emaste, imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/908
---
lib/libc/amd64/gen/Makefile.inc | 2 +-
lib/libc/gen/Makefile.inc | 1 -
lib/libc/i386/gen/Makefile.inc | 2 +-
lib/libsys/Makefile.sys | 1 +
lib/libsys/amd64/Makefile.sys | 3 ++-
lib/{libc/amd64/gen => libsys/amd64}/rfork_thread.S | 0
lib/libsys/i386/Makefile.sys | 3 ++-
lib/{libc/i386/gen => libsys/i386}/rfork_thread.S | 0
lib/{libc/gen => libsys}/rfork_thread.3 | 0
9 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/lib/libc/amd64/gen/Makefile.inc b/lib/libc/amd64/gen/Makefile.inc
index 8175a99c8c8a..583418c4620e 100644
--- a/lib/libc/amd64/gen/Makefile.inc
+++ b/lib/libc/amd64/gen/Makefile.inc
@@ -1,5 +1,5 @@
-SRCS+= _setjmp.S rfork_thread.S setjmp.S sigsetjmp.S \
+SRCS+= _setjmp.S setjmp.S sigsetjmp.S \
fabs.S \
infinity.c ldexp.c makecontext.c signalcontext.c \
flt_rounds.c fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index b7eb92090722..9eeab36f7d00 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -279,7 +279,6 @@ MAN+= alarm.3 \
raise.3 \
rand48.3 \
readpassphrase.3 \
- rfork_thread.3 \
scandir.3 \
sem_destroy.3 \
sem_getvalue.3 \
diff --git a/lib/libc/i386/gen/Makefile.inc b/lib/libc/i386/gen/Makefile.inc
index b4c5306ed1ce..1c4eb2a9981f 100644
--- a/lib/libc/i386/gen/Makefile.inc
+++ b/lib/libc/i386/gen/Makefile.inc
@@ -1,4 +1,4 @@
SRCS+= _ctx_start.S _setjmp.S fabs.S \
flt_rounds.c infinity.c ldexp.c makecontext.c \
- rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S
+ setjmp.S signalcontext.c sigsetjmp.S
diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys
index 7600c9ef2aae..880b0f7f08ed 100644
--- a/lib/libsys/Makefile.sys
+++ b/lib/libsys/Makefile.sys
@@ -365,6 +365,7 @@ MAN+= abort2.2 \
MAN+= \
lockf.3 \
+ rfork_thread.3 \
sleep.3 \
usleep.3
diff --git a/lib/libsys/amd64/Makefile.sys b/lib/libsys/amd64/Makefile.sys
index d4a767c90a5f..09947d998480 100644
--- a/lib/libsys/amd64/Makefile.sys
+++ b/lib/libsys/amd64/Makefile.sys
@@ -2,6 +2,7 @@ SRCS+= \
amd64_get_fsbase.c \
amd64_get_gsbase.c \
amd64_set_fsbase.c \
- amd64_set_gsbase.c
+ amd64_set_gsbase.c \
+ rfork_thread.S
MDASM= vfork.S cerror.S getcontext.S
diff --git a/lib/libc/amd64/gen/rfork_thread.S b/lib/libsys/amd64/rfork_thread.S
similarity index 100%
rename from lib/libc/amd64/gen/rfork_thread.S
rename to lib/libsys/amd64/rfork_thread.S
diff --git a/lib/libsys/i386/Makefile.sys b/lib/libsys/i386/Makefile.sys
index bbc3497aa5a5..f42c5f7ec0ef 100644
--- a/lib/libsys/i386/Makefile.sys
+++ b/lib/libsys/i386/Makefile.sys
@@ -1,6 +1,7 @@
SRCS+= i386_get_fsbase.c i386_get_gsbase.c i386_get_ioperm.c i386_get_ldt.c \
i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c \
- i386_clr_watch.c i386_set_watch.c i386_vm86.c
+ i386_clr_watch.c i386_set_watch.c i386_vm86.c \
+ rfork_thread.S
MDASM= vfork.S cerror.S getcontext.S syscall.S
diff --git a/lib/libc/i386/gen/rfork_thread.S b/lib/libsys/i386/rfork_thread.S
similarity index 100%
rename from lib/libc/i386/gen/rfork_thread.S
rename to lib/libsys/i386/rfork_thread.S
diff --git a/lib/libc/gen/rfork_thread.3 b/lib/libsys/rfork_thread.3
similarity index 100%
rename from lib/libc/gen/rfork_thread.3
rename to lib/libsys/rfork_thread.3
