libsys: move __libsys_interposer consumers

These system call wrappers call interposed system calls in fairly
trivial ways.  Move them over to libsys so all __libsys_interposer
consumers end up in libsys.

Also move recvmmsg and sendmmsg as they are documented with recv and
send.

Reviewed by:	kib, emaste, imp
Pull Request:	https://github.com/freebsd/freebsd-src/pull/908
This commit is contained in:
Brooks Davis 2024-01-16 22:25:07 +00:00
parent 8f529310bd
commit 29d079c964
17 changed files with 13 additions and 17 deletions

View File

@ -2,12 +2,12 @@
# compat-43 sources # compat-43 sources
.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/compat-43 ${LIBC_SRCTOP}/compat-43 .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/compat-43 ${LIBC_SRCTOP}/compat-43
SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \ SRCS+= gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
setrgid.c setruid.c sigcompat.c setrgid.c setruid.c sigcompat.c
SYM_MAPS+=${LIBC_SRCTOP}/compat-43/Symbol.map SYM_MAPS+=${LIBC_SRCTOP}/compat-43/Symbol.map
MAN+= creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2 MAN+= killpg.2 sigpause.2 sigsetmask.2 sigvec.2
MAN+= gethostid.3 setruid.3 MAN+= gethostid.3 setruid.3
MLINKS+=gethostid.3 sethostid.3 MLINKS+=gethostid.3 sethostid.3

View File

@ -99,7 +99,6 @@ SRCS+= __getosreldate.c \
lcong48.c \ lcong48.c \
libc_dlopen.c \ libc_dlopen.c \
libc_interposing_table.c \ libc_interposing_table.c \
lockf.c \
lrand48.c \ lrand48.c \
memalign.c \ memalign.c \
memfd_create.c \ memfd_create.c \
@ -121,7 +120,6 @@ SRCS+= __getosreldate.c \
readdir.c \ readdir.c \
readdir-compat11.c \ readdir-compat11.c \
readpassphrase.c \ readpassphrase.c \
recvmmsg.c \
rewinddir.c \ rewinddir.c \
scandir.c \ scandir.c \
scandir_b.c \ scandir_b.c \
@ -131,7 +129,6 @@ SRCS+= __getosreldate.c \
seed48.c \ seed48.c \
seekdir.c \ seekdir.c \
semctl.c \ semctl.c \
sendmmsg.c \
setdomainname.c \ setdomainname.c \
sethostname.c \ sethostname.c \
setjmperr.c \ setjmperr.c \
@ -142,7 +139,6 @@ SRCS+= __getosreldate.c \
siglist.c \ siglist.c \
signal.c \ signal.c \
sigsetops.c \ sigsetops.c \
sleep.c \
srand48.c \ srand48.c \
statvfs.c \ statvfs.c \
stringlist.c \ stringlist.c \
@ -166,14 +162,9 @@ SRCS+= __getosreldate.c \
ulimit.c \ ulimit.c \
uname.c \ uname.c \
unvis-compat.c \ unvis-compat.c \
usleep.c \
utime.c \ utime.c \
utxdb.c \ utxdb.c \
valloc.c \ valloc.c \
wait.c \
wait3.c \
waitpid.c \
waitid.c \
wordexp.c wordexp.c
CFLAGS.arc4random.c= -I${SRCTOP}/sys -I${SRCTOP}/sys/crypto/chacha20 CFLAGS.arc4random.c= -I${SRCTOP}/sys -I${SRCTOP}/sys/crypto/chacha20
@ -267,7 +258,6 @@ MAN+= alarm.3 \
initgroups.3 \ initgroups.3 \
isgreater.3 \ isgreater.3 \
ldexp.3 \ ldexp.3 \
lockf.3 \
makecontext.3 \ makecontext.3 \
modf.3 \ modf.3 \
nice.3 \ nice.3 \
@ -304,7 +294,6 @@ MAN+= alarm.3 \
siginterrupt.3 \ siginterrupt.3 \
signal.3 \ signal.3 \
sigsetops.3 \ sigsetops.3 \
sleep.3 \
statvfs.3 \ statvfs.3 \
stringlist.3 \ stringlist.3 \
strtofflags.3 \ strtofflags.3 \
@ -330,7 +319,6 @@ MAN+= alarm.3 \
ulimit.3 \ ulimit.3 \
uname.3 \ uname.3 \
unvis.3 \ unvis.3 \
usleep.3 \
utime.3 \ utime.3 \
valloc.3 \ valloc.3 \
vis.3 \ vis.3 \
@ -501,7 +489,6 @@ MLINKS+=rand48.3 _rand48.3 \
rand48.3 nrand48.3 \ rand48.3 nrand48.3 \
rand48.3 seed48.3 \ rand48.3 seed48.3 \
rand48.3 srand48.3 rand48.3 srand48.3
MLINKS+=recv.2 recvmmsg.2
MLINKS+=scandir.3 alphasort.3 \ MLINKS+=scandir.3 alphasort.3 \
scandir.3 scandirat.3 \ scandir.3 scandirat.3 \
scandir.3 scandir_b.3 \ scandir.3 scandir_b.3 \
@ -510,7 +497,6 @@ MLINKS+=sem_open.3 sem_close.3 \
sem_open.3 sem_unlink.3 sem_open.3 sem_unlink.3
MLINKS+=sem_wait.3 sem_trywait.3 MLINKS+=sem_wait.3 sem_trywait.3
MLINKS+=sem_timedwait.3 sem_clockwait_np.3 MLINKS+=sem_timedwait.3 sem_clockwait_np.3
MLINKS+=send.2 sendmmsg.2
MLINKS+=setjmp.3 _longjmp.3 \ MLINKS+=setjmp.3 _longjmp.3 \
setjmp.3 _setjmp.3 \ setjmp.3 _setjmp.3 \
setjmp.3 longjmp.3 \ setjmp.3 longjmp.3 \

