klibc - Oct 2024 - [klibc:master] syscalls: Make more system calls non-optional

Commit-ID:  b5150ef7380cfd613b3480b8e772840fc04e722b
Gitweb:    
http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=b5150ef7380cfd613b3480b8e772840fc04e722b
Author:     Ben Hutchings <ben at decadent.org.uk>
AuthorDate: Tue, 1 Oct 2024 20:42:31 +0200
Committer:  Ben Hutchings <ben at decadent.org.uk>
CommitDate: Wed, 2 Oct 2024 02:07:27 +0200

[klibc] syscalls: Make more system calls non-optional

Currently many system calls are marked as optional in SYSCALLS.def,
but should be defined on all architectures.  Make them non-optional.

Signed-off-by: Ben Hutchings <ben at decadent.org.uk>

---
 usr/klibc/SYSCALLS.def | 34 +++++++++++++++++-----------------
 usr/klibc/openat.c     |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def
index e0f8895b..bbf39c0e 100644
--- a/usr/klibc/SYSCALLS.def
+++ b/usr/klibc/SYSCALLS.def
@@ -54,8 +54,8 @@ int execve(const char *, char * const *, char * const *);
 int setpriority(int, int, int);
 int getrusage(int, struct rusage *);
 int sched_setscheduler(pid_t, int, const struct sched_param *);
-<?> int sched_setaffinity(pid_t, unsigned int, unsigned long *);
-<?> int sched_getaffinity(pid_t, unsigned int, unsigned long *);
+int sched_setaffinity(pid_t, unsigned int, unsigned long *);
+int sched_getaffinity(pid_t, unsigned int, unsigned long *);
 int sched_yield();
 <i386> int prctl at varadic(int, unsigned long, unsigned long, unsigned
long, unsigned long);
 <!i386> int prctl(int, unsigned long, unsigned long, unsigned long,
unsigned long);
@@ -93,7 +93,7 @@ int capset(cap_user_header_t, cap_user_data_t);
 int mount(const char *, const char *, const char *, unsigned long, const void
*);
 <!alpha> int umount2(const char *, int);
 <alpha> int umount::umount2(const char *, int);
-<?> int pivot_root(const char *, const char *);
+int pivot_root(const char *, const char *);
 int sync();
 #ifdef __NR_statfs64
 int statfs64::__statfs64(const char *, size_t, struct statfs *);
@@ -114,48 +114,48 @@ int swapoff(const char *);
 <?> int access(const char *, int);
 int faccessat(int, const char *, int, int);
 <?> int link(const char *, const char *);
-<?> int linkat(int, const char *, int, const char *, int);
+int linkat(int, const char *, int, const char *, int);
 <?> int unlink(const char *);
-<?> int unlinkat(int, const char *, int);
+int unlinkat(int, const char *, int);
 int chdir(const char *);
 int fchdir(int);
 <?> int rename(const char *, const char *);
 <?> int renameat(int, const char *, int, const char *);
-<?> int renameat2(int, const char *, int, const char *, unsigned int);
+int renameat2(int, const char *, int, const char *, unsigned int);
 <?> int mknod(const char *, mode_t, dev_t);
-<?> int mknodat(int, const char *, mode_t, dev_t);
+int mknodat(int, const char *, mode_t, dev_t);
 <?> int chmod(const char *, mode_t);
 int fchmod(int, mode_t);
-<?> int fchmodat(int, const char *, mode_t, int);
+int fchmodat(int, const char *, mode_t, int);
 <?> int mkdir(const char *, mode_t);
-<?> int mkdirat(int, const char *, mode_t);
+int mkdirat(int, const char *, mode_t);
 <?> int rmdir(const char *);
 <?!alpha,mips,mips64,sh,sparc,sparc64> int pipe(int *);
 int pipe2(int *, int);
 mode_t umask(mode_t);
 int chroot(const char *);
 <?> int symlink(const char *, const char *);
-<?> int symlinkat(const char *, int, const char *);
+int symlinkat(const char *, int, const char *);
 <?> int readlink(const char *, char *, size_t);
-<?> int readlinkat(int, const char *, char *, int);
+int readlinkat(int, const char *, char *, int);
 int statx(int, const char *, int, unsigned int, struct statx *);
 int getdents64,getdents::getdents(unsigned int, struct dirent *, unsigned int);
 <?> int chown32,chown::chown(const char *, uid_t, gid_t);
 int fchown32,fchown::fchown(int, uid_t, gid_t);
-<?> int fchownat(int, const char *, uid_t, gid_t, int);
+int fchownat(int, const char *, uid_t, gid_t, int);
 <?> int lchown32,lchown::lchown(const char *, uid_t, gid_t);
 int getcwd::__getcwd(char *, size_t);
 <32> int utimensat_time64::utimensat(int, const char *, const struct
timespec *, int);
 <64> int utimensat(int, const char *, const struct timespec *, int);
 <?> int inotify_init();
-<?> int inotify_add_watch(int, const char *, __u32);
-<?> int inotify_rm_watch(int, __u32);
+int inotify_add_watch(int, const char *, __u32);
+int inotify_rm_watch(int, __u32);
 
 /*
  * I/O operations
  */
 <!i386,m68k,64> int open::__open(const char *, int, mode_t);
-<?!i386,m68k,64> int openat::__openat(int, const char *, int, mode_t);
+<!i386,m68k,64> int openat::__openat(int, const char *, int, mode_t);
 <?64> int open(const char *, int, mode_t);
 <64> int openat(int, const char *, int, mode_t);
 ssize_t read(int, void *, size_t);
@@ -186,8 +186,8 @@ int ftruncate64,ftruncate::ftruncate(int, off_t);
 <!parisc> ssize_t pread64,pread::pread(int, void *, size_t, off_t);
 <!parisc> ssize_t pwrite64,pwrite::pwrite(int, void *, size_t, off_t);
 int sync_file_range,fdatasync,fsync::sync_file_range(int, off_t, off_t,
unsigned int);
-<?> int splice(int, off_t *, int, off_t *, size_t, unsigned int);
-<?> int tee(int, int, size_t, unsigned int);
+int splice(int, off_t *, int, off_t *, size_t, unsigned int);
+int tee(int, int, size_t, unsigned int);
 ssize_t sendfile64,sendfile::sendfile(int, int, off_t *, size_t, off_t);
 
 /*
diff --git a/usr/klibc/openat.c b/usr/klibc/openat.c
index 8e5baa0c..59161ac7 100644
--- a/usr/klibc/openat.c
+++ b/usr/klibc/openat.c
@@ -10,7 +10,7 @@
 #include <fcntl.h>
 #include <bitsize.h>
 
-#if _BITSIZE == 32 && !defined(__i386__) && !defined(__m68k__)
&& defined(__NR_openat)
+#if _BITSIZE == 32 && !defined(__i386__) && !defined(__m68k__)
 
 extern int __openat(int, const char *, int, mode_t);