devel January 2018

devel@uclibc-ng.org

7 participants
11 discussions

by Daniel Dubinsky

Hello, Sorry for the bother but I’ve been struggling with compiling uclibc-ng. All I did was clone; make defconfig; make. I get the following error: CC ldso/ldso/ldso.oS In file included from ./include/bits/posix1_lim.h:152:0, from ./include/limits.h:144, from ./include/sys/param.h:25, from ./ldso/include/ldso.h:43, from ldso/ldso/ldso.c:32: ./include/bits/local_lim.h:38:26: fatal error: linux/limits.h: No such file or directory compilation terminated. Makerules:370: recipe for target 'ldso/ldso/ldso.oS' failed make: *** [ldso/ldso/ldso.oS] Error 1 I’ve tried to remove -nostdinc, the compilation then proceeds but with no success. I also tried to install the following packages: kernel-package, linux-libc-dev, binutils, libc-dev-bin, linux-headers-4.10.0-35 and linux-headers-generic. Can anyone help? Best regards, Daniel Dubinsky

6 years, 5 months

[PATCH 1/1] aarch64/sys/ucontext.h: include bits/sigcontext.h

by Bernd Kuhls

Fixes a buildroot build error with ffmpeg In file included from /home/bernd/buildroot/output/host/aarch64-buildroot-linux-uclibc/sysroot/usr/include/signal.h:329:0, from fftools/ffmpeg.h:26, from fftools/ffmpeg_opt.c:23: /home/bernd/buildroot/output/host/aarch64-buildroot-linux-uclibc/sysroot/usr/include/sys/ucontext.h:52:16: error: field 'uc_mcontext' has incomplete type mcontext_t uc_mcontext; ^~~~~~~~~~~ using this defconfig: BR2_aarch64=y BR2_PACKAGE_FFMPEG=y sys/ucontext.h for other archs already include bits/sigcontext.h, on aarch64 this is needed as well. Signed-off-by: Bernd Kuhls <bernd.kuhls(a)t-online.de> --- libc/sysdeps/linux/aarch64/sys/ucontext.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libc/sysdeps/linux/aarch64/sys/ucontext.h b/libc/sysdeps/linux/aarch64/sys/ucontext.h index d17458896..dc7303b54 100644 --- a/libc/sysdeps/linux/aarch64/sys/ucontext.h +++ b/libc/sysdeps/linux/aarch64/sys/ucontext.h @@ -26,6 +26,10 @@ #include <sys/procfs.h> +/* We need the signal context definitions even if they are not used + included in <signal.h>. */ +#include <bits/sigcontext.h> + typedef elf_greg_t greg_t; /* Container for all general registers. */ -- 2.11.0

6 years, 9 months

[PATCH] xtensa: fix R_XTENSA_TLSDESC_ARG handling in _dl_do_reloc

by Max Filippov

R_XTENSA_TLSDESC_ARG is a true RELA relocation, the addend is in the relocation record itself, not in place. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- ldso/ldso/xtensa/elfinterp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ldso/ldso/xtensa/elfinterp.c b/ldso/ldso/xtensa/elfinterp.c index 4c83ab65e668..e38a02666477 100644 --- a/ldso/ldso/xtensa/elfinterp.c +++ b/ldso/ldso/xtensa/elfinterp.c @@ -244,10 +244,11 @@ _dl_do_reloc (struct elf_resolve *tpnt, struct r_scope_elem *scope, if (!TRY_STATIC_TLS ((struct link_map *) tls_tpnt)) *reloc_addr = (ElfW(Addr)) _dl_make_tlsdesc_dynamic((struct link_map *) tls_tpnt, - symbol_addr + *reloc_addr); + symbol_addr + rpnt->r_addend); else #endif - *reloc_addr += symbol_addr + tls_tpnt->l_tls_offset; + *reloc_addr = symbol_addr + rpnt->r_addend + + tls_tpnt->l_tls_offset; break; #endif -- 2.1.4

6 years, 10 months

[PATCH] xtensa: fix _dl_tlsdesc_dynamic