View File

@ -12,7 +12,7 @@ SRCS+= base64.c ether_addr.c eui64.c \
if_indextoname.c if_nameindex.c if_nametoindex.c \ if_indextoname.c if_nameindex.c if_nametoindex.c \
ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \ ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \
nsdispatch.c nslexer.l nsparser.y nss_compat.c \ nsdispatch.c nslexer.l nsparser.y nss_compat.c \
rcmd.c rcmdsh.c recv.c rthdr.c sctp_sys_calls.c send.c \ rcmd.c rcmdsh.c rthdr.c sctp_sys_calls.c \
sockatmark.c sourcefilter.c vars.c sockatmark.c sourcefilter.c vars.c
.if ${MK_NS_CACHING} != "no" .if ${MK_NS_CACHING} != "no"

View File

@ -34,6 +34,10 @@ SRCS+= \
SRCS+= getdents.c lstat.c mknod.c stat.c SRCS+= getdents.c lstat.c mknod.c stat.c
SRCS+= creat.c
SRCS+= lockf.c sleep.c usleep.c wait.c wait3.c waitpid.c waitid.c
SRCS+= recv.c recvmmsg.c send.c sendmmsg.c
NOASM+= sched_getcpu.o NOASM+= sched_getcpu.o
PSEUDO+= _sched_getcpu.o PSEUDO+= _sched_getcpu.o
@ -177,6 +181,7 @@ MAN+= abort2.2 \
cpuset.2 \ cpuset.2 \
cpuset_getaffinity.2 \ cpuset_getaffinity.2 \
cpuset_getdomain.2 \ cpuset_getdomain.2 \
creat.2 \
dup.2 \ dup.2 \
eventfd.2 \ eventfd.2 \
execve.2 \ execve.2 \
@ -356,6 +361,11 @@ MAN+= abort2.2 \
write.2 \ write.2 \
_umtx_op.2 _umtx_op.2
MAN+= \
lockf.3 \
sleep.3 \
usleep.3
MLINKS+=aio_read.2 aio_readv.2 MLINKS+=aio_read.2 aio_readv.2
MLINKS+=aio_write.2 aio_writev.2 MLINKS+=aio_write.2 aio_writev.2
MLINKS+=accept.2 accept4.2 MLINKS+=accept.2 accept4.2