- devel - example.com

[PATCH] libc/sysdeps/linux/common/bits/wchar.h: resync with glibc, fix build issue with gcc 12
by Thomas Petazzoni 14 Jul '23

14 Jul '23

The current definition of __WCHAR_MIN and __WCHAR_MAX are only correct when wchar_t is an int. This is not the case on ARM/AArch64 where wchar_t is an unsigned int, or some other architectures where wchar_t is a long. The current incorrect definition causes a build issue for example when building mpd, which uses boost, with gcc 12.x: In file included from /home/thomas/buildroot/aarch64/host/aarch64-buildroot-linux-uclibc/sysroot/usr/include/boost/integer.hpp:20, from /home/thomas/buildroot/aarch64/host/aarch64-buildroot-linux-uclibc/sysroot/usr/include/boost/crc.hpp:42, from ../src/storage/StorageState.cxx:43: /home/thomas/buildroot/aarch64/host/aarch64-buildroot-linux-uclibc/sysroot/usr/include/boost/integer_traits.hpp:105:69: error: narrowing conversion of ‘-2147483648’ from ‘int’ to ‘wchar_t’ [-Wnarrowing] 105 | public detail::integer_traits_base<wchar_t, WCHAR_MIN, WCHAR_MAX> | ^ This issue was fixed in glibc in 2013, see bug report https://sourceware.org/bugzilla/show_bug.cgi?id=15036, and upstream commit https://sourceware.org/git/?p=glibc.git;a=commit;h=052aff95782fefe9c6356647…. Since the i386-specific definition of __WCHAR_MIN and __WCHAR_MAX was also removed at the same time in glibc, we do the same as part of this commit. Reported-by: Clément Ramirez <clement.ramirez(a)bootlin.com> With-some-useful-help-from: Paul Kocialkowski <paul.kocialkowski(a)bootlin.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- libc/sysdeps/linux/common/bits/wchar.h | 32 ++++++++++++++++++++++---- libc/sysdeps/linux/i386/bits/wchar.h | 25 -------------------- 2 files changed, 28 insertions(+), 29 deletions(-) delete mode 100644 libc/sysdeps/linux/i386/bits/wchar.h diff --git a/libc/sysdeps/linux/common/bits/wchar.h b/libc/sysdeps/linux/common/bits/wchar.h index a3ff5319e..50c7ef37b 100644 --- a/libc/sysdeps/linux/common/bits/wchar.h +++ b/libc/sysdeps/linux/common/bits/wchar.h @@ -1,5 +1,5 @@ /* wchar_t type related definitions. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000-2022 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -14,12 +14,36 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ + <https://www.gnu.org/licenses/>. */ #ifndef _BITS_WCHAR_H #define _BITS_WCHAR_H 1 -#define __WCHAR_MIN (-2147483647 - 1) -#define __WCHAR_MAX (2147483647) +/* The fallback definitions, for when __WCHAR_MAX__ or __WCHAR_MIN__ + are not defined, give the right value and type as long as both int + and wchar_t are 32-bit types. Adding L'\0' to a constant value + ensures that the type is correct; it is necessary to use (L'\0' + + 0) rather than just L'\0' so that the type in C++ is the promoted + version of wchar_t rather than the distinct wchar_t type itself. + Because wchar_t in preprocessor #if expressions is treated as + intmax_t or uintmax_t, the expression (L'\0' - 1) would have the + wrong value for WCHAR_MAX in such expressions and so cannot be used + to define __WCHAR_MAX in the unsigned case. */ + +#ifdef __WCHAR_MAX__ +# define __WCHAR_MAX __WCHAR_MAX__ +#elif L'\0' - 1 > 0 +# define __WCHAR_MAX (0xffffffffu + L'\0') +#else +# define __WCHAR_MAX (0x7fffffff + L'\0') +#endif + +#ifdef __WCHAR_MIN__ +# define __WCHAR_MIN __WCHAR_MIN__ +#elif L'\0' - 1 > 0 +# define __WCHAR_MIN (L'\0' + 0) +#else +# define __WCHAR_MIN (-__WCHAR_MAX - 1) +#endif #endif /* bits/wchar.h */ diff --git a/libc/sysdeps/linux/i386/bits/wchar.h b/libc/sysdeps/linux/i386/bits/wchar.h deleted file mode 100644 index b94fc7a3f..000000000 --- a/libc/sysdeps/linux/i386/bits/wchar.h +++ /dev/null @@ -1,25 +0,0 @@ -/* wchar_t type related definitions. - Copyright (C) 2000 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#ifndef _BITS_WCHAR_H -#define _BITS_WCHAR_H 1 - -#define __WCHAR_MIN (-2147483647l - 1l) -#define __WCHAR_MAX (2147483647l) - -#endif /* bits/wchar.h */ -- 2.41.0

2 1

[PATCH] Fix exec-null test for newer kernels
by Yann Sionneau 15 Jun '23

15 Jun '23