by Max Filippov

There are multiple errors in _dl_tlsdesc_dynamic: - the reference C implementation should return pointer to the thread-local variable, not offset from the thread pointer, because the xtensa ABI expects TLSDESC_FN to return pointer to the TLS variable; - addx8 used for indexing into dtv has its second and third registers in wrong order, the index must be multiplied by 8, not the base; - the same addx8 uses wrong base: instead of dtv it adds the offset to the threadptr; - the return value in the fast path is calculated as td->tlsinfo.ti_offset - __builtin_thread_pointer, not what was intended; - both fast and slow paths should not subtract __builtin_thread_pointer from the result. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- ldso/ldso/xtensa/dl-tlsdesc.S | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/ldso/ldso/xtensa/dl-tlsdesc.S b/ldso/ldso/xtensa/dl-tlsdesc.S index 6f417f61a98b..426f2180b3c0 100644 --- a/ldso/ldso/xtensa/dl-tlsdesc.S +++ b/ldso/ldso/xtensa/dl-tlsdesc.S @@ -39,7 +39,7 @@ END (_dl_tlsdesc_return) The assembly code that follows is a rendition of the following C code, hand-optimized a little bit. - ptrdiff_t + void * _dl_tlsdesc_dynamic(struct tlsdesc_dynamic_arg *td) { dtv_t *dtv = (dtv_t *)THREAD_DTV(); @@ -47,8 +47,8 @@ END (_dl_tlsdesc_return) && dtv[td->tlsinfo.ti_module].pointer.val != TLS_DTV_UNALLOCATED) return dtv[td->tlsinfo.ti_module].pointer.val - + td->tlsinfo.ti_offset - __builtin_thread_pointer(); - return __tls_get_addr (&td->tlsinfo) - __builtin_thread_pointer(); + + td->tlsinfo.ti_offset; + return __tls_get_addr (&td->tlsinfo); } */ @@ -65,33 +65,30 @@ HIDDEN_ENTRY (_dl_tlsdesc_dynamic) /* && dtv[td->tlsinfo.ti_module].pointer.val != TLS_DTV_UNALLOCATED) */ l32i a6, a2, TLSDESC_MODID - addx8 a6, a3, a6 + addx8 a6, a6, a4 l32i a6, a6, 0 beqi a6, -1, .Lslow /* return dtv[td->tlsinfo.ti_module].pointer.val - + td->tlsinfo.ti_offset - __builtin_thread_pointer(); */ - l32i a6, a2, TLSDESC_MODOFF - sub a2, a6, a3 + + td->tlsinfo.ti_offset; */ + l32i a5, a2, TLSDESC_MODOFF + add a2, a6, a5 abi_ret - /* return __tls_get_addr (&td->tlsinfo) - __builtin_thread_pointer(); */ + /* return __tls_get_addr (&td->tlsinfo); */ .Lslow: #if defined(__XTENSA_WINDOWED_ABI__) mov a6, a2 movi a4, __tls_get_addr callx4 a4 - sub a2, a6, a3 + mov a2, a6 retw #elif defined(__XTENSA_CALL0_ABI__) addi a1, a1, -16 s32i a0, a1, 0 - s32i a3, a1, 4 movi a0, __tls_get_addr callx0 a0 - l32i a3, a1, 4 l32i a0, a1, 0 - sub a2, a2, a3 addi a1, a1, 16 ret #else -- 2.1.4

6 years, 10 months

[PATCH 0/4] Use varargs for common syscall() implementation

by Stafford Horne

