devel

devel@uclibc-ng.org

3 participants
1117 discussions

[PATCH] Fix errors due to absent sys/asm.h in mips64 musl build

by Dmitry Chestnykh

Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- test/tls/tls-macros-mips.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/test/tls/tls-macros-mips.h b/test/tls/tls-macros-mips.h index eed0938..bd4c5c4 100644 --- a/test/tls/tls-macros-mips.h +++ b/test/tls/tls-macros-mips.h @@ -1,7 +1,40 @@ /* Macros to support TLS testing in times of missing compiler support. */ #include <sys/cdefs.h> +#if defined(__has_include) && __has_include(<sys/asm.h>) #include <sys/asm.h> +#else + +#define __STRING(x) #x + +#if ((_MIPS_SIM == _MIPS_SIM_ABI32 || _MIPS_SIM == _ABI32) && _MIPS_SZPTR == 32) +#define PTR_ADDIU addiu +#define PTR_L lw +#endif + +#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _NABI32 + +#if !defined __mips_isa_rev || __mips_isa_rev < 6 +#define PTR_ADDU add +#define PTR_ADDIU addi +#else +#define PTR_ADDU addu +#define PTR_ADDIU addiu +#endif + +#define PTR_L lw +#endif + +#if ((_MIPS_SIM == _MIPS_SIM_ABI32 || _MIPS_SIM == _ABI32) && _MIPS_SZPTR == 64) \ + || _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _ABIN32 + +#define PTR_ADDU daddu +#define PTR_ADDIU daddiu +#define PTR_L ld + +#endif + +#endif #define __STRING2(X) __STRING(X) #define ADDU __STRING2(PTR_ADDU) -- 2.45.2

1 day, 20 hours

[PATCH v2] [sh4] Fix sh4 compilation with 4.x kernel headers

by Dmitry Chestnykh

- Fallback to __NR_stat syscall in ld.so if we use 4.x kernel headers. 4.x kernel doesn't support 64-bit time so we can use old syscall - Add preprocessor conditions to have fstat64 and fstatat64 in libc with old kernel headers Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- ldso/include/dl-syscall.h | 4 +++- libc/sysdeps/linux/common/fstat64.c | 3 ++- libc/sysdeps/linux/common/fstatat64.c | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 4f41034ad..9ec0eac60 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -17,6 +17,8 @@ extern int _dl_errno; #define __set_errno(X) {(_dl_errno) = (X);} #endif +#include <linux/version.h> + /* Pull in the arch specific syscall implementation */ #include <dl-syscalls.h> /* For MAP_ANONYMOUS -- differs between platforms */ @@ -139,7 +141,7 @@ static __always_inline int _dl_stat(const char *file_name, { return _dl_newfstatat(AT_FDCWD, file_name, buf, 0); } -#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) +#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) || (LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) # define __NR__dl_stat __NR_stat static __always_inline _syscall2(int, _dl_stat, const char *, file_name, struct stat *, buf) diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c index 359c22af6..121b21fc8 100644 --- a/libc/sysdeps/linux/common/fstat64.c +++ b/libc/sysdeps/linux/common/fstat64.c @@ -8,8 +8,9 @@ #include <_lfs_64.h> #include <sys/syscall.h> +#include <linux/version.h> -#if defined(__NR_fstat64) && !defined(__UCLIBC_USE_TIME64__) +#if defined(__NR_fstat64) && (!defined(__UCLIBC_USE_TIME64__) || LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) # include <unistd.h> # include <sys/stat.h> # include "xstatconv.h" diff --git a/libc/sysdeps/linux/common/fstatat64.c b/libc/sysdeps/linux/common/fstatat64.c index 16dbf9215..739e84081 100644 --- a/libc/sysdeps/linux/common/fstatat64.c +++ b/libc/sysdeps/linux/common/fstatat64.c @@ -9,6 +9,7 @@ #include <_lfs_64.h> #include <bits/wordsize.h> #include <sys/syscall.h> +#include <linux/version.h> #if defined __mips__ # include <sgidefs.h> @@ -23,7 +24,7 @@ # define __NR_fstatat64 __NR_newfstatat #endif -#if defined(__NR_fstatat64) && !defined(__UCLIBC_USE_TIME64__) +#if defined(__NR_fstatat64) && (!defined(__UCLIBC_USE_TIME64__) || LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) # include <sys/stat.h> # include "xstatconv.h" int fstatat64(int fd, const char *file, struct stat64 *buf, int flag) -- 2.45.2

