tools/nolibc: move getauxval() to sys/auxv.h

This is the location regular userspace expects the definition.

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-4-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 2132e4f4d2165729ec6d10860d0586f1b71ee0fb..a3781f39692532fb75c7aaf70f65b2d5bf7c7abd 100644 (file)
--- a/tools/include/nolibc/Makefile
+++ b/tools/include/nolibc/Makefile
@@ -44,6 +44,7 @@ all_files := \
                stdlib.h \
                string.h \
                sys.h \
+               sys/auxv.h \
                time.h \
                types.h \
                unistd.h \

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

diff --git a/tools/include/nolibc/stdlib.h b/tools/include/nolibc/stdlib.h
index 32b3038002c16864cf66a71ae9fa3825f995b09c..69cf1d4418f1c1f59192aee40ea3a5b684d2709a 100644 (file)
--- a/tools/include/nolibc/stdlib.h
+++ b/tools/include/nolibc/stdlib.h
@@ -102,32 +102,6 @@ char *getenv(const char *name)
        return NULL;
 }
 
-static __attribute__((unused))
-unsigned long getauxval(unsigned long type)
-{
-       const unsigned long *auxv = _auxv;
-       unsigned long ret;
-
-       if (!auxv)
-               return 0;
-
-       while (1) {
-               if (!auxv[0] && !auxv[1]) {
-                       ret = 0;
-                       break;
-               }
-
-               if (auxv[0] == type) {
-                       ret = auxv[1];
-                       break;
-               }
-
-               auxv += 2;
-       }
-
-       return ret;
-}
-
 static __attribute__((unused))
 void *malloc(size_t len)
 {

diff --git a/tools/include/nolibc/sys/auxv.h b/tools/include/nolibc/sys/auxv.h
new file mode 100644 (file)
index 0000000..04c2b9c
--- /dev/null
+++ b/tools/include/nolibc/sys/auxv.h
@@ -0,0 +1,41 @@
+/* SPDX-License-Identifier: LGPL-2.1 OR MIT */
+/*
+ * auxv definitions for NOLIBC
+ * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
+ */
+
+#ifndef _NOLIBC_SYS_AUXV_H
+#define _NOLIBC_SYS_AUXV_H
+
+#include "../crt.h"
+
+static __attribute__((unused))
+unsigned long getauxval(unsigned long type)
+{
+       const unsigned long *auxv = _auxv;
+       unsigned long ret;
+
+       if (!auxv)
+               return 0;
+
+       while (1) {
+               if (!auxv[0] && !auxv[1]) {
+                       ret = 0;
+                       break;
+               }
+
+               if (auxv[0] == type) {
+                       ret = auxv[1];
+                       break;
+               }
+
+               auxv += 2;
+       }
+
+       return ret;
+}
+
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
+#endif /* _NOLIBC_SYS_AUXV_H */