Hello, This is a followup to the ("f764bcffe" or1k: syscall: Pass arguments on the stack) patch which fixes the issue where the definition of syscall() in unistd.h and the common implementation in uclibc-ng don't match. This series allows the implementation to match the definition and then goes on to remove generic implementations used by or1k, nds32 and arc. -Stafford Stafford Horne (4): syscall: Make common implementation match unistd.h or1k: Use new common syscall() implementation nds32: Use new common syscall() implementation arc: Use new common syscall() implementation libc/sysdeps/linux/arc/Makefile.arch | 2 +- libc/sysdeps/linux/arc/syscall.c | 17 ----------------- libc/sysdeps/linux/common/syscall.c | 18 +++++++++++++++++- libc/sysdeps/linux/nds32/Makefile.arch | 4 ++-- libc/sysdeps/linux/nds32/syscall.c | 28 ---------------------------- libc/sysdeps/linux/or1k/Makefile.arch | 2 +- libc/sysdeps/linux/or1k/syscall.c | 32 -------------------------------- 7 files changed, 21 insertions(+), 82 deletions(-) delete mode 100644 libc/sysdeps/linux/arc/syscall.c delete mode 100644 libc/sysdeps/linux/nds32/syscall.c delete mode 100644 libc/sysdeps/linux/or1k/syscall.c -- 2.13.6

6 years, 10 months

[PATCH v2] xtensa: fix strcmp

by Max Filippov

Loops with 'loop forever' annotation inside strcmp are actually meant to loop forever. Falling through the end of the first loop may result in equal strings being compared unequal, e.g.: #include <string.h> int main(void) { char a[4096] __attribute__((aligned(4))); char b[4096] __attribute__((aligned(4))); memset(a, ' ', 258 * 8); memset(b, ' ', 258 * 8); a[255 * 8] = 0; a[256 * 8] = 'a'; b[255 * 8] = 0; b[256 * 8] = 'b'; return !(strcmp(a, b) == 0); } Falling through the end of the second loop may result in unequal strings being compared as equal, e.g.: #include <string.h> int main(void) { char a[4096] __attribute__((aligned(4))); char b[4096] __attribute__((aligned(4))); memset(a, ' ', 514 * 6); memset(b, ' ', 514 * 6); a[514 * 6 + 0] = 'a'; a[514 * 6 + 1] = 0; b[514 * 6 + 0] = 'b'; b[514 * 6 + 1] = 0; return !(strcmp(a, b) != 0); } Use 0 as a loop counter to make 2^32 - 1 iterations which is enough to cover all addressable memory. While at it drop useless nop at the end of the first loop and use a11 for all loop counters. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- Changes v1->v2: - wrong test case for the second loop, fixed. libc/string/xtensa/strcmp.S | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libc/string/xtensa/strcmp.S b/libc/string/xtensa/strcmp.S index 2dce590dbd42..a16da5da2e92 100644 --- a/libc/string/xtensa/strcmp.S +++ b/libc/string/xtensa/strcmp.S @@ -92,8 +92,8 @@ ENTRY (strcmp) /* (2 mod 4) alignment for loop instruction */ .Lunaligned: #if XCHAL_HAVE_LOOPS - _movi.n a8, 0 /* set up for the maximum loop count */ - loop a8, .Lretdiff /* loop forever (almost anyway) */ + movi a11, 0 /* set up for the maximum loop count */ + loop a11, .Lretdiff /* loop forever (almost anyway) */ #endif .Lnextbyte: l8ui a8, a2, 0 @@ -131,11 +131,10 @@ ENTRY (strcmp) #if XCHAL_HAVE_LOOPS .Laligned: .begin no-transform + movi a11, 0 l32r a4, .Lmask0 /* mask for byte 0 */ l32r a7, .Lmask4 - /* Loop forever. (a4 is more than than the maximum number - of iterations) */ - loop a4, .Laligned_done + loop a11, .Laligned_done /* Loop forever. */ /* First unrolled loop body. */ l32i a8, a2, 0 /* get word from s1 */ @@ -156,8 +155,6 @@ ENTRY (strcmp) addi a2, a2, 8 /* advance s1 pointer */ addi a3, a3, 8 /* advance s2 pointer */ .Laligned_done: - or a1, a1, a1 /* nop */ - .Lprobeq2: /* Adjust pointers to account for the loop unrolling. */ addi a2, a2, 4 @@ -198,7 +195,7 @@ ENTRY (strcmp) #if XCHAL_HAVE_LOOPS /* align (1 mod 4) */ - loop a4, .Leq /* loop forever (a4 is bigger than max iters) */ + loop a11, .Leq /* loop forever */ .end no-transform l32i a8, a2, 0 /* get word from s1 */ -- 2.1.4