4 days, 19 hours

[PATCH] arm: Replace deprecated asm instructions for ARMv8 AArch32

by Marcus Haehnel

From: Valentin Gehrke <valentin.gehrke(a)kernkonzept.com> ARMv8 has particular restrictions which coprocessor can be used and as such these instructions, which were likely used for backwards compatibility purposes, cannot be used on ARMv8. We solve this by checking for ARMv8 and then using the corresponding mnemonics which were placed in comments alongside the instructions causing issues. Fixes the following errors: .../setjmp.S:59:6: error: invalid operand for instruction stc p11, cr8, [r12], #68 ^ .../setjmp.S:62:6: error: invalid operand for instruction mrc p10, 7, r2, cr1, cr0, 0 ^ .../__longjmp.S:69:6: error: invalid operand for instruction ldc p11, cr8, [r12], #68 ^ .../__longjmp.S:73:6: error: invalid operand for instruction mcr p10, 7, r1, cr1, cr0, 0 ^ Signed-off-by: Marcus Haehnel <marcus.haehnel(a)kernkonzept.com> --- libc/sysdeps/linux/arm/__longjmp.S | 8 ++++++++ libc/sysdeps/linux/arm/setjmp.S | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/libc/sysdeps/linux/arm/__longjmp.S b/libc/sysdeps/linux/arm/__longjmp.S index 58ae8ab58..a5ffe84e9 100644 --- a/libc/sysdeps/linux/arm/__longjmp.S +++ b/libc/sysdeps/linux/arm/__longjmp.S @@ -64,6 +64,13 @@ __longjmp: #if defined __UCLIBC_HAS_FLOATS__ && ! defined __UCLIBC_HAS_SOFT_FLOAT__ #ifdef __VFP_FP__ +# if __ARM_ARCH >= 8 + /* Restore the VFP registers. */ + fldmiax ip!, {d8-d15} + /* Restore the floating-point status register. */ + ldr r1, [ip], #4 + fmxr fpscr, r1 +# else /* Restore the VFP registers. */ /* Following instruction is fldmiax ip!, {d8-d15}. */ ldc p11, cr8, [r12], #68 @@ -71,6 +78,7 @@ __longjmp: ldr r1, [ip], #4 /* Following instruction is fmxr fpscr, r1. */ mcr p10, 7, r1, cr1, cr0, 0 +# endif # elif defined __MAVERICK__ cfldrd mvd4, [ip], #8 ; nop cfldrd mvd5, [ip], #8 ; nop diff --git a/libc/sysdeps/linux/arm/setjmp.S b/libc/sysdeps/linux/arm/setjmp.S index f7a74cc5a..d5bc9ba65 100644 --- a/libc/sysdeps/linux/arm/setjmp.S +++ b/libc/sysdeps/linux/arm/setjmp.S @@ -54,6 +54,13 @@ __sigsetjmp: #endif #if defined __UCLIBC_HAS_FLOATS__ && ! defined __UCLIBC_HAS_SOFT_FLOAT__ # ifdef __VFP_FP__ +# if __ARM_ARCH >= 8 + /* Store the VFP registers. */ + fstmiax ip!, {d8-d15} + /* Store the floating-point status register. */ + fmrx r2, fpscr + str r2, [ip], #4 +# else /* Store the VFP registers. */ /* Following instruction is fstmiax ip!, {d8-d15}. */ stc p11, cr8, [r12], #68 @@ -61,6 +68,7 @@ __sigsetjmp: /* Following instruction is fmrx r2, fpscr. */ mrc p10, 7, r2, cr1, cr0, 0 str r2, [ip], #4 +# endif # elif defined __MAVERICK__ cfstrd mvd4, [ip], #8 ; nop cfstrd mvd5, [ip], #8 ; nop -- 2.45.2

4 days, 19 hours

[PATCH] [sh4] Fix sh4 compilation with 4.x kernel headers

by Dmitry Chestnykh

