public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools/nolibc: include nolibc.h early from all header files

Browse source 
Inclusion of any nolibc header file should also bring all other headers.
On the other hand it should also be possible to include any nolibc header
files
in any order.

Currently this is implemented by including the catch-all nolibc.h after the
headers own definitions.
This is problematic if one nolibc header depends on another one.
The first header has to include the other one before defining any symbols.
That in turn will include the rest of nolibc while the current header has
not defined anything yet. If any other part of nolibc depends on
definitions from the current header, errors are encountered.
This is already the case today. Effectively nolibc can only be included in
the order of nolibc.h.

Restructure the way "nolibc.h" is included.
Move it to the beginning of the header files and before the include guards.
Now any header will behave exactly like "nolibc.h" while the include
guards prevent any duplicate definitions.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250424-nolibc-header-check-v1-2-011576b6ed6f@linutronix.de
This commit is contained in:
Thomas Weißschuh 2025-04-24 13:48:12 +02:00 • committed by Thomas Weißschuh
parent a6a054c8ad
commit 3785289f97
20 changed files with 60 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/include/nolibc/ctype.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_CTYPE_H
#define _NOLIBC_CTYPE_H
@ -96,7 +99,4 @@ int ispunct(int c)
return isgraph(c) && !isalnum(c);
}
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_CTYPE_H */

6
tools/include/nolibc/dirent.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2025 Thomas Weißschuh <linux@weissschuh.net>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_DIRENT_H
#define _NOLIBC_DIRENT_H
@ -94,7 +97,4 @@ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
return 0;
}
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_DIRENT_H */

6
tools/include/nolibc/elf.h
View file

@ -4,12 +4,12 @@
* Copyright (C) 2025 Thomas Weißschuh <thomas.weissschuh@linutronix.de>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_SYS_ELF_H
#define _NOLIBC_SYS_ELF_H
#include <linux/elf.h>
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_SYS_ELF_H */

6
tools/include/nolibc/errno.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2022 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_ERRNO_H
#define _NOLIBC_ERRNO_H
@ -22,7 +25,4 @@ int errno __attribute__((weak));
*/
#define MAX_ERRNO 4095
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_ERRNO_H */

6
tools/include/nolibc/fcntl.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_FCNTL_H
#define _NOLIBC_FCNTL_H
@ -63,7 +66,4 @@ int open(const char *path, int flags, ...)
return __sysret(sys_open(path, flags, mode));
}
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_FCNTL_H */

6
tools/include/nolibc/getopt.h
View file

@ -5,6 +5,9 @@
* Copyright (C) 2025 Thomas Weißschuh <linux@weissschuh.net>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_GETOPT_H
#define _NOLIBC_GETOPT_H
@ -95,7 +98,4 @@ int getopt(int argc, char * const argv[], const char *optstring)
return c;
}
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_GETOPT_H */

6
tools/include/nolibc/signal.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2022 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_SIGNAL_H
#define _NOLIBC_SIGNAL_H
@ -20,7 +23,4 @@ int raise(int signal)
return sys_kill(sys_getpid(), signal);
}
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_SIGNAL_H */

6
tools/include/nolibc/stdio.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_STDIO_H
#define _NOLIBC_STDIO_H
@ -598,7 +601,4 @@ const char *strerror(int errno)
return buf;
}
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_STDIO_H */

6
tools/include/nolibc/stdlib.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_STDLIB_H
#define _NOLIBC_STDLIB_H
@ -522,7 +525,4 @@ uintmax_t strtoumax(const char *nptr, char **endptr, int base)
return __strtox(nptr, endptr, base, 0, UINTMAX_MAX);
}
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_STDLIB_H */

7
tools/include/nolibc/string.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_STRING_H
#define _NOLIBC_STRING_H
@ -305,8 +308,4 @@ int toupper(int c)
return c;
}
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_STRING_H */

6
tools/include/nolibc/sys.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_SYS_H
#define _NOLIBC_SYS_H
@ -1119,7 +1122,4 @@ int memfd_create(const char *name, unsigned int flags)
return __sysret(sys_memfd_create(name, flags));
}
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_SYS_H */

6
tools/include/nolibc/sys/auxv.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "../nolibc.h"
#ifndef _NOLIBC_SYS_AUXV_H
#define _NOLIBC_SYS_AUXV_H
@ -35,7 +38,4 @@ unsigned long getauxval(unsigned long type)
return ret;
}
/* make sure to include all global symbols */
#include "../nolibc.h"
#endif /* _NOLIBC_SYS_AUXV_H */

6
tools/include/nolibc/sys/mman.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "../nolibc.h"
#ifndef _NOLIBC_SYS_MMAN_H
#define _NOLIBC_SYS_MMAN_H
@ -57,7 +60,4 @@ 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 */

7
tools/include/nolibc/sys/stat.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "../nolibc.h"
#ifndef _NOLIBC_SYS_STAT_H
#define _NOLIBC_SYS_STAT_H
@ -67,8 +70,4 @@ int stat(const char *path, struct stat *buf)
return 0;
}
/* make sure to include all global symbols */
#include "../nolibc.h"
#endif /* _NOLIBC_SYS_STAT_H */

6
tools/include/nolibc/sys/syscall.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2024 Thomas Weißschuh <linux@weissschuh.net>
*/
/* make sure to include all global symbols */
#include "../nolibc.h"
#ifndef _NOLIBC_SYS_SYSCALL_H
#define _NOLIBC_SYS_SYSCALL_H
@ -13,7 +16,4 @@
#define _syscall_n(N, ...) _syscall(N, __VA_ARGS__)
#define syscall(...) _syscall_n(_syscall_narg(__VA_ARGS__), ##__VA_ARGS__)
/* make sure to include all global symbols */
#include "../nolibc.h"
#endif /* _NOLIBC_SYS_SYSCALL_H */

6
tools/include/nolibc/sys/time.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "../nolibc.h"
#ifndef _NOLIBC_SYS_TIME_H
#define _NOLIBC_SYS_TIME_H
@ -30,7 +33,4 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
return __sysret(sys_gettimeofday(tv, tz));
}
/* make sure to include all global symbols */
#include "../nolibc.h"
#endif /* _NOLIBC_SYS_TIME_H */

7
tools/include/nolibc/sys/wait.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "../nolibc.h"
#ifndef _NOLIBC_SYS_WAIT_H
#define _NOLIBC_SYS_WAIT_H
@ -110,8 +113,4 @@ pid_t waitpid(pid_t pid, int *status, int options)
return info.si_pid;
}
/* make sure to include all global symbols */
#include "../nolibc.h"
#endif /* _NOLIBC_SYS_WAIT_H */

6
tools/include/nolibc/time.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2022 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_TIME_H
#define _NOLIBC_TIME_H
@ -25,7 +28,4 @@ time_t time(time_t *tptr)
return tv.tv_sec;
}
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_TIME_H */

6
tools/include/nolibc/types.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_TYPES_H
#define _NOLIBC_TYPES_H
@ -214,7 +217,4 @@ struct stat {
})
#endif
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_TYPES_H */

6
tools/include/nolibc/unistd.h
View file

@ -4,6 +4,9 @@
* Copyright (C) 2017-2022 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_UNISTD_H
#define _NOLIBC_UNISTD_H
@ -56,7 +59,4 @@ int tcsetpgrp(int fd, pid_t pid)
return ioctl(fd, TIOCSPGRP, &pid);
}
/* make sure to include all global symbols */
#include "nolibc.h"
#endif /* _NOLIBC_UNISTD_H */