6 years, 10 months

[PATCH] libpthread/nptl: bugfix malloc segfault in race conditions.

by Guo Ren

In libc/sysdeps/linux/common/bits/uClibc_pthread.h: extern void weak_function _pthread_cleanup_push_defer(...) This *weak_function* declaration will cause nptl/cleanup_defer_compat.c: strong_alias (...) !!!FAIL!!!, because it include pthreadP.h->pthread.h ->uClibc_pthread.h That means: Readelf -s libpthread/nptl/cleanup_defer_compat.o you will get: 18: 00000000 198 FUNC WEAK DEFAULT 1 _pthread_cleanup_push_def Readelf -s libc/misc/internals/__uClibc_main.o you will also get: 32: 00000038 58 FUNC WEAK DEFAULT 1 _pthread_cleanup_push_def Final: gcc malloc_pthread_test.c -lpthread The libc/stdlib/malloc-standard/malloc.c:839 (__MALLOC_LOCK-> _pthread_cleanup_push_def) will use the one in __uClibc_main.o !!!not in cleanup_defer_compat.o!!!, becasue two cleanup_defer_compat in libc.a with the same weak declarations and the __uClibc_main.o is close to front. ==== All of malloc/free will failed in muti-threads' race conditions probabilistic. As it happens, uClibc-0.9.33.2 is OK, Becasue: It's seperated in libpthread.a and libc.a, and the libc.a is the last lib for ld internal-cmd, and malloc will get right cleanup_defer_compat from libpthread.a. This BUG is from 2016-09-24 to now: >>> commit 29ff9055c80efe77a7130767a9fcb3ab8c67e8ce Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Sat Sep 24 02:55:31 2016 +0200 use a single libc and deduplicate threading code Similar to musl libc a single libc has many benefits and solves some open issues with uClibc-ng. - no pthread_mutex_* weak symbols exported anymore - applications no longer failing to link when either -lrt or -lpthread are missing for dynamic and static linking mode - smaller C library - slightly better runtime performance <<< Perharps we need carefully check all of the impact about that commit. Signed-off-by: Guo Ren <ren_guo(a)c-sky.com> --- libpthread/nptl/sysdeps/pthread/pthread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpthread/nptl/sysdeps/pthread/pthread.h b/libpthread/nptl/sysdeps/pthread/pthread.h index b2897b3..1fba7fc 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread.h +++ b/libpthread/nptl/sysdeps/pthread/pthread.h @@ -29,7 +29,7 @@ #include <bits/pthreadtypes.h> #include <bits/setjmp.h> #include <bits/wordsize.h> -#if defined _LIBC && ( defined IS_IN_libc || defined NOT_IN_libc ) +#if defined _LIBC && ( defined IS_IN_libc || !defined NOT_IN_libc ) #include <bits/uClibc_pthread.h> #endif -- 2.7.4

6 years, 10 months

[PATCH] xtensa: fix strcmp

by Max Filippov

