tools/nolibc: rename sys_foo() functions to _sys_foo()

The sys_foo() naming scheme used by the syscall wrappers may collide
with application symbols. Especially as 'sys_' is an obvious naming
scheme an application may choose for its own custom systemcall wrappers.

Avoid these conflicts by using an leading underscore which moves the
names into the implementation's namespace. This naming scheme was chosen
over a '__nolibc_' prefix, as these functions are not an implementation
detail but a documented interface meant to be used by applications.

While this may break some existing users, adapting them should be
straightforward. Given that nolibc is most-likely vendored, no
unexpected breakage should happen. No in-tree users are affected.

These conflicts happen when compiling some of the kernel selftests
with nolibc.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://patch.msgid.link/20260319-nolibc-namespacing-v1-1-33c22eaddb5e@weissschuh.net

27 files changed, 192 insertions, 192 deletions

diff --git a/tools/include/nolibc/arch-s390.h b/tools/include/nolibc/arch-s390.h
index d301b636e083..4e69123ae484 100644
--- a/tools/include/nolibc/arch-s390.h
+++ b/tools/include/nolibc/arch-s390.h
@@ -167,8 +167,8 @@ struct s390_mmap_arg_struct {
 };
 
 static __attribute__((unused))
-void *sys_mmap(void *addr, size_t length, int prot, int flags, int fd,
-	       off_t offset)
+void *_sys_mmap(void *addr, size_t length, int prot, int flags, int fd,
+		off_t offset)
 {
 	struct s390_mmap_arg_struct args = {
 		.addr = (unsigned long)addr,
@@ -181,20 +181,20 @@ void *sys_mmap(void *addr, size_t length, int prot, int flags, int fd,
 
 	return (void *)__nolibc_syscall1(__NR_mmap, &args);
 }
-#define sys_mmap sys_mmap
+#define _sys_mmap _sys_mmap
 
 static __attribute__((unused))
-pid_t sys_fork(void)
+pid_t _sys_fork(void)
 {
 	return __nolibc_syscall5(__NR_clone, 0, SIGCHLD, 0, 0, 0);
 }
-#define sys_fork sys_fork
+#define _sys_fork _sys_fork
 
 static __attribute__((unused))
-pid_t sys_vfork(void)
+pid_t _sys_vfork(void)
 {
 	return __nolibc_syscall5(__NR_clone, 0, CLONE_VM | CLONE_VFORK | SIGCHLD, 0, 0, 0);
 }
-#define sys_vfork sys_vfork
+#define _sys_vfork _sys_vfork
 
 #endif /* _NOLIBC_ARCH_S390_H */
diff --git a/tools/include/nolibc/arch-sparc.h b/tools/include/nolibc/arch-sparc.h
index 02aca6579cb2..240539d069a8 100644
--- a/tools/include/nolibc/arch-sparc.h
+++ b/tools/include/nolibc/arch-sparc.h
@@ -175,7 +175,7 @@ void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _s
 static pid_t getpid(void);
 
 static __attribute__((unused))
-pid_t sys_fork(void)
+pid_t _sys_fork(void)
 {
 	pid_t parent, ret;
 
@@ -188,10 +188,10 @@ pid_t sys_fork(void)
 	else
 		return ret;
 }
-#define sys_fork sys_fork
+#define _sys_fork _sys_fork
 
 static __attribute__((unused))
-pid_t sys_vfork(void)
+pid_t _sys_vfork(void)
 {
 	pid_t parent, ret;
 
@@ -204,6 +204,6 @@ pid_t sys_vfork(void)
 	else
 		return ret;
 }
-#define sys_vfork sys_vfork
+#define _sys_vfork _sys_vfork
 
 #endif /* _NOLIBC_ARCH_SPARC_H */
diff --git a/tools/include/nolibc/dirent.h b/tools/include/nolibc/dirent.h
index 61a122a60327..4e02ef25e72d 100644
--- a/tools/include/nolibc/dirent.h
+++ b/tools/include/nolibc/dirent.h
@@ -73,7 +73,7 @@ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
 
 	fd = ~i;
 
-	ret = sys_getdents64(fd, ldir, sizeof(buf));
+	ret = _sys_getdents64(fd, ldir, sizeof(buf));
 	if (ret < 0)
 		return -ret;
 	if (ret == 0) {
@@ -86,7 +86,7 @@ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
 	 * readdir() can only return one entry at a time.
 	 * Make sure the non-returned ones are not skipped.
 	 */
-	ret = sys_lseek(fd, ldir->d_off, SEEK_SET);
+	ret = _sys_lseek(fd, ldir->d_off, SEEK_SET);
 	if (ret < 0)
 		return -ret;
 
diff --git a/tools/include/nolibc/fcntl.h b/tools/include/nolibc/fcntl.h
index 8d82768dea9d..ed2f5553c65a 100644
--- a/tools/include/nolibc/fcntl.h
+++ b/tools/include/nolibc/fcntl.h
@@ -19,7 +19,7 @@
  */
 
 static __attribute__((unused))
-int sys_openat(int dirfd, const char *path, int flags, mode_t mode)
+int _sys_openat(int dirfd, const char *path, int flags, mode_t mode)
 {
 	return __nolibc_syscall4(__NR_openat, dirfd, path, flags, mode);
 }
@@ -37,7 +37,7 @@ int openat(int dirfd, const char *path, int flags, ...)
 		va_end(args);
 	}
 
-	return __sysret(sys_openat(dirfd, path, flags, mode));
+	return __sysret(_sys_openat(dirfd, path, flags, mode));
 }
 
 /*
@@ -45,7 +45,7 @@ int openat(int dirfd, const char *path, int flags, ...)
  */
 
 static __attribute__((unused))
-int sys_open(const char *path, int flags, mode_t mode)
+int _sys_open(const char *path, int flags, mode_t mode)
 {
 	return __nolibc_syscall4(__NR_openat, AT_FDCWD, path, flags, mode);
 }
@@ -63,7 +63,7 @@ int open(const char *path, int flags, ...)
 		va_end(args);
 	}
 
-	return __sysret(sys_open(path, flags, mode));
+	return __sysret(_sys_open(path, flags, mode));
 }
 
 #endif /* _NOLIBC_FCNTL_H */
diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h
index fe8195483b6d..294bac1b9039 100644
--- a/tools/include/nolibc/nolibc.h
+++ b/tools/include/nolibc/nolibc.h
@@ -19,17 +19,17 @@
  *     a pointer or the negated errno value.
  *
  *   - The second level is mostly architecture-independent. It is made of
- *     static functions called sys_<name>() which rely on __nolibc_syscallN()
+ *     static functions called _sys_<name>() which rely on __nolibc_syscallN()
  *     depending on the syscall definition. These functions are responsible
  *     for exposing the appropriate types for the syscall arguments (int,
  *     pointers, etc) and for setting the appropriate return type (often int).
  *     A few of them are architecture-specific because the syscalls are not all
  *     mapped exactly the same among architectures. For example, some archs do
- *     not implement select() and need pselect6() instead, so the sys_select()
+ *     not implement select() and need pselect6() instead, so the _sys_select()
  *     function will have to abstract this.
  *
  *   - The third level is the libc call definition. It exposes the lower raw
- *     sys_<name>() calls in a way that looks like what a libc usually does,
+ *     _sys_<name>() calls in a way that looks like what a libc usually does,
  *     takes care of specific input values, and of setting errno upon error.
  *     There can be minor variations compared to standard libc calls.
  *
diff --git a/tools/include/nolibc/poll.h b/tools/include/nolibc/poll.h
index ea5a6d08c43c..dbcf883da237 100644
--- a/tools/include/nolibc/poll.h
+++ b/tools/include/nolibc/poll.h
@@ -21,7 +21,7 @@
  */
 
 static __attribute__((unused))
