From nobody Tue Apr 16 16:48:22 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJqjg09JSz5H9Vd; Tue, 16 Apr 2024 16:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJqjf5bVTz4Xjf; Tue, 16 Apr 2024 16:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713286102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Lh8FLNyp9Sw6+geUeT/HTDzTDbSUV7I33woEKcshwU=; b=m/2vrngvP9w/zIWZ2Ow9m8GBJ4CNTKbrhYanRgtOtAoR3CodksA25mAWig15V85JxfiRb0 vwa6klYcEcHUR+fnQyst5KABmzd33DeZwkr5rO1/T70G6AyWYRBc9lhcDXGlmfu+8OyEd5 mWr+uRoPQANFFXRCih1njGg/ZvjzGQJ0Sgsb1+Jfihks5nqYiUvkEVB9r8CWYrDlsIeaCP OXorKPkhoEi7sny19iVFl2zesBmF9Oy++96qC6y4098nPsrrPn5dRPBs1+L6bDq942HOOO PT310AJAhljQHoZ3GxQ/dwEDwPk+/OOQOcxO7sLpkEBZ3K2A9R5cXDnmM4LQmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713286102; a=rsa-sha256; cv=none; b=ZMmyIvcPrSKHhuZdvnmRVFH2HTWU+XmBMoW7UBdcnwKJ9NrOIXv1MrSB+TsmFN9s/q6Jce Bp0x0E6HXF+pL62QHihz+HW7mQ0IqjSKrj54LkVLFsElUmhQzYD6j1bBhe6lg3fBUunHOd C7AHbvpqtlFxp5cTC6aLJ/pbP2wMTBsbS/at337rCLjc2GWx18I7qg9X5Pg4mkLi9pc+BH s4POwNIf13sNvLute0qVtoUv0JnskXF8FigOKwKdQACFC2QzvhPbvWQ3uHK8s0aVXENs2y xLhJPccRlL6SFgpS/BUzRdRtFP3pIeTrwuFqOTzqdNeagV6eMrwBhQylEn2Mcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713286102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Lh8FLNyp9Sw6+geUeT/HTDzTDbSUV7I33woEKcshwU=; b=PBwTcagFgHAs6VEzctiIP+1x7MwuqgjITTPsJevCqOpPFdcu6ysYZEzoVVvoIOmDY9o4m2 uah/kr91oToyNL4KOZtB8SUEwhguQGJhGDgIbMkWvDB5GbqRFR9hl5hKCAYm/IsIi6m6Q9 p8rCC2gNSYFiAw2mlQSntV9gL6khPRe3O3Zb172EuMcwOEC9DuBaLu9FaA6YGxf3TFeUZD s7++AlGin7qChXSgMGXQJTtAH2A1ZDVMymQi+2EeM26vw5MfXFOWffcGdeIGnM2WQIXNZY 5pjz3xJol+umMC78upQXmqXGe2cUMr6bULsToIKZPW2fnYv2rr1Wq61SMFGJRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJqjf5CQXzqjx; Tue, 16 Apr 2024 16:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GGmMgF080021; Tue, 16 Apr 2024 16:48:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GGmMAt080018; Tue, 16 Apr 2024 16:48:22 GMT (envelope-from git) Date: Tue, 16 Apr 2024 16:48:22 GMT Message-Id: <202404161648.43GGmMAt080018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 792081a7300e - main - lib{c,rt}: use libsys.h for __sys_* declerations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 792081a7300ecf368a1cf6a2f8ddb198d86abe55 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=792081a7300ecf368a1cf6a2f8ddb198d86abe55 commit 792081a7300ecf368a1cf6a2f8ddb198d86abe55 Author: Brooks Davis AuthorDate: 2024-04-16 16:48:07 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 16:48:07 +0000 lib{c,rt}: use libsys.h for __sys_* declerations Use the genreated source of truth for system call declerations. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44388 --- lib/libc/include/libc_private.h | 79 ++--------------------------------------- lib/librt/mq.c | 12 ------- 2 files changed, 2 insertions(+), 89 deletions(-) diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h index 629889a6ff17..b38603b59a88 100644 --- a/lib/libc/include/libc_private.h +++ b/lib/libc/include/libc_private.h @@ -37,6 +37,8 @@ #include #include +#include + extern char **environ; /* @@ -334,79 +336,6 @@ struct __siginfo; struct __ucontext; struct __wrusage; enum idtype; -int __sys_aio_suspend(const struct aiocb * const[], int, - const struct timespec *); -int __sys_accept(int, struct sockaddr *, __socklen_t *); -int __sys_accept4(int, struct sockaddr *, __socklen_t *, int); -int __sys_clock_gettime(__clockid_t, struct timespec *ts); -int __sys_clock_nanosleep(__clockid_t, int, - const struct timespec *, struct timespec *); -int __sys_close(int); -int __sys_close_range(unsigned, unsigned, int); -int __sys_connect(int, const struct sockaddr *, __socklen_t); -int __sys_fcntl(int, int, __intptr_t); -int __sys_fdatasync(int); -int __sys_fstat(int fd, struct stat *); -int __sys_fstatfs(int fd, struct statfs *); -int __sys_fstatat(int, const char *, struct stat *, int); -int __sys_fsync(int); -__pid_t __sys_fork(void); -int __sys_ftruncate(int, __off_t); -__ssize_t __sys_getdirentries(int, char *, __size_t, __off_t *); -int __sys_getfsstat(struct statfs *, long, int); -int __sys_gettimeofday(struct timeval *, struct timezone *); -int __sys_kevent(int, const struct kevent *, int, struct kevent *, - int, const struct timespec *); -__off_t __sys_lseek(int, __off_t, int); -void *__sys_mmap(void *, __size_t, int, int, int, __off_t); -int __sys_msync(void *, __size_t, int); -int __sys_nanosleep(const struct timespec *, struct timespec *); -int __sys_open(const char *, int, ...); -int __sys_openat(int, const char *, int, ...); -int __sys_pdfork(int *, int); -int __sys_pselect(int, struct fd_set *, struct fd_set *, - struct fd_set *, const struct timespec *, - const __sigset_t *); -int __sys_ptrace(int, __pid_t, char *, int); -int __sys_poll(struct pollfd *, unsigned, int); -int __sys_ppoll(struct pollfd *, unsigned, const struct timespec *, - const __sigset_t *); -__ssize_t __sys_pread(int, void *, __size_t, __off_t); -__ssize_t __sys_pwrite(int, const void *, __size_t, __off_t); -__ssize_t __sys_read(int, void *, __size_t); -__ssize_t __sys_readv(int, const struct iovec *, int); -__ssize_t __sys_recv(int, void *, __size_t, int); -__ssize_t __sys_recvfrom(int, void *, __size_t, int, struct sockaddr *, - __socklen_t *); -__ssize_t __sys_recvmsg(int, struct msghdr *, int); -int __sys_sched_getcpu(void); -int __sys_select(int, struct fd_set *, struct fd_set *, - struct fd_set *, struct timeval *); -__ssize_t __sys_sendmsg(int, const struct msghdr *, int); -__ssize_t __sys_sendto(int, const void *, __size_t, int, - const struct sockaddr *, __socklen_t); -int __sys_setcontext(const struct __ucontext *); -int __sys_sigaction(int, const struct sigaction *, - struct sigaction *); -int __sys_sigprocmask(int, const __sigset_t *, __sigset_t *); -int __sys_sigsuspend(const __sigset_t *); -int __sys_sigtimedwait(const __sigset_t *, struct __siginfo *, - const struct timespec *); -int __sys_sigwait(const __sigset_t *, int *); -int __sys_sigwaitinfo(const __sigset_t *, struct __siginfo *); -int __sys___specialfd(int, const void *, __size_t); -int __sys_statfs(const char *, struct statfs *); -int __sys_swapcontext(struct __ucontext *, - const struct __ucontext *); -int __sys_thr_kill(long, int); -int __sys_thr_self(long *); -int __sys_truncate(const char *, __off_t); -__pid_t __sys_wait4(__pid_t, int *, int, struct rusage *); -__pid_t __sys_wait6(enum idtype, __id_t, int *, int, - struct __wrusage *, struct __siginfo *); -__ssize_t __sys_write(int, const void *, __size_t); -__ssize_t __sys_writev(int, const struct iovec *, int); -int __sys_shm_open2(const char *, int, __mode_t, int, const char *); int __libc_sigaction(int, const struct sigaction *, struct sigaction *) __hidden; @@ -417,10 +346,6 @@ int __libsys_sigwait(const __sigset_t *, int *) __hidden; int __libc_system(const char *); int __libc_tcdrain(int); -int __sys_futimens(int fd, const struct timespec *times) __hidden; -int __sys_utimensat(int fd, const char *path, - const struct timespec *times, int flag) __hidden; - int _elf_aux_info(int aux, void *buf, int buflen); struct dl_phdr_info; int __elf_phdr_match_addr(struct dl_phdr_info *, void *); diff --git a/lib/librt/mq.c b/lib/librt/mq.c index 89387b136792..eba52f76c928 100644 --- a/lib/librt/mq.c +++ b/lib/librt/mq.c @@ -40,18 +40,6 @@ #include "un-namespace.h" #include "libc_private.h" -extern int __sys_kmq_notify(int, const struct sigevent *); -extern int __sys_kmq_open(const char *, int, mode_t, - const struct mq_attr *); -extern int __sys_kmq_setattr(int, const struct mq_attr *__restrict, - struct mq_attr *__restrict); -extern ssize_t __sys_kmq_timedreceive(int, char *__restrict, size_t, - unsigned *__restrict, const struct timespec *__restrict); -extern int __sys_kmq_timedsend(int, const char *, size_t, unsigned, - const struct timespec *); -extern int __sys_kmq_unlink(const char *); -extern int __sys_close(int fd); - struct __mq { int oshandle; struct sigev_node *node;