Loops with 'loop forever' annotation inside strcmp are actually meant to loop forever. Falling through the end of the first loop may result in equal strings being compared unequal, e.g.: #include <string.h> int main(void) { char a[4096] __attribute__((aligned(4))); char b[4096] __attribute__((aligned(4))); memset(a, ' ', 258 * 8); memset(b, ' ', 258 * 8); a[255 * 8] = 0; a[256 * 8] = 'a'; b[255 * 8] = 0; b[256 * 8] = 'b'; return !(strcmp(a, b) == 0); } Falling through the end of the second loop may result in unequal strings being compared as equal, e.g.: #include <string.h> int main(void) { char a[4096] __attribute__((aligned(4))); char b[4096] __attribute__((aligned(4))); memset(a, ' ', 514 * 4); memset(b, ' ', 514 * 4); a[514 * 4 + 0] = 'a'; a[514 * 4 + 1] = 0; b[514 * 4 + 0] = 'b'; b[514 * 4 + 1] = 0; return !(strcmp(a, b) != 0); } Use 0 as a loop counter to make 2^32 - 1 iterations which is enough to cover all addressable memory. While at it drop useless nop at the end of the first loop and use a11 for all loop counters. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- libc/string/xtensa/strcmp.S | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libc/string/xtensa/strcmp.S b/libc/string/xtensa/strcmp.S index 2dce590dbd42..a16da5da2e92 100644 --- a/libc/string/xtensa/strcmp.S +++ b/libc/string/xtensa/strcmp.S @@ -92,8 +92,8 @@ ENTRY (strcmp) /* (2 mod 4) alignment for loop instruction */ .Lunaligned: #if XCHAL_HAVE_LOOPS - _movi.n a8, 0 /* set up for the maximum loop count */ - loop a8, .Lretdiff /* loop forever (almost anyway) */ + movi a11, 0 /* set up for the maximum loop count */ + loop a11, .Lretdiff /* loop forever (almost anyway) */ #endif .Lnextbyte: l8ui a8, a2, 0 @@ -131,11 +131,10 @@ ENTRY (strcmp) #if XCHAL_HAVE_LOOPS .Laligned: .begin no-transform + movi a11, 0 l32r a4, .Lmask0 /* mask for byte 0 */ l32r a7, .Lmask4 - /* Loop forever. (a4 is more than than the maximum number - of iterations) */ - loop a4, .Laligned_done + loop a11, .Laligned_done /* Loop forever. */ /* First unrolled loop body. */ l32i a8, a2, 0 /* get word from s1 */ @@ -156,8 +155,6 @@ ENTRY (strcmp) addi a2, a2, 8 /* advance s1 pointer */ addi a3, a3, 8 /* advance s2 pointer */ .Laligned_done: - or a1, a1, a1 /* nop */ - .Lprobeq2: /* Adjust pointers to account for the loop unrolling. */ addi a2, a2, 4 @@ -198,7 +195,7 @@ ENTRY (strcmp) #if XCHAL_HAVE_LOOPS /* align (1 mod 4) */ - loop a4, .Leq /* loop forever (a4 is bigger than max iters) */ + loop a11, .Leq /* loop forever */ .end no-transform l32i a8, a2, 0 /* get word from s1 */ -- 2.1.4

6 years, 10 months

[PATCH] csky: bugfix libc sync_file_range.c for csky.

by Guo Ren

Use __NR_sync_file_range2 for csky sync_file_range function. Signed-off-by: Guo Ren <ren_guo(a)c-sky.com> --- libc/sysdeps/linux/common/sync_file_range.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libc/sysdeps/linux/common/sync_file_range.c b/libc/sysdeps/linux/common/sync_file_range.c index 3e7c4b5..328869b 100644 --- a/libc/sysdeps/linux/common/sync_file_range.c +++ b/libc/sysdeps/linux/common/sync_file_range.c @@ -27,7 +27,7 @@ static int __NC(sync_file_range)(int fd, off64_t offset, off64_t nbytes, unsigne return INLINE_SYSCALL(sync_file_range, 6, fd, OFF64_HI_LO(offset), OFF64_HI_LO(nbytes), flags); # elif (defined __mips__ && _MIPS_SIM == _ABIO32) || \ - (defined(__UCLIBC_SYSCALL_ALIGN_64BIT__) && !(defined(__powerpc__) || defined(__xtensa__) || defined(__nds32__))) + (defined(__UCLIBC_SYSCALL_ALIGN_64BIT__) && !(defined(__powerpc__) || defined(__xtensa__) || defined(__nds32__) || defined(__csky__))) /* arch with 64-bit data in even reg alignment #2: [arcv2/others-in-future] * stock syscall handler in kernel (reg hole punched) * see libc/sysdeps/linux/common/posix_fadvise.c for more details */ -- 2.7.4

6 years, 10 months

lowlevellock.h patch

by Waldemar Brodkorb

Hi, I would like to push attached patch. No regressions found. Any comments? best regards Waldemar

6 years, 10 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel January 2018