- Fallback to __NR_stat syscall in ld.so if we use 4.x kernel headers. 4.x kernel doesn't support 64-bit time so we can use old syscall - Add fallback fstat64 implementation. With 4.x kernel headers we don't reach previous ifdef-elif blocks. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- ldso/include/dl-syscall.h | 4 +++- libc/sysdeps/linux/common/fstat64.c | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 4f41034ad..9ec0eac60 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -17,6 +17,8 @@ extern int _dl_errno; #define __set_errno(X) {(_dl_errno) = (X);} #endif +#include <linux/version.h> + /* Pull in the arch specific syscall implementation */ #include <dl-syscalls.h> /* For MAP_ANONYMOUS -- differs between platforms */ @@ -139,7 +141,7 @@ static __always_inline int _dl_stat(const char *file_name, { return _dl_newfstatat(AT_FDCWD, file_name, buf, 0); } -#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) +#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) || (LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) # define __NR__dl_stat __NR_stat static __always_inline _syscall2(int, _dl_stat, const char *, file_name, struct stat *, buf) diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c index 359c22af6..60948bdfc 100644 --- a/libc/sysdeps/linux/common/fstat64.c +++ b/libc/sysdeps/linux/common/fstat64.c @@ -50,4 +50,12 @@ int fstat64(int fd, struct stat64 *buf) return rc; } libc_hidden_def(fstat64) +#else +# include <sys/stat.h> +# define __NR___syscall_fstat64 __NR_fstat64 +static __always_inline _syscall2(int, __syscall_fstat64, + int, filedes, struct kernel_stat64 *, buf) +int fstat64(int fd, struct stat64 *buf) { + return __syscall_fstat64(fd, buf); +} #endif -- 2.45.2

1 week

[PATCH] allow to use <sys/ucontext.h>

by Waldemar Brodkorb

For architectures without ucontext implementation it is possible to use libucontext with this small adaptation. Signed-off-by: Waldemar Brodkorb <wbx(a)openadk.org> --- include/ucontext.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ucontext.h b/include/ucontext.h index 4ce114ef1..76b4f375e 100644 --- a/include/ucontext.h +++ b/include/ucontext.h @@ -23,11 +23,11 @@ #include <features.h> -#ifdef __UCLIBC_HAS_CONTEXT_FUNCS__ - /* Get machine dependent definition of data structures. */ #include <sys/ucontext.h> +#ifdef __UCLIBC_HAS_CONTEXT_FUNCS__ + __BEGIN_DECLS /* Get user context and store it in variable pointed to by UCP. */ -- 2.30.2

1 week, 2 days

[PATCH v2] ldso/dl-vdso: avoid compiler warning if configured without vdso

by Marcus Haehnel

The parameters are not used in the function variant without vdso support, so tell this to the compiler to avoid a warning. Also fix the indentation to be in-line with other functions in the file. Signed-off-by: Marcus Haehnel <marcus.haehnel(a)kernkonzept.com> --- ldso/ldso/dl-vdso.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ldso/ldso/dl-vdso.c b/ldso/ldso/dl-vdso.c index 196cbbb3b..01309011d 100755 --- a/ldso/ldso/dl-vdso.c +++ b/ldso/ldso/dl-vdso.c @@ -28,14 +28,14 @@ #ifndef __VDSO_SUPPORT__ - void load_vdso(void *sys_info_ehdr, char **envp ){ +void load_vdso( void *sys_info_ehdr attribute_unused, + char **envp attribute_unused ){ #ifdef __SUPPORT_LD_DEBUG__ - if ( _dl_debug_vdso != 0 ){ - _dl_dprintf(2,"_dl_vdso support not enabled\n" ); - } - -#endif + if ( _dl_debug_vdso != 0 ){ + _dl_dprintf(2,"_dl_vdso support not enabled\n" ); } +#endif +} #else void *_dl__vdso_gettimeofday = 0; -- 2.45.2

2 weeks, 2 days

[PATCH] buildsys: allow building with gcc-14

by Marcus Haehnel

GCC-14 requires all functions to have an explicit return type. An implicit return type is no longer supported. main() in the ncurses link check was declared without return type. Add it to make this work on GCC-14. See also: https://gcc.gnu.org/gcc-14/porting_to.html Signed-off-by: Marcus Haehnel <marcus.haehnel(a)kernkonzept.com> --- extra/config/lxdialog/check-lxdialog.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/config/lxdialog/check-lxdialog.sh b/extra/config/lxdialog/check-lxdialog.sh index 9d2a4c585..66bfcb549 100644 --- a/extra/config/lxdialog/check-lxdialog.sh +++ b/extra/config/lxdialog/check-lxdialog.sh @@ -43,7 +43,7 @@ trap "rm -f $tmp" 0 1 2 3 15 check() { $cc -x c - -o $tmp 2>/dev/null <<'EOF' #include CURSES_LOC -main() {} +int main() {} EOF if [ $? != 0 ]; then echo " *** Unable to find the ncurses libraries or the" 1>&2 -- 2.45.2