From: Yann Sionneau <ysionneau(a)kalrayinc.com> Without this patch, since https://github.com/torvalds/linux/commit/dcd46d897adb70d63e025f175a00a89797… this test runs in infinite loop. Signed-off-by: Yann Sionneau <ysionneau(a)kalrayinc.com> --- test/unistd/exec-null.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/unistd/exec-null.c b/test/unistd/exec-null.c index 3df99f3..0f79b3d 100644 --- a/test/unistd/exec-null.c +++ b/test/unistd/exec-null.c @@ -4,7 +4,12 @@ int main(int argc, char *argv[]) { - if (argc == 0) + /* since Linux https://github.com/torvalds/linux/commit/dcd46d897adb70d63e025f175a00a89797… + * kernel forces an empty first arg if execve is called + * with argv == NULL. + * so we need to handle argc == 1 for newer kernel as well + */ + if (argc == 0 || argc == 1) return 0; char *exec_argv[1], *exec_envp[1]; -- 2.17.1

2 1

[PATCH 1/2] Revert "librt: avoid compilation error"
by Yann Sionneau 14 Jun '23

14 Jun '23

This reverts commit 08d46f1ce21e4ec51b2b1626beeaea6cbe7fdc6b. Signed-off-by: Yann Sionneau <yann(a)sionneau.net> --- librt/clock_nanosleep.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/librt/clock_nanosleep.c b/librt/clock_nanosleep.c index 1515cf5b0..4cf1e06b4 100644 --- a/librt/clock_nanosleep.c +++ b/librt/clock_nanosleep.c @@ -36,9 +36,9 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, if (clock_id == CLOCK_PROCESS_CPUTIME_ID) clock_id = MAKE_PROCESS_CPUCLOCK (0, CPUCLOCK_SCHED); -#if defined(SINGLE_THREAD_P) + if (SINGLE_THREAD_P) r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, req, rem); -#else + else { int oldstate = LIBC_CANCEL_ASYNC (); @@ -47,7 +47,6 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, LIBC_CANCEL_RESET (oldstate); } -#endif return (INTERNAL_SYSCALL_ERROR_P (r, err) ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); -- 2.34.1

2 2

Re: Revert request and discussion about "librt: avoid compilation error"
by Damien Le Moal 12 Jun '23

12 Jun '23

On 2023/06/07 23:57, Yann Sionneau wrote: > Hello uClibc-ng hackers, Damien, Rich, > > I am sending this email to discuss the possibility to revert > https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=08d46f1ce21e4e… > > I think this change is wrong, I have been tracking an issue for a few > days and I am pretty sure the issue comes from this commit. > > Basically what happens is that with this commit, tst-cancel18 test is > failing. > > The test is available over there: > https://github.com/wbx-github/uclibc-ng-test/blob/master/test/nptl/tst-canc… > > The reason for this fail is that clock_nanosleep code from libc is badly > compiled: > https://elixir.bootlin.com/uclibc-ng/latest/source/librt/clock_nanosleep.c#… > > Because SINGLE_THREAD_P is actually defined, in case your libc build > supports NPTL threads (which is, I think, the majority of configs, > except very old systems using LINUXTHREADS or NOMMU maybe). > > In my case (kvx arch): > > #define SINGLE_THREAD_P __builtin_expect (THREAD_GETMEM (THREAD_SELF, > header.multiple_threads) == 0, 1) > > See: > https://elixir.bootlin.com/uclibc-ng/latest/source/libpthread/nptl/sysdeps/… > > This results to clock_nanosleep code being compiled to a very simple > version that directly calls the syscall and does not change at all the > thread cancellability to asynchronous before calling the syscall. > > Therefore, when the test main thread calls pthread_cancel(), no signal > is sent (see > https://elixir.bootlin.com/uclibc-ng/latest/source/libpthread/nptl/pthread_…) > and therefore the nanosleep syscall is never interrupted and the test fails. > > clock_nanosleep is defined to be a mandatory cancellation point by > POSIX, it must be interruptible in all cases by pthread_cancel, whether > in synchronous or asynchronous mode. > > I think the fix for the NOMMU case should be different, maybe checking > for if LIBC_CANCEL_ASYNC is defined ? > > Damien do you have time to work on a new fix for the NOMMU case? Are you > OK with the revert? Not OK with a revert as that will bring back the compilation errors for RISC-V NOMMU case. Instead, please work on a fix for your case on top of the current code. If I recall correctly, the code around this is rather messy with lots of ifdefs, which may be why this regression was introduced. Cleaning up the code first to avoid that may help avoiding further issues in the future. Note that to test patches/regressions for risc-v NOMMU builds, you can simply use buildroot and run: make sipeed_maix_bit_defconfig make To check that it builds. > > Can someone confirm my analysis here? > > Thanks! > > Best regards, > -- Damien Le Moal Western Digital Research

4 5

test
by Yann Sionneau 08 Jun '23

08 Jun '23

test

1 0

Re: vdso support
by lordrasmus＠gmail.com 30 May '23

30 May '23

1 0

vdso support
by Ramin Moussavi 30 May '23

30 May '23

there was a file missing

1 0

vdso support
by Ramin Moussavi 30 May '23

30 May '23

1 0

(fwd) Possible memory leak in libdl.c [kaischoening@gmail.com]
by Waldemar Brodkorb 19 May '23

19 May '23

any ideas? best regards Waldemar

1 0

Implement 'futimesat' function for architectures where Linux does not provide a futimesat syscall.
by Elliot Thomas 13 Mar '23

13 Mar '23

Recently I tried compiling QEMU user emulation with uClibc on Aarch64, and found the 'futimesat' symbol was missing (but still defined in headers). This emulation is similar to the 'lutimesat' emulation. Regards, Elliot.

2 1