-int sys_poll(struct pollfd *fds, int nfds, int timeout)
+int _sys_poll(struct pollfd *fds, int nfds, int timeout)
 {
 #if defined(__NR_ppoll_time64)
 	struct __kernel_timespec t;
@@ -45,7 +45,7 @@ int sys_poll(struct pollfd *fds, int nfds, int timeout)
 static __attribute__((unused))
 int poll(struct pollfd *fds, int nfds, int timeout)
 {
-	return __sysret(sys_poll(fds, nfds, timeout));
+	return __sysret(_sys_poll(fds, nfds, timeout));
 }
 
 #endif /* _NOLIBC_POLL_H */
diff --git a/tools/include/nolibc/sched.h b/tools/include/nolibc/sched.h
index b1af7fa6672d..7a5f6d9484c8 100644
--- a/tools/include/nolibc/sched.h
+++ b/tools/include/nolibc/sched.h
@@ -19,7 +19,7 @@
  */
 
 static __attribute__((unused))
-int sys_setns(int fd, int nstype)
+int _sys_setns(int fd, int nstype)
 {
 	return __nolibc_syscall2(__NR_setns, fd, nstype);
 }
@@ -27,7 +27,7 @@ int sys_setns(int fd, int nstype)
 static __attribute__((unused))
 int setns(int fd, int nstype)
 {
-	return __sysret(sys_setns(fd, nstype));
+	return __sysret(_sys_setns(fd, nstype));
 }
 
 
@@ -36,7 +36,7 @@ int setns(int fd, int nstype)
  */
 
 static __attribute__((unused))
-int sys_unshare(int flags)
+int _sys_unshare(int flags)
 {
 	return __nolibc_syscall1(__NR_unshare, flags);
 }
@@ -44,7 +44,7 @@ int sys_unshare(int flags)
 static __attribute__((unused))
 int unshare(int flags)
 {
-	return __sysret(sys_unshare(flags));
+	return __sysret(_sys_unshare(flags));
 }
 
 #endif /* _NOLIBC_SCHED_H */
diff --git a/tools/include/nolibc/signal.h b/tools/include/nolibc/signal.h
index ac13e53ac31d..99a0489fe3e8 100644
--- a/tools/include/nolibc/signal.h
+++ b/tools/include/nolibc/signal.h
@@ -20,7 +20,7 @@ int raise(int signal);
 __attribute__((weak,unused,section(".text.nolibc_raise")))
 int raise(int signal)
 {
-	return sys_kill(sys_getpid(), signal);
+	return _sys_kill(_sys_getpid(), signal);
 }
 
 #endif /* _NOLIBC_SIGNAL_H */
diff --git a/tools/include/nolibc/stdlib.h b/tools/include/nolibc/stdlib.h
index 73b6a771a9f4..2113a8e7695d 100644
--- a/tools/include/nolibc/stdlib.h
+++ b/tools/include/nolibc/stdlib.h
@@ -55,7 +55,7 @@ void abort(void);
 __attribute__((weak,unused,noreturn,section(".text.nolibc_abort")))
 void abort(void)
 {
-	sys_kill(sys_getpid(), SIGABRT);
+	_sys_kill(_sys_getpid(), SIGABRT);
 	for (;;);
 }
 
diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h
index bc1c76cb2f63..6335fd51f07f 100644
--- a/tools/include/nolibc/sys.h
+++ b/tools/include/nolibc/sys.h
@@ -63,7 +63,7 @@ static __inline__ int __nolibc_enosys(const char *syscall, ...)
  *   - the "internal" ones, which matches the raw syscall interface at the
  *     kernel level, which may sometimes slightly differ from the documented
  *     libc-level ones. For example most of them return either a valid value
- *     or -errno. All of these are prefixed with "sys_". They may be called
+ *     or -errno. All of these are prefixed with "_sys_". They may be called
  *     by non-portable applications if desired.
  *
  *   - the "exported" ones, whose interface must closely match the one
@@ -85,7 +85,7 @@ static __inline__ int __nolibc_enosys(const char *syscall, ...)
  */
 
 static __attribute__((unused))
-void *sys_brk(void *addr)
+void *_sys_brk(void *addr)
 {
 	return (void *)__nolibc_syscall1(__NR_brk, addr);
 }
@@ -93,7 +93,7 @@ void *sys_brk(void *addr)
 static __attribute__((unused))
 int brk(void *addr)
 {
-	void *ret = sys_brk(addr);
+	void *ret = _sys_brk(addr);
 
 	if (!ret) {
 		SET_ERRNO(ENOMEM);
@@ -106,9 +106,9 @@ static __attribute__((unused))
 void *sbrk(intptr_t inc)
 {
 	/* first call to find current end */
-	void *ret = sys_brk(NULL);
+	void *ret = _sys_brk(NULL);
 
-	if (ret && sys_brk(ret + inc) == ret + inc)
+	if (ret && _sys_brk(ret + inc) == ret + inc)
 		return ret + inc;
 
 	SET_ERRNO(ENOMEM);
@@ -122,7 +122,7 @@ void *sbrk(intptr_t inc)
  */
 
 static __attribute__((unused))
-int sys_chdir(const char *path)
+int _sys_chdir(const char *path)
 {
 	return __nolibc_syscall1(__NR_chdir, path);
 }
@@ -130,11 +130,11 @@ int sys_chdir(const char *path)
 static __attribute__((unused))
 int chdir(const char *path)
 {
-	return __sysret(sys_chdir(path));
+	return __sysret(_sys_chdir(path));
 }
 
 static __attribute__((unused))
-int sys_fchdir(int fildes)
+int _sys_fchdir(int fildes)
 {
 	return __nolibc_syscall1(__NR_fchdir, fildes);
 }
@@ -142,7 +142,7 @@ int sys_fchdir(int fildes)
 static __attribute__((unused))
 int fchdir(int fildes)
 {
-	return __sysret(sys_fchdir(fildes));
+	return __sysret(_sys_fchdir(fildes));
 }
 
 
@@ -151,7 +151,7 @@ int fchdir(int fildes)
  */
 
 static __attribute__((unused))
-int sys_chmod(const char *path, mode_t mode)
+int _sys_chmod(const char *path, mode_t mode)
 {
 #if defined(__NR_fchmodat)
 	return __nolibc_syscall4(__NR_fchmodat, AT_FDCWD, path, mode, 0);
@@ -163,7 +163,7 @@ int sys_chmod(const char *path, mode_t mode)
 static __attribute__((unused))
 int chmod(const char *path, mode_t mode)
 {
-	return __sysret(sys_chmod(path, mode));
+	return __sysret(_sys_chmod(path, mode));
 }
 
 
@@ -172,7 +172,7 @@ int chmod(const char *path, mode_t mode)
  */
 
 static __attribute__((unused))
-int sys_chown(const char *path, uid_t owner, gid_t group)
+int _sys_chown(const char *path, uid_t owner, gid_t group)
 {
 #if defined(__NR_fchownat)
 	return __nolibc_syscall5(__NR_fchownat, AT_FDCWD, path, owner, group, 0);
@@ -184,7 +184,7 @@ int sys_chown(const char *path, uid_t owner, gid_t group)
 static __attribute__((unused))
 int chown(const char *path, uid_t owner, gid_t group)
 {
-	return __sysret(sys_chown(path, owner, group));
+	return __sysret(_sys_chown(path, owner, group));
 }
 
 
@@ -193,7 +193,7 @@ int chown(const char *path, uid_t owner, gid_t group)
  */
 
 static __attribute__((unused))
-int sys_chroot(const char *path)
+int _sys_chroot(const char *path)
 {
 	return __nolibc_syscall1(__NR_chroot, path);
 }
@@ -201,7 +201,7 @@ int sys_chroot(const char *path)
 static __attribute__((unused))
 int chroot(const char *path)
 {
-	return __sysret(sys_chroot(path));
+	return __sysret(_sys_chroot(path));
 }
 
 
@@ -210,7 +210,7 @@ int chroot(const char *path)
  */
 
 static __attribute__((unused))
-int sys_close(int fd)
+int _sys_close(int fd)
 {
 	return __nolibc_syscall1(__NR_close, fd);
 }
@@ -218,7 +218,7 @@ int sys_close(int fd)
 static __attribute__((unused))
 int close(int fd)
 {
-	return __sysret(sys_close(fd));
+	return __sysret(_sys_close(fd));
 }
 
 
@@ -227,7 +227,7 @@ int close(int fd)
  */
 
 static __attribute__((unused))
-int sys_dup(int fd)
+int _sys_dup(int fd)
 {
 	return __nolibc_syscall1(__NR_dup, fd);
 }
@@ -235,7 +235,7 @@ int sys_dup(int fd)
 static __attribute__((unused))
 int dup(int fd)
 {
-	return __sysret(sys_dup(fd));
+	return __sysret(_sys_dup(fd));
 }
 
 
@@ -244,7 +244,7 @@ int dup(int fd)
  */
 
 static __attribute__((unused))
-int sys_dup2(int old, int new)
+int _sys_dup2(int old, int new)
 {
 #if defined(__NR_dup3)
 	int ret, nr_fcntl;
@@ -269,7 +269,7 @@ int sys_dup2(int old, int new)
 static __attribute__((unused))
 int dup2(int old, int new)
 {
-	return __sysret(sys_dup2(old, new));
+	return __sysret(_sys_dup2(old, new));
 }
 
 
@@ -279,7 +279,7 @@ int dup2(int old, int new)
 
 #if defined(__NR_dup3)
 static __attribute__((unused))
-int sys_dup3(int old, int new, int flags)
+int _sys_dup3(int old, int new, int flags)
 {
 	return __nolibc_syscall3(__NR_dup3, old, new, flags);
 }
@@ -287,7 +287,7 @@ int sys_dup3(int old, int new, int flags)
 static __attribute__((unused))
 int dup3(int old, int new, int flags)
 {
-	return __sysret(sys_dup3(old, new, flags));
+	return __sysret(_sys_dup3(old, new, flags));
 }
 #endif
 
@@ -297,7 +297,7 @@ int dup3(int old, int new, int flags)
  */
 
 static __attribute__((unused))
-int sys_execve(const char *filename, char *const argv[], char *const envp[])
+int _sys_execve(const char *filename, char *const argv[], char *const envp[])
 {
 	return __nolibc_syscall3(__NR_execve, filename, argv, envp);
 }
@@ -305,7 +305,7 @@ int sys_execve(const char *filename, char *const argv[], char *const envp[])
 static __attribute__((unused))
 int execve(const char *filename, char *const argv[], char *const envp[])
 {
-	return __sysret(sys_execve(filename, argv, envp));
+	return __sysret(_sys_execve(filename, argv, envp));
 }
 
 
@@ -314,7 +314,7 @@ int execve(const char *filename, char *const argv[], char *const envp[])
  */
 
 static __attribute__((noreturn,unused))
-void sys_exit(int status)
+void _sys_exit(int status)
 {
 	__nolibc_syscall1(__NR_exit, status & 255);
 	while(1); /* shut the "noreturn" warnings. */
@@ -323,7 +323,7 @@ void sys_exit(int status)
 static __attribute__((noreturn,unused))
 void _exit(int status)
 {
-	sys_exit(status);
+	_sys_exit(status);
 }
 
 static __attribute__((noreturn,unused))
@@ -337,9 +337,9 @@ void exit(int status)
  * pid_t fork(void);
  */
 
-#ifndef sys_fork
+#ifndef _sys_fork
 static __attribute__((unused))
-pid_t sys_fork(void)
+pid_t _sys_fork(void)
 {
 #if defined(__NR_clone)
 	/* note: some archs only have clone() and not fork(). Different archs
@@ -356,15 +356,15 @@ pid_t sys_fork(void)
 static __attribute__((unused))
 pid_t fork(void)
 {
-	return __sysret(sys_fork());
+	return __sysret(_sys_fork());
 }
 
-#ifndef sys_vfork
+#ifndef _sys_vfork
 static __attribute__((unused))
-pid_t sys_vfork(void)
+pid_t _sys_vfork(void)
 {
 #if defined(__NR_clone)
-	/* See the note in sys_fork(). */
+	/* See the note in _sys_fork(). */
 	return __nolibc_syscall5(__NR_clone, CLONE_VM | CLONE_VFORK | SIGCHLD, 0, 0, 0, 0);
 #elif defined(__NR_vfork)
 	return __nolibc_syscall0(__NR_vfork);
@@ -375,7 +375,7 @@ pid_t sys_vfork(void)
 static __attribute__((unused))
 pid_t vfork(void)
 {
-	return __sysret(sys_vfork());
+	return __sysret(_sys_vfork());
 }
 
 /*
@@ -383,7 +383,7 @@ pid_t vfork(void)
  */
 
 static __attribute__((unused))
-int sys_fsync(int fd)
+int _sys_fsync(int fd)
 {
 	return __nolibc_syscall1(__NR_fsync, fd);
 }
@@ -391,7 +391,7 @@ int sys_fsync(int fd)
 static __attribute__((unused))
 int fsync(int fd)
 {
-	return __sysret(sys_fsync(fd));
+	return __sysret(_sys_fsync(fd));
 }
 
 
@@ -400,7 +400,7 @@ int fsync(int fd)
  */
 
 static __attribute__((unused))
-int sys_getdents64(int fd, struct linux_dirent64 *dirp, int count)
+int _sys_getdents64(int fd, struct linux_dirent64 *dirp, int count)
 {
 	return __nolibc_syscall3(__NR_getdents64, fd, dirp, count);
 }
@@ -408,7 +408,7 @@ int sys_getdents64(int fd, struct linux_dirent64 *dirp, int count)
 static __attribute__((unused))
 int getdents64(int fd, struct linux_dirent64 *dirp, int count)
 {
-	return __sysret(sys_getdents64(fd, dirp, count));
+	return __sysret(_sys_getdents64(fd, dirp, count));
 }
 
 
@@ -417,7 +417,7 @@ int getdents64(int fd, struct linux_dirent64 *dirp, int count)
  */
 
 static __attribute__((unused))
-uid_t sys_geteuid(void)
+uid_t _sys_geteuid(void)
 {
 #if defined(__NR_geteuid32)
 	return __nolibc_syscall0(__NR_geteuid32);
@@ -429,7 +429,7 @@ uid_t sys_geteuid(void)
 static __attribute__((unused))
 uid_t geteuid(void)
 {
-	return sys_geteuid();
+	return _sys_geteuid();
 }
 
 
@@ -438,7 +438,7 @@ uid_t geteuid(void)
  */
 
 static __attribute__((unused))
-pid_t sys_getpgid(pid_t pid)
+pid_t _sys_getpgid(pid_t pid)
 {
 	return __nolibc_syscall1(__NR_getpgid, pid);
 }
@@ -446,7 +446,7 @@ pid_t sys_getpgid(pid_t pid)
 static __attribute__((unused))
 pid_t getpgid(pid_t pid)
 {
-	return __sysret(sys_getpgid(pid));
+	return __sysret(_sys_getpgid(pid));
 }
 
 
@@ -455,15 +455,15 @@ pid_t getpgid(pid_t pid)
  */
 
 static __attribute__((unused))
-pid_t sys_getpgrp(void)
+pid_t _sys_getpgrp(void)
 {
-	return sys_getpgid(0);
+	return _sys_getpgid(0);
 }
 
 static __attribute__((unused))
 pid_t getpgrp(void)
 {
-	return sys_getpgrp();
+	return _sys_getpgrp();
 }
 
 
@@ -472,7 +472,7 @@ pid_t getpgrp(void)
  */
 
 static __attribute__((unused))
-pid_t sys_getpid(void)
+pid_t _sys_getpid(void)
 {
 	return __nolibc_syscall0(__NR_getpid);
 }
@@ -480,7 +480,7 @@ pid_t sys_getpid(void)
 static __attribute__((unused))
 pid_t getpid(void)
 {
-	return sys_getpid();
+	return _sys_getpid();
 }
 
 
@@ -489,7 +489,7 @@ pid_t getpid(void)
  */
 
 static __attribute__((unused))
-pid_t sys_getppid(void)
+pid_t _sys_getppid(void)
 {
 	return __nolibc_syscall0(__NR_getppid);
 }
@@ -497,7 +497,7 @@ pid_t sys_getppid(void)
 static __attribute__((unused))
 pid_t getppid(void)
 {
-	return sys_getppid();
+	return _sys_getppid();
 }
 
 
@@ -506,7 +506,7 @@ pid_t getppid(void)
  */
 
 static __attribute__((unused))
-pid_t sys_gettid(void)
+pid_t _sys_gettid(void)
 {
 	return __nolibc_syscall0(__NR_gettid);
 }
@@ -514,7 +514,7 @@ pid_t sys_gettid(void)
 static __attribute__((unused))
 pid_t gettid(void)
 {
-	return sys_gettid();
+	return _sys_gettid();
 }
 
 #ifndef NOLIBC_NO_RUNTIME
@@ -536,7 +536,7 @@ int getpagesize(void)
  */
 
 static __attribute__((unused))
-uid_t sys_getuid(void)
+uid_t _sys_getuid(void)
 {
 #if defined(__NR_getuid32)
 	return __nolibc_syscall0(__NR_getuid32);
@@ -548,7 +548,7 @@ uid_t sys_getuid(void)
 static __attribute__((unused))
 uid_t getuid(void)
 {
-	return sys_getuid();
+	return _sys_getuid();
 }
 
 
@@ -557,7 +557,7 @@ uid_t getuid(void)
  */
 
 static __attribute__((unused))
-int sys_kill(pid_t pid, int signal)
+int _sys_kill(pid_t pid, int signal)
 {
 	return __nolibc_syscall2(__NR_kill, pid, signal);
 }
@@ -565,7 +565,7 @@ int sys_kill(pid_t pid, int signal)
 static __attribute__((unused))
 int kill(pid_t pid, int signal)
 {
-	return __sysret(sys_kill(pid, signal));
+	return __sysret(_sys_kill(pid, signal));
 }
 
 
@@ -574,7 +574,7 @@ int kill(pid_t pid, int signal)
  */
 
 static __attribute__((unused))
-int sys_link(const char *old, const char *new)
+int _sys_link(const char *old, const char *new)
 {
 #if defined(__NR_linkat)
 	return __nolibc_syscall5(__NR_linkat, AT_FDCWD, old, AT_FDCWD, new, 0);
@@ -586,7 +586,7 @@ int sys_link(const char *old, const char *new)
 static __attribute__((unused))
 int link(const char *old, const char *new)
 {
-	return __sysret(sys_link(old, new));
+	return __sysret(_sys_link(old, new));
 }
 
 
@@ -595,7 +595,7 @@ int link(const char *old, const char *new)
  */
 
 static __attribute__((unused))
-off_t sys_lseek(int fd, off_t offset, int whence)
+off_t _sys_lseek(int fd, off_t offset, int whence)
 {
 #if defined(__NR_llseek)
 	__kernel_loff_t loff = 0;
@@ -617,7 +617,7 @@ off_t sys_lseek(int fd, off_t offset, int whence)
 static __attribute__((unused))
 off_t lseek(int fd, off_t offset, int whence)
 {
-	return __sysret(sys_lseek(fd, offset, whence));
+	return __sysret(_sys_lseek(fd, offset, whence));
 }
 
 
@@ -626,7 +626,7 @@ off_t lseek(int fd, off_t offset, int whence)
  */
 
 static __attribute__((unused))
-int sys_mkdir(const char *path, mode_t mode)
+int _sys_mkdir(const char *path, mode_t mode)
 {
 #if defined(__NR_mkdirat)
 	return __nolibc_syscall3(__NR_mkdirat, AT_FDCWD, path, mode);
@@ -638,7 +638,7 @@ int sys_mkdir(const char *path, mode_t mode)
 static __attribute__((unused))
 int mkdir(const char *path, mode_t mode)
 {
-	return __sysret(sys_mkdir(path, mode));
+	return __sysret(_sys_mkdir(path, mode));
 }
 
 /*
@@ -646,7 +646,7 @@ int mkdir(const char *path, mode_t mode)
  */
 
 static __attribute__((unused))
-int sys_rmdir(const char *path)
+int _sys_rmdir(const char *path)
 {
 #if defined(__NR_rmdir)
 	return __nolibc_syscall1(__NR_rmdir, path);
@@ -658,7 +658,7 @@ int sys_rmdir(const char *path)
 static __attribute__((unused))
 int rmdir(const char *path)
 {
-	return __sysret(sys_rmdir(path));
+	return __sysret(_sys_rmdir(path));
 }
 
 
@@ -667,7 +667,7 @@ int rmdir(const char *path)
  */
 
 static __attribute__((unused))
-long sys_mknod(const char *path, mode_t mode, dev_t dev)
+long _sys_mknod(const char *path, mode_t mode, dev_t dev)
 {
 #if defined(__NR_mknodat)
 	return __nolibc_syscall4(__NR_mknodat, AT_FDCWD, path, mode, dev);
@@ -679,7 +679,7 @@ long sys_mknod(const char *path, mode_t mode, dev_t dev)
 static __attribute__((unused))
 int mknod(const char *path, mode_t mode, dev_t dev)
 {
-	return __sysret(sys_mknod(path, mode, dev));
+	return __sysret(_sys_mknod(path, mode, dev));
 }
 
 
@@ -689,7 +689,7 @@ int mknod(const char *path, mode_t mode, dev_t dev)
  */
 
 static __attribute__((unused))
-int sys_pipe2(int pipefd[2], int flags)
+int _sys_pipe2(int pipefd[2], int flags)
 {
 	return __nolibc_syscall2(__NR_pipe2, pipefd, flags);
 }
@@ -697,7 +697,7 @@ int sys_pipe2(int pipefd[2], int flags)
 static __attribute__((unused))
 int pipe2(int pipefd[2], int flags)
 {
-	return __sysret(sys_pipe2(pipefd, flags));
+	return __sysret(_sys_pipe2(pipefd, flags));
 }
 
 static __attribute__((unused))
@@ -712,7 +712,7 @@ int pipe(int pipefd[2])
  */
 
 static __attribute__((unused))
-int sys_pivot_root(const char *new, const char *old)
+int _sys_pivot_root(const char *new, const char *old)
 {
 	return __nolibc_syscall2(__NR_pivot_root, new, old);
 }
@@ -720,7 +720,7 @@ int sys_pivot_root(const char *new, const char *old)
 static __attribute__((unused))
 int pivot_root(const char *new, const char *old)
 {
-	return __sysret(sys_pivot_root(new, old));
+	return __sysret(_sys_pivot_root(new, old));
 }
 
 
@@ -729,7 +729,7 @@ int pivot_root(const char *new, const char *old)
  */
 
 static __attribute__((unused))
-ssize_t sys_read(int fd, void *buf, size_t count)
+ssize_t _sys_read(int fd, void *buf, size_t count)
 {
 	return __nolibc_syscall3(__NR_read, fd, buf, count);
 }
@@ -737,7 +737,7 @@ ssize_t sys_read(int fd, void *buf, size_t count)
 static __attribute__((unused))
 ssize_t read(int fd, void *buf, size_t count)
 {
-	return __sysret(sys_read(fd, buf, count));
+	return __sysret(_sys_read(fd, buf, count));
 }
 
 
@@ -746,7 +746,7 @@ ssize_t read(int fd, void *buf, size_t count)
  */
 
 static __attribute__((unused))
-int sys_sched_yield(void)
+int _sys_sched_yield(void)
 {
 	return __nolibc_syscall0(__NR_sched_yield);
 }
@@ -754,7 +754,7 @@ int sys_sched_yield(void)
 static __attribute__((unused))
 int sched_yield(void)
 {
-	return __sysret(sys_sched_yield());
+	return __sysret(_sys_sched_yield());
 }
 
 
@@ -763,7 +763,7 @@ int sched_yield(void)
  */
 
 static __attribute__((unused))
-int sys_setpgid(pid_t pid, pid_t pgid)
+int _sys_setpgid(pid_t pid, pid_t pgid)
 {
 	return __nolibc_syscall2(__NR_setpgid, pid, pgid);
 }
@@ -771,7 +771,7 @@ int sys_setpgid(pid_t pid, pid_t pgid)
 static __attribute__((unused))
 int setpgid(pid_t pid, pid_t pgid)
 {
-	return __sysret(sys_setpgid(pid, pgid));
+	return __sysret(_sys_setpgid(pid, pgid));
 }
 
 /*
@@ -790,7 +790,7 @@ pid_t setpgrp(void)
  */
 
 static __attribute__((unused))
-pid_t sys_setsid(void)
+pid_t _sys_setsid(void)
 {
 	return __no