2 weeks, 3 days

[PATCH v2] Clang support for gnu_inline attribute

by Marcus Haehnel

From: Marcus Hähnel <marcus.haehnel(a)kernkonzept.com> Clang also supports the gnu_inline attribute and the __GNUC_STDC_INLINE__ macro (C99 semantics). However, it reports as GCC 4.2 compatible (__GNUC_MINOR__ / __GNUC__) and thus the current defines do not think it can support this. Add clang as an alternative for this support. Documentation shows that this attribute is supported since at least Clang 8. Signed-off-by: Marcus Haehnel <marcus.haehnel(a)kernkonzept.com> --- include/sys/cdefs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h index 9b3a02177..656548c52 100644 --- a/include/sys/cdefs.h +++ b/include/sys/cdefs.h @@ -320,7 +320,7 @@ inline semantics, unless -fgnu89-inline is used. For -std=gnu99, forcing gnu_inline attribute does not change behavior, but may silence spurious warnings (such as in GCC 4.2). */ -#if !defined __cplusplus || __GNUC_PREREQ (4,3) +#if !defined __cplusplus || __GNUC_PREREQ (4,3) || __CLANG_PREREQ(8,0) # if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ || defined __cplusplus # define __extern_inline extern __inline __attribute__ ((__gnu_inline__)) # if __GNUC_PREREQ (4,3) -- 2.45.2

2 weeks, 3 days

[PATCH v2] features.h: add clang prerequisite macro

by Marcus Haehnel

This can be used to guard fatures for specific clang versions. Signed-off-by: Marcus Haehnel <marcus.haehnel(a)kernkonzept.com> --- include/features.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/features.h b/include/features.h index b5d4e79f2..1a4efb9db 100644 --- a/include/features.h +++ b/include/features.h @@ -140,6 +140,18 @@ # define __GNUC_PREREQ(maj, min) 0 #endif +/* Convenience macro to test the version of clang. + Use like this: + #if __CLANG_PREREQ(3,2) + ... code requiring clang 3.2 or later ... + #endif */ +#if defined __clang__ +# define __CLANG_PREREQ(maj, min) \ + ((__clang_major__ << 16) + __clang_minor__ >= ((maj) << 16) + (min)) +#else +# define __CLANG_PREREQ(maj, min) 0 +#endif + /* Whether to use feature set F. */ #define __GLIBC_USE(F) __GLIBC_USE_ ## F -- 2.45.2

2 weeks, 3 days

[PATCH v2] c++: Remove deprecated dynamic exception specification

by Marcus Haehnel

From: Sven Linker <sven.linker(a)kernkonzept.com> Dynamic exception specification using `throw()` is deprecated since C++11 and removed in C++17. This change replaces `throw()` with `noexcept` when compiling for newer standards. Co-authored-by: Sven Linker <sven.linker(a)kernkonzept.com> Signed-off-by: Marcus Haehnel <marcus.haehnel(a)kernkonzept.com> --- include/sys/cdefs.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h index 5c4daebcd..9b3a02177 100644 --- a/include/sys/cdefs.h +++ b/include/sys/cdefs.h @@ -58,9 +58,15 @@ # define __NTH(fct) __attribute__ ((__nothrow__ __LEAF)) fct # else # if defined __cplusplus && __GNUC_PREREQ (2,8) -# define __THROW throw () -# define __THROWNL throw () -# define __NTH(fct) __LEAF_ATTR fct throw () +/* Dynamic exception specification is deprecated since C++11, so + we only use it when compiling for an earlier standard. */ +# if __cplusplus < 201103UL +# define __THROW throw () +# else +# define __THROW noexcept +# endif +# define __THROWNL __THROW +# define __NTH(fct) __LEAF_ATTR fct __THROW # else # define __THROW # define __THROWNL -- 2.45.2

2 weeks, 3 days

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel