devel May 2024

devel@uclibc-ng.org

7 participants
23 discussions

[PATCH v2] riscv32: Fix `struct ucontext` definition.
by Dmitry Chestnykh 19 May '24

19 May '24

The correct typedef is `struct ucontext` -> `ucontext_t`, not `struct ucontext_t` -> `ucontext_t` like for other architectures. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- libc/sysdeps/linux/riscv32/sys/ucontext.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libc/sysdeps/linux/riscv32/sys/ucontext.h b/libc/sysdeps/linux/riscv32/sys/ucontext.h index 2893ff359..308ccb8c2 100644 --- a/libc/sysdeps/linux/riscv32/sys/ucontext.h +++ b/libc/sysdeps/linux/riscv32/sys/ucontext.h @@ -83,10 +83,10 @@ typedef struct mcontext_t } mcontext_t; /* Userlevel context. */ -typedef struct ucontext_t +typedef struct ucontext { unsigned long int __uc_flags; - struct ucontext_t *uc_link; + struct ucontext *uc_link; stack_t uc_stack; sigset_t uc_sigmask; /* There's some padding here to allow sigset_t to be expanded in the -- 2.45.1

2 1

[PATCH] riscv32: Fix `struct ucontext` definition.
by Dmitry Chestnykh 18 May '24

18 May '24

The correct typedef is `struct ucontext` -> `ucontext_t`, not `struct ucontext_t` -> `ucontext_t` like for other architectures. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- libc/sysdeps/linux/riscv32/sys/ucontext.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libc/sysdeps/linux/riscv32/sys/ucontext.h b/libc/sysdeps/linux/riscv32/sys/ucontext.h index 2893ff359..51dd5ff12 100644 --- a/libc/sysdeps/linux/riscv32/sys/ucontext.h +++ b/libc/sysdeps/linux/riscv32/sys/ucontext.h @@ -83,7 +83,7 @@ typedef struct mcontext_t } mcontext_t; /* Userlevel context. */ -typedef struct ucontext_t +typedef struct ucontext { unsigned long int __uc_flags; struct ucontext_t *uc_link; -- 2.45.1

1 0

[PATCH] Fix riscv32 build with gcc-14.
by Dmitry Chestnykh 18 May '24

18 May '24

Add missing includes and function decls. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- libc/sysdeps/linux/common/not-cancel.h | 2 ++ libpthread/linuxthreads/sysdeps/pthread/not-cancel.h | 2 ++ libpthread/nptl/sysdeps/unix/sysv/linux/not-cancel.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/libc/sysdeps/linux/common/not-cancel.h b/libc/sysdeps/linux/common/not-cancel.h index e4fb1d7fe..426edcc46 100644 --- a/libc/sysdeps/linux/common/not-cancel.h +++ b/libc/sysdeps/linux/common/not-cancel.h @@ -19,6 +19,7 @@ #include <sys/types.h> #include <sysdep.h> +#include <time.h> #ifdef NOT_IN_libc @@ -114,6 +115,7 @@ extern __typeof(pause) __pause_nocancel; # define nanosleep_not_cancel(requested_time, remaining) \ INLINE_SYSCALL (nanosleep, 2, requested_time, remaining) #else +extern int __nanosleep_nocancel (const struct timespec *requested_time, struct timespec *remaining); # define nanosleep_not_cancel(requested_time, remaining) \ __nanosleep_nocancel (requested_time, remaining) #endif diff --git a/libpthread/linuxthreads/sysdeps/pthread/not-cancel.h b/libpthread/linuxthreads/sysdeps/pthread/not-cancel.h index bbdb0739c..6d7c4d70a 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/not-cancel.h +++ b/libpthread/linuxthreads/sysdeps/pthread/not-cancel.h @@ -19,6 +19,7 @@ #include <sys/types.h> #include <sysdep.h> +#include <time.h> /* Uncancelable open. */ #if defined __NR_openat && !defined __NR_open @@ -104,6 +105,7 @@ extern int __openat64_nocancel (int fd, const char *fname, int oflag, # define nanosleep_not_cancel(requested_time, remaining) \ INLINE_SYSCALL (nanosleep, 2, requested_time, remaining) #else +extern int __nanosleep_nocancel (const struct timespec *requested_time, struct timespec *remaining); # define nanosleep_not_cancel(requested_time, remaining) \ __nanosleep_nocancel (requested_time, remaining) #endif diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/not-cancel.h b/libpthread/nptl/sysdeps/unix/sysv/linux/not-cancel.h index bbdb0739c..6d7c4d70a 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/not-cancel.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/not-cancel.h @@ -19,6 +19,7 @@ #include <sys/types.h> #include <sysdep.h> +#include <time.h> /* Uncancelable open. */ #if defined __NR_openat && !defined __NR_open @@ -104,6 +105,7 @@ extern int __openat64_nocancel (int fd, const char *fname, int oflag, # define nanosleep_not_cancel(requested_time, remaining) \ INLINE_SYSCALL (nanosleep, 2, requested_time, remaining) #else +extern int __nanosleep_nocancel (const struct timespec *requested_time, struct timespec *remaining); # define nanosleep_not_cancel(requested_time, remaining) \ __nanosleep_nocancel (requested_time, remaining) #endif -- 2.45.1

2 1

[PATCH] Fix uClibc build for nds32 with gcc-14.
by Dmitry Chestnykh 18 May '24

18 May '24

Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- libc/sysdeps/linux/common/fstat64.c | 2 +- libc/sysdeps/linux/nds32/jmpbuf-unwind.h | 2 +- libpthread/nptl/sysdeps/nds32/dl-tls.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c index 359c22af6..ca25bde5e 100644 --- a/libc/sysdeps/linux/common/fstat64.c +++ b/libc/sysdeps/linux/common/fstat64.c @@ -30,7 +30,7 @@ int fstat64(int fd, struct stat64 *buf) return result; #else - return __syscall_fstat64(fd, buf); + return __syscall_fstat64(fd, (struct kernel_stat64 *)buf); #endif } libc_hidden_def(fstat64) diff --git a/libc/sysdeps/linux/nds32/jmpbuf-unwind.h b/libc/sysdeps/linux/nds32/jmpbuf-unwind.h index 8499e99b4..5b85f4d23 100644 --- a/libc/sysdeps/linux/nds32/jmpbuf-unwind.h +++ b/libc/sysdeps/linux/nds32/jmpbuf-unwind.h @@ -20,7 +20,7 @@ static inline uintptr_t __attribute__ ((unused)) _jmpbuf_sp (__jmp_buf regs) { - uintptr_t sp = &(regs)[0].__regs[__JMP_BUF_SP]; + uintptr_t sp = (uintptr_t) &(regs)[0].__regs[__JMP_BUF_SP]; return sp; } diff --git a/libpthread/nptl/sysdeps/nds32/dl-tls.h b/libpthread/nptl/sysdeps/nds32/dl-tls.h index 3b11e7f42..f0107cacb 100644 --- a/libpthread/nptl/sysdeps/nds32/dl-tls.h +++ b/libpthread/nptl/sysdeps/nds32/dl-tls.h @@ -50,7 +50,7 @@ struct tlsdesc_dynamic_arg extern void *__tls_get_addr (tls_index *ti); extern ptrdiff_t attribute_hidden - _dl_tlsdesc_return(struct tlsdesc_dynamic_arg *); + _dl_tlsdesc_return(struct tlsdesc *); extern void *_dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset); extern ptrdiff_t attribute_hidden -- 2.45.1

2 1

[PATCH] Correct uClibc compilation.
by Dmitry Chestnykh 16 May '24

16 May '24

- Include sys/types.h instead of asm/types.h to prevent types conflict for uClibc typedefs and kernel headers typedefs. - Cast 3rd arg of utimensat_time64 syscall to integer type to avoid compiler's -Wint-conversion error. The error was found during uClibc compilation for mips32. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- include/net/ppp_defs.h | 2 +- libc/sysdeps/linux/common/utimensat.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h index f8924c4f2..904d1933c 100644 --- a/include/net/ppp_defs.h +++ b/include/net/ppp_defs.h @@ -4,7 +4,7 @@ #define __need_time_t #include <time.h> -#include <asm/types.h> +#include <sys/types.h> #include <linux/ppp_defs.h> #endif /* net/ppp_defs.h */ diff --git a/libc/sysdeps/linux/common/utimensat.c b/libc/sysdeps/linux/common/utimensat.c index fa6f90e55..5816c7890 100644 --- a/libc/sysdeps/linux/common/utimensat.c +++ b/libc/sysdeps/linux/common/utimensat.c @@ -8,6 +8,7 @@ #include <sys/syscall.h> #include <sys/stat.h> +#include <stdint.h> #if defined(__UCLIBC_USE_TIME64__) #include "internal/time64_helpers.h" @@ -28,7 +29,7 @@ int utimensat(int fd, const char *path, const struct timespec times[2], int flag } }; - return INLINE_SYSCALL(utimensat_time64, 4, fd, path, times ? &__times64 : 0, flags); + return INLINE_SYSCALL(utimensat_time64, 4, fd, path, times ? (uintptr_t) &__times64 : 0, flags); } #else _syscall4(int, utimensat, int, fd, const char *, path, const struct timespec *, times, int, flags) -- 2.45.1

2 1

Re: uClibc-ng build failure with GCC14 for arc
by Max Filippov 15 May '24

15 May '24

Hi Chris, On Wed, May 15, 2024 at 09:02:27AM +1200, Chris Packham wrote: > (Max, Waldemar sorry for the duplicate. My subscription to the list > seems to have been stuck in pending for ages so I grabbed your > addresses from the git repo) > > I'm in the process of adding GCC14 to crosstool-ng. I've grabbed the > latest uClibc-ng tarball and the commits from master since the > release. I'm hitting the following build failure with an > arc-multilib-linux-uclibc configuration. > > [ALL ] libc/sysdeps/linux/common/fstat64.c: In function 'fstat64': > [ERROR] libc/sysdeps/linux/common/fstat64.c:33:38: error: passing > argument 2 of '__syscall_fstat64' from incompatible pointer type > [-Wincompatible-pointer-types] > [ALL ] 33 | return __syscall_fstat64(fd, buf); > [ALL ] | ^~~ > [ALL ] | | > [ALL ] | struct stat64 * > [ALL ] In file included from ./include/sys/syscall.h:34, > [ALL ] from libc/sysdeps/linux/common/fstat64.c:10: > [ALL ] libc/sysdeps/linux/common/fstat64.c:18:72: note: expected > 'struct stat *' but argument is of type 'struct stat64 *' > [ALL ] 18 | int, filedes, > struct kernel_stat64 *, buf) > [ALL ] | > ~~~~~~~~~~~~~~~~~~~~~~~~^~~ > [ALL ] ./include/bits/syscalls-common.h:82:43: note: in > definition of macro 'C_DECL_ARGS_1' > [ALL ] 82 | #define C_DECL_ARGS_1(t, v) t v > [ALL ] | ^ > [ALL ] ./include/bits/syscalls-common.h:98:11: note: in > expansion of macro 'C_DECL_ARGS_2' > [ALL ] 98 | type name(C_DECL_ARGS_##nargs(args)) { > | ^~~~~~~~~~~~ > [ALL ] ./include/bits/syscalls-common.h:141:41: note: in > expansion of macro 'SYSCALL_FUNC' > [ALL ] 141 | #define _syscall2(args...) > SYSCALL_FUNC(2, args) > [ALL ] | ^~~~~~~~~~~~ > [ALL ] libc/sysdeps/linux/common/fstat64.c:17:24: note: in > expansion of macro '_syscall2' > [ALL ] 17 | static __always_inline _syscall2(int, __syscall_fstat64, > [ALL ] | ^~~~~~~~~ > [ERROR] make[1]: *** [Makerules:373: > libc/sysdeps/linux/common/fstat64.os] Error 1 > [ALL ] make[1]: Leaving directory > '/home/ctng/crosstool-ng/.build/arc-multilib-linux-uclibc/build/build-libc/multilib' > > It looks like maybe arc should be defining > __ARCH_HAS_DEPRECATED_SYSCALLS__ or perhaps declaring kernel_stat64 > differently. Any advice would be much appreciated. Looking at how the code is written in the failing #if condition block of the fstat64.c I'd think that struct kernel_stat64 should be the same as the struct stat64. The history of libc/sysdeps/linux/common-generic/bits/kernel_stat.h suggests that that was so until the commit 74ca8d6f5d2e ("remove UCLIBC_HAS_LFS") removed that definition. It seems to me that that commit removed the wrong leg of the condition, and that the attached change (completely untested) should fix it. -- Thanks. -- Max

3 4

build failure with GCC14 for arc
by judge.packham＠gmail.com 14 May '24

14 May '24

Hi, I'm looking at adding GCC14 to crosstool-ng. I've grabbed the latest uClibc-ng tarball and the commits from master that address some issues already but I'm currently hitting the following error on a arc-multilib-linux-uclibc configuration. [ALL ] libc/sysdeps/linux/common/fstat64.c: In function 'fstat64': [ERROR] libc/sysdeps/linux/common/fstat64.c:33:38: error: passing argument 2 of '__syscall_fstat64' from incompatible pointer type [-Wincompatible-pointer-types] [ALL ] 33 | return __syscall_fstat64(fd, buf); [ALL ] | ^~~ [ALL ] | | [ALL ] | struct stat64 * [ALL ] In file included from ./include/sys/syscall.h:34, [ALL ] from libc/sysdeps/linux/common/fstat64.c:10: [ALL ] libc/sysdeps/linux/common/fstat64.c:18:72: note: expected 'struct stat *' but argument is of type 'struct stat64 *' [ALL ] 18 | int, filedes, struct kernel_stat64 *, buf) [ALL ] | ~~~~~~~~~~~~~~~~~~~~~~~~^~~ [ALL ] ./include/bits/syscalls-common.h:82:43: note: in definition of macro 'C_DECL_ARGS_1' [ALL ] 82 | #define C_DECL_ARGS_1(t, v) t v [ALL ] | ^ [ALL ] ./include/bits/syscalls-common.h:98:11: note: in expansion of macro 'C_DECL_ARGS_2' [ALL ] 98 | type name(C_DECL_ARGS_##nargs(args)) { | ^~~~~~~~~~~~ [ALL ] ./include/bits/syscalls-common.h:141:41: note: in expansion of macro 'SYSCALL_FUNC' [ALL ] 141 | #define _syscall2(args...) SYSCALL_FUNC(2, args) [ALL ] | ^~~~~~~~~~~~ [ALL ] libc/sysdeps/linux/common/fstat64.c:17:24: note: in expansion of macro '_syscall2' [ALL ] 17 | static __always_inline _syscall2(int, __syscall_fstat64, [ALL ] | ^~~~~~~~~ [ERROR] make[1]: *** [Makerules:373: libc/sysdeps/linux/common/fstat64.os] Error 1 [ALL ] make[1]: Leaving directory '/home/ctng/crosstool-ng/.build/arc-multilib-linux-uclibc/build/build-libc/multilib' looking at the code I'm wondering of arc should be defining __ARCH_HAS_DEPRECATED_SYSCALLS__ or maybe declaring kernel_stat64 differently. Any advice would be much appreciated. Thanks, Chris

1 0

[PATCH] malloc/memalign: avoid integer overflow
by Max Filippov 14 May '24

14 May '24

Check that the size passed to memalign() is not greater than PTRDIFF_MAX before adjusting it, otherwise it may wrap around in the adjustment. This fixes gcc testsuite test gcc.dg/torture/pr60092.c Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- libc/stdlib/malloc/memalign.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libc/stdlib/malloc/memalign.c b/libc/stdlib/malloc/memalign.c index 665f20cfbfab..a77b8cebcde7 100644 --- a/libc/stdlib/malloc/memalign.c +++ b/libc/stdlib/malloc/memalign.c @@ -38,6 +38,11 @@ memalign (size_t alignment, size_t size) unsigned long tot_addr, tot_end_addr, addr, end_addr; struct heap_free_area **heap = &__malloc_heap; + if (unlikely(size > PTRDIFF_MAX)) { + __set_errno(ENOMEM); + return NULL; + } + /* Make SIZE something we like. */ size = HEAP_ADJUST_SIZE (size); -- 2.39.2

2 1

[PATCH] test-skeleton: don't force -d on noMMU
by Max Filippov 11 May '24

11 May '24

There's a few tests whose do_test() is supposed to time out or terminate with a signal. Tests communicate it to the test skeleton by defining EXPECTED_SIGNAL or EXPECTED_STATUS and the skeleton completes with success code when that happens. Running test suite in direct mode by default changes that, as a result test running script reports failures for the tests that actually pass or hangs. Instead of switching to direct test running when building for noMMU use vfork() and exec() the test in the child process in direct mode. This makes the default test process behavior the same on MMU and noMMU targets. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- test/test-skeleton.c | 65 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/test/test-skeleton.c b/test/test-skeleton.c index 557996d714cd..323a9c645df3 100644 --- a/test/test-skeleton.c +++ b/test/test-skeleton.c @@ -222,18 +222,15 @@ handler_killpid(int sig) /* We provide the entry point here. */ int -main (int argc, char *argv[]) +main (int argc, char *argv[], char *envp[]) { -#ifdef __ARCH_USE_MMU__ int direct = 0; /* Directly call the test function? */ -#else - int direct = 1; -#endif int status; int opt; unsigned int timeoutfactor = 1; pid_t termpid; char *envstr_timeoutfactor; + char **argv1; /* Make uses of freed and uninitialized memory known. */ #ifdef __MALLOC_STANDARD__ @@ -303,19 +300,21 @@ main (int argc, char *argv[]) /* make sure temporary files are deleted. */ atexit (delete_temp_files); - /* Correct for the possible parameters. */ - argv[optind - 1] = argv[0]; - argv += optind - 1; - argc -= optind - 1; + /* If we are not expected to fork run the function immediately. */ + if (direct) + { + /* Correct for the possible parameters. */ + argv[optind - 1] = argv[0]; + argv += optind - 1; + argc -= optind - 1; - /* Call the initializing function, if one is available. */ + /* Call the initializing function, if one is available. */ #ifdef PREPARE - PREPARE (argc, argv); + PREPARE (argc, argv); #endif - /* If we are not expected to fork run the function immediately. */ - if (direct) - return TEST_FUNCTION; + return TEST_FUNCTION; + } /* Set up the test environment: - prevent core dumps @@ -340,15 +339,51 @@ main (int argc, char *argv[]) if (setpgid (0, 0) != 0) printf ("Failed to set the process group ID: %m\n"); + /* Correct for the possible parameters. */ + argv[optind - 1] = argv[0]; + argv += optind - 1; + argc -= optind - 1; + + /* Call the initializing function, if one is available. */ +#ifdef PREPARE + PREPARE (argc, argv); +#endif + /* Execute the test function and exit with the return value. */ exit (TEST_FUNCTION); } else if (pid < 0) -#endif { perror ("Cannot fork test program"); exit (1); } +#else + argv1 = malloc ((argc + 2) * sizeof(void *)); + argv1[0] = argv[0]; + argv1[1] = "-d"; + memcpy(argv1 + 2, argv + 1, argc * sizeof(void *)); + + pid = vfork (); + if (pid == 0) + { + /* This is the child. */ + /* We put the test process in its own pgrp so that if it bogusly + generates any job control signals, they won't hit the whole build. */ + if (setpgid (0, 0) != 0) + printf ("Failed to set the process group ID: %m\n"); + + if (execve (argv1[0], argv1, envp) < 0) + { + perror ("Cannot exec test program"); + _exit (1); + } + } + else if (pid < 0) + { + perror ("Cannot vfork test program"); + exit (1); + } +#endif #ifdef __XXX_HANDLE_CTRL_C signal (SIGTERM, handler_killpid); -- 2.39.2

2 1

[PATCH 0/3] fixes for build with gcc-14
by Max Filippov 09 May '24

09 May '24

Hello, this series fixes a few type mismatches that have become errors when building with gcc-14. Max Filippov (3): iconv: fix type mismatches ldso: FDPIC: fix type mismatches ldso: arm: fix build with gcc-14 ldso/ldso/arm/elfinterp.c | 6 +++--- ldso/ldso/fdpic/dl-inlines.h | 4 ++-- ldso/ldso/fdpic/dl-sysdep.h | 2 +- libiconv/iconv.c | 8 ++++++-- 4 files changed, 12 insertions(+), 8 deletions(-) -- 2.39.2

2 4

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel May 2024