tools/nolibc: move mmap() and friends to sys/mman.h

This is the location regular userspace expects these definitions.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250416-nolibc-split-sys-v1-5-a069a3f1d145@linutronix.de
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>

diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile
index a3781f39692532fb75c7aaf70f65b2d5bf7c7abd..ca8817e84c3a5b4df3d373e60a956945d2665b94 100644 (file)
--- a/tools/include/nolibc/Makefile
+++ b/tools/include/nolibc/Makefile
@@ -45,6 +45,7 @@ all_files := \
                string.h \
                sys.h \
                sys/auxv.h \
+               sys/mman.h \
                time.h \
                types.h \
                unistd.h \

diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h
index 0d8c49e0dddc595c2f029788ecb5b51231e2695a..ffdf501db1b6faebe2f0d5f56bd3c31c1a8ec164 100644 (file)
--- a/tools/include/nolibc/nolibc.h
+++ b/tools/include/nolibc/nolibc.h
@@ -97,6 +97,7 @@
 #include "types.h"
 #include "sys.h"
 #include "sys/auxv.h"
+#include "sys/mman.h"
 #include "ctype.h"
 #include "elf.h"
 #include "signal.h"

diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h
index 5fa351e6a3512a3d0c609867244ac91e8563ab2a..13e6b2479fbf8bcb36843072665e50046c5f41eb 100644 (file)
--- a/tools/include/nolibc/sys.h
+++ b/tools/include/nolibc/sys.h
@@ -24,7 +24,6 @@
 #include <linux/resource.h>
 #include <linux/utsname.h>
 
-#include "arch.h"
 #include "errno.h"
 #include "stdarg.h"
 #include "types.h"
@@ -697,53 +696,6 @@ int mknod(const char *path, mode_t mode, dev_t dev)
        return __sysret(sys_mknod(path, mode, dev));
 }
 
-#ifndef sys_mmap
-static __attribute__((unused))
-void *sys_mmap(void *addr, size_t length, int prot, int flags, int fd,
-              off_t offset)
-{
-       int n;
-
-#if defined(__NR_mmap2)
-       n = __NR_mmap2;
-       offset >>= 12;
-#else
-       n = __NR_mmap;
-#endif
-
-       return (void *)my_syscall6(n, addr, length, prot, flags, fd, offset);
-}
-#endif
-
-/* Note that on Linux, MAP_FAILED is -1 so we can use the generic __sysret()
- * which returns -1 upon error and still satisfy user land that checks for
- * MAP_FAILED.
- */
-
-static __attribute__((unused))
-void *mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
-{
-       void *ret = sys_mmap(addr, length, prot, flags, fd, offset);
-
-       if ((unsigned long)ret >= -4095UL) {
-               SET_ERRNO(-(long)ret);
-               ret = MAP_FAILED;
-       }
-       return ret;
-}
-
-static __attribute__((unused))
-int sys_munmap(void *addr, size_t length)
-{
-       return my_syscall2(__NR_munmap, addr, length);
-}
-
-static __attribute__((unused))
-int munmap(void *addr, size_t length)
-{
-       return __sysret(sys_munmap(addr, length));
-}
-
 /*
  * int mount(const char *source, const char *target,
  *           const char *fstype, unsigned long flags,

diff --git a/tools/include/nolibc/sys/mman.h b/tools/include/nolibc/sys/mman.h
new file mode 100644 (file)
index 0000000..ad9d06b
--- /dev/null
+++ b/tools/include/nolibc/sys/mman.h
@@ -0,0 +1,63 @@
+/* SPDX-License-Identifier: LGPL-2.1 OR MIT */
+/*
+ * mm definition for NOLIBC
+ * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
+ */
+
+#ifndef _NOLIBC_SYS_MMAN_H
+#define _NOLIBC_SYS_MMAN_H
+
+#include "../arch.h"
+#include "../sys.h"
+
+#ifndef sys_mmap
+static __attribute__((unused))
+void *sys_mmap(void *addr, size_t length, int prot, int flags, int fd,
+              off_t offset)
+{
+       int n;
+
+#if defined(__NR_mmap2)
+       n = __NR_mmap2;
+       offset >>= 12;
+#else
+       n = __NR_mmap;
+#endif
+
+       return (void *)my_syscall6(n, addr, length, prot, flags, fd, offset);
+}
+#endif
+
+/* Note that on Linux, MAP_FAILED is -1 so we can use the generic __sysret()
+ * which returns -1 upon error and still satisfy user land that checks for
+ * MAP_FAILED.
+ */
+
+static __attribute__((unused))
+void *mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
+{
+       void *ret = sys_mmap(addr, length, prot, flags, fd, offset);
+
+       if ((unsigned long)ret >= -4095UL) {
+               SET_ERRNO(-(long)ret);
+               ret = MAP_FAILED;
+       }
+       return ret;
+}
+
+static __attribute__((unused))
+int sys_munmap(void *addr, size_t length)
+{
+       return my_syscall2(__NR_munmap, addr, length);
+}
+
+static __attribute__((unused))
+int munmap(void *addr, size_t length)
+{
+       return __sysret(sys_munmap(addr, length));
+}
+
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
+#endif /* _NOLIBC_SYS_MMAN_H */