diff options
| author | Thomas Weißschuh <thomas.weissschuh@linutronix.de> | 2025-04-16 15:06:23 +0300 |
|---|---|---|
| committer | Thomas Weißschuh <linux@weissschuh.net> | 2025-04-19 15:22:28 +0300 |
| commit | face777a442bfb07017adf935dbb738a3504fdd2 (patch) | |
| tree | 5a37e86d0b0d5b9c067bd5dcf601b6bac8604c68 | |
| parent | 0fd55773f47124ee27a1d201bb07649a056c58cc (diff) | |
| download | linux-face777a442bfb07017adf935dbb738a3504fdd2.tar.xz | |
tools/nolibc: move gettimeofday() to sys/time.h
This is the location regular userspace expects this 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-8-a069a3f1d145@linutronix.de
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
| -rw-r--r-- | tools/include/nolibc/Makefile | 1 | ||||
| -rw-r--r-- | tools/include/nolibc/nolibc.h | 1 | ||||
| -rw-r--r-- | tools/include/nolibc/sys.h | 21 | ||||
| -rw-r--r-- | tools/include/nolibc/sys/time.h | 36 |
4 files changed, 38 insertions, 21 deletions
diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile index 65c3b90f8ba9..fd1fc769cbbe 100644 --- a/tools/include/nolibc/Makefile +++ b/tools/include/nolibc/Makefile @@ -48,6 +48,7 @@ all_files := \ sys/mman.h \ sys/stat.h \ sys/syscall.h \ + sys/time.h \ time.h \ types.h \ unistd.h \ diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h index cb5705d55d80..d84e8610bf10 100644 --- a/tools/include/nolibc/nolibc.h +++ b/tools/include/nolibc/nolibc.h @@ -100,6 +100,7 @@ #include "sys/mman.h" #include "sys/stat.h" #include "sys/syscall.h" +#include "sys/time.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 c76dc8014728..aab0685af84f 100644 --- a/tools/include/nolibc/sys.h +++ b/tools/include/nolibc/sys.h @@ -488,27 +488,6 @@ int getpagesize(void) /* - * int gettimeofday(struct timeval *tv, struct timezone *tz); - */ - -static __attribute__((unused)) -int sys_gettimeofday(struct timeval *tv, struct timezone *tz) -{ -#ifdef __NR_gettimeofday - return my_syscall2(__NR_gettimeofday, tv, tz); -#else - return __nolibc_enosys(__func__, tv, tz); -#endif -} - -static __attribute__((unused)) -int gettimeofday(struct timeval *tv, struct timezone *tz) -{ - return __sysret(sys_gettimeofday(tv, tz)); -} - - -/* * uid_t getuid(void); */ diff --git a/tools/include/nolibc/sys/time.h b/tools/include/nolibc/sys/time.h new file mode 100644 index 000000000000..1d326c05ee62 --- /dev/null +++ b/tools/include/nolibc/sys/time.h @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ +/* + * time definitions for NOLIBC + * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu> + */ + +#ifndef _NOLIBC_SYS_TIME_H +#define _NOLIBC_SYS_TIME_H + +#include "../arch.h" +#include "../sys.h" + +/* + * int gettimeofday(struct timeval *tv, struct timezone *tz); + */ + +static __attribute__((unused)) +int sys_gettimeofday(struct timeval *tv, struct timezone *tz) +{ +#ifdef __NR_gettimeofday + return my_syscall2(__NR_gettimeofday, tv, tz); +#else + return __nolibc_enosys(__func__, tv, tz); +#endif +} + +static __attribute__((unused)) +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 */ |