devel

devel@uclibc-ng.org

2 participants
1078 discussions

by Max Filippov

This series adds FDPIC ABI support as specified in the revision 1 of the https://github.com/jcmvbkbc/xtensa-abi/blob/master/fdpic-xtensa.txt This implementation conflicts with the changes made for ARM FDPIC and it reverts the conflicting change. Reverting the corresponding change in the gcc is required to keep the ARM FDPIC port functional. Max Filippov (2): xtensa: add FDPIC support Revert "Allow to generate PIE 'static' binary" Rules.mak | 4 + extra/Configs/Config.in | 2 +- extra/Configs/Config.in.arch | 2 +- include/elf.h | 6 +- ldso/ldso/xtensa/dl-inlines.h | 1 + ldso/ldso/xtensa/dl-startup.h | 91 ++++++++++++++- ldso/ldso/xtensa/dl-sysdep.h | 66 ++++++++++- ldso/ldso/xtensa/dl-tlsdesc.S | 10 +- ldso/ldso/xtensa/elfinterp.c | 114 ++++++++++++++----- libc/misc/internals/__uClibc_main.c | 45 -------- libc/sysdeps/linux/xtensa/__start_context.S | 6 +- libc/sysdeps/linux/xtensa/bits/elf-fdpic.h | 117 ++++++++++++++++++++ libc/sysdeps/linux/xtensa/clone.S | 6 + libc/sysdeps/linux/xtensa/crt1.S | 81 ++++++++++++++ libc/sysdeps/linux/xtensa/crti.S | 8 ++ libc/sysdeps/linux/xtensa/crtn.S | 6 + libc/sysdeps/linux/xtensa/crtreloc.c | 105 ++++++++++++++++++ libc/sysdeps/linux/xtensa/getcontext.S | 1 + libc/sysdeps/linux/xtensa/makecontext.c | 5 + libc/sysdeps/linux/xtensa/setcontext.S | 1 + libc/sysdeps/linux/xtensa/setjmp.S | 3 +- libc/sysdeps/linux/xtensa/swapcontext.S | 1 + libc/sysdeps/linux/xtensa/sysdep.h | 48 +++++++- libpthread/nptl/sysdeps/xtensa/dl-tls.h | 33 ++++-- 24 files changed, 671 insertions(+), 91 deletions(-) create mode 100644 ldso/ldso/xtensa/dl-inlines.h create mode 100644 libc/sysdeps/linux/xtensa/bits/elf-fdpic.h create mode 100644 libc/sysdeps/linux/xtensa/crtreloc.c -- 2.39.2

5 hours, 34 minutes

[PATCH] xtensa: add FDPIC-specific TLS macro variants

by Max Filippov

Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- test/tls/tls-macros-xtensa.h | 78 +++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/test/tls/tls-macros-xtensa.h b/test/tls/tls-macros-xtensa.h index 90fc726f6f6b..6b2621c221cb 100644 --- a/test/tls/tls-macros-xtensa.h +++ b/test/tls/tls-macros-xtensa.h @@ -22,6 +22,78 @@ : "a8", "a9", "a10", "a11", "a12", "a13", "a14", "a15"); \ __l; }) #elif defined(__XTENSA_CALL0_ABI__) +#ifdef __FDPIC__ +#define TLS_GD(x) \ + ({ int *__l; \ + int __t; \ + extern unsigned long _GLOBAL_OFFSET_TABLE_[]; \ + __asm__ ("movi %[tmp], " #x "@GOTTLSDESC\n\t" \ + ".reloc ., R_XTENSA_TLS_ARG, " #x "\n\t" \ + "add a2, %[tmp], %[got]\n\t" \ + ".reloc ., R_XTENSA_TLS_FUNCDESC, " #x "\n\t" \ + "l32i %[tmp], a2, 0\n\t" \ + "mov a12, a11\n\t" \ + ".reloc ., R_XTENSA_TLS_GOT, " #x "\n\t" \ + "l32i a11, %[tmp], 4\n\t" \ + ".reloc ., R_XTENSA_TLS_FUNC, " #x "\n\t" \ + "_l32i %[tmp], %[tmp], 0\n\t" \ + ".reloc ., R_XTENSA_TLS_CALL, " #x "\n\t" \ + "callx0 %[tmp]\n\t" \ + "mov a11, a12\n\t" \ + "mov %[res], a2\n\t" \ + : [res] "=r" (__l), [tmp] "=&r" (__t) \ + : [got] "r" (_GLOBAL_OFFSET_TABLE_) \ + : "a0", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "a10", "a12");\ + __l; }) + +#define TLS_LD(x) \ + ({ int *__l; \ + int __t; \ + extern unsigned long _GLOBAL_OFFSET_TABLE_[]; \ + __asm__ ("movi %[tmp], _TLS_MODULE_BASE_@GOTTLSDESC\n\t" \ + ".reloc ., R_XTENSA_TLS_ARG, _TLS_MODULE_BASE_\n\t" \ + "add a2, %[tmp], %[got]\n\t" \ + ".reloc ., R_XTENSA_TLS_FUNCDESC, _TLS_MODULE_BASE_\n\t"\ + "l32i %[tmp], a2, 0\n\t" \ + "mov a12, a11\n\t" \ + ".reloc ., R_XTENSA_TLS_GOT, _TLS_MODULE_BASE_\n\t" \ + "l32i a11, %[tmp], 4\n\t" \ + ".reloc ., R_XTENSA_TLS_FUNC, _TLS_MODULE_BASE_\n\t" \ + "_l32i %[tmp], %[tmp], 0\n\t" \ + ".reloc ., R_XTENSA_TLS_CALL, _TLS_MODULE_BASE_\n\t" \ + "callx0 %[tmp]\n\t" \ + "mov a11, a12\n\t" \ + "movi %[res], " #x "@DTPOFF\n\t" \ + "add %[res], %[res], a2\n\t" \ + : [res] "=r" (__l), [tmp] "=&r" (__t) \ + : [got] "r" (_GLOBAL_OFFSET_TABLE_) \ + : "a0", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "a10", "a12");\ + __l; }) + +#define TLS_IE(x) \ + ({ int *__l; \ + int __t; \ + extern unsigned long _GLOBAL_OFFSET_TABLE_[]; \ + __asm__ ("movi %[tmp], " #x "@GOTTPOFF\n\t" \ + ".reloc ., R_XTENSA_TLS_TPOFF_PTR, " #x "\n\t" \ + "add %[tmp], %[tmp], %[got]\n\t" \ + ".reloc ., R_XTENSA_TLS_TPOFF_LOAD, " #x "\n\t" \ + "l32i %[tmp], %[tmp], 0\n\t" \ + "rur %[res], threadptr\n\t" \ + "add %[res], %[res], %[tmp]\n\t" \ + : [res] "=r" (__l), [tmp] "=&r" (__t) \ + : [got] "r" (_GLOBAL_OFFSET_TABLE_)); \ + __l; }) + +#define TLS_LE(x) \ + ({ int *__l; \ + int __t; \ + __asm__ ("rur %0, threadptr\n\t" \ + "movi %1, " #x "@TPOFF\n\t" \ + "add %0, %0, %1\n\t" \ + : "=r" (__l), "=r" (__t) ); \ + __l; }) +#else #define TLS_GD(x) \ ({ int *__l; \ __asm__ ("movi a0, " #x "@TLSFUNC\n\t" \ @@ -44,10 +116,12 @@ : \ : "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "a10", "a11");\ __l; }) +#endif #else #error Unsupported Xtensa ABI #endif +#ifndef __FDPIC__ #define TLS_IE(x) TLS_LE(x) #define TLS_LE(x) \ @@ -57,5 +131,5 @@ "movi %1, " #x "@TPOFF\n\t" \ "add %0, %0, %1\n\t" \ : "=r" (__l), "=r" (__t) ); \ - __l; }); \ - + __l; }) +#endif -- 2.39.2

4 days, 3 hours

[PATCH] iconv/tst-iconv5: fix ic variable type

by Max Filippov

Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- test/iconv/tst-iconv5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/iconv/tst-iconv5.c b/test/iconv/tst-iconv5.c index ff3fde5eb180..f8f4fb57c86b 100644 --- a/test/iconv/tst-iconv5.c +++ b/test/iconv/tst-iconv5.c @@ -59,7 +59,7 @@ static int convert (const char *tocode, const char *fromcode, char *inbufp, size_t inbytesleft, char *outbufp, size_t outbytesleft) { - iconv_t *ic; + iconv_t ic; size_t outbytes = outbytesleft; int ret; -- 2.39.2

4 days, 3 hours

[PATCH] xtensa: make _init and _fini hidden

by Max Filippov

Make _init and _fini hidden so that references to these symbols bind locally in the shared objects. glibc does the same. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- libc/sysdeps/linux/xtensa/crti.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libc/sysdeps/linux/xtensa/crti.S b/libc/sysdeps/linux/xtensa/crti.S index ba804eb454e6..43e66e30820b 100644 --- a/libc/sysdeps/linux/xtensa/crti.S +++ b/libc/sysdeps/linux/xtensa/crti.S @@ -3,6 +3,7 @@ .section .init .align 4 .global _init + .hidden _init .type _init, @function _init: #if defined(__XTENSA_WINDOWED_ABI__) @@ -17,6 +18,7 @@ _init: .section .fini .align 4 .global _fini + .hidden _fini .type _fini, @function _fini: #if defined(__XTENSA_WINDOWED_ABI__) -- 2.39.2

4 days, 3 hours

[PATCH] xtensa: use compiler-provided XCHAL macros

by Max Filippov

Starting with gcc-13 the compiler provides configuration-specific macro definitions for the target xtensa core. Use them when available instead of the configuration overlay file xtensa-config.h Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- .../sysdeps/linux/xtensa/bits/xtensa-config.h | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libc/sysdeps/linux/xtensa/bits/xtensa-config.h b/libc/sysdeps/linux/xtensa/bits/xtensa-config.h index b99928b1e058..bfcd571d26e2 100644 --- a/libc/sysdeps/linux/xtensa/bits/xtensa-config.h +++ b/libc/sysdeps/linux/xtensa/bits/xtensa-config.h @@ -32,21 +32,41 @@ macros. */ #undef XCHAL_HAVE_NSA +#ifdef __XCHAL_HAVE_NSA +#define XCHAL_HAVE_NSA __XCHAL_HAVE_NSA +#else #define XCHAL_HAVE_NSA 1 +#endif #undef XCHAL_HAVE_LOOPS +#ifdef __XCHAL_HAVE_LOOPS +#define XCHAL_HAVE_LOOPS __XCHAL_HAVE_LOOPS +#else #define XCHAL_HAVE_LOOPS 1 +#endif /* Assume the maximum number of AR registers. This currently only affects the __window_spill function, and it is always safe to flush extra. */ #undef XCHAL_NUM_AREGS +#ifdef __XCHAL_NUM_AREGS +#define XCHAL_NUM_AREGS __XCHAL_NUM_AREGS +#else #define XCHAL_NUM_AREGS 64 +#endif #undef XCHAL_HAVE_S32C1I +#ifdef __XCHAL_HAVE_S32C1I +#define XCHAL_HAVE_S32C1I __XCHAL_HAVE_S32C1I +#else #define XCHAL_HAVE_S32C1I 1 +#endif #undef XCHAL_HAVE_EXCLUSIVE +#ifdef __XCHAL_HAVE_EXCLUSIVE +#define XCHAL_HAVE_EXCLUSIVE __XCHAL_HAVE_EXCLUSIVE +#else #define XCHAL_HAVE_EXCLUSIVE 0 +#endif #endif /* !XTENSA_CONFIG_H */ -- 2.39.2

4 days, 3 hours

[PATCH] linuxthreads: enable unwinding over signal frames

by Max Filippov

linuxthreads use a helper function to invoke signal handlers, this function needs stack unwinding information to enable stack unwinding from signal handlers over signal frames. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- libpthread/linuxthreads/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index ffdd5d4eb3c9..cc2a5f285c63 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -16,6 +16,8 @@ libpthread_OUT := $(top_builddir)libpthread/linuxthreads -include $(libpthread_DIR)/sysdeps/$(TARGET_ARCH)/Makefile.arch +CFLAGS-signals.c = -fexceptions -fasynchronous-unwind-tables + libpthread_SRC := \ attr.c cancel.c condvar.c errno.c events.c join.c lockfile.c manager.c \ mutex.c pt-machine.c ptfork.c pthread.c ptlongjmp.c \ -- 2.39.2

4 days, 3 hours

[PATCH 0/3] fixes for build with gcc-14

by Max Filippov

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

4 days, 3 hours

1.0.48 released!

by Waldemar Brodkorb

Hi, I released 1.0.48 today. Shortlog: cdde4f237 (HEAD -> master, origin/master, origin/HEAD, github/master) bump version for 1.0.48 release c8d6b02d7 sparc: Fix incorrect sigreturn stub function implementation. a1e7b2cf7 Define __USE_TIME_BITS64 when it is necessary. 66c855560 Makerules: fix out-of-tree build error "Argument list too long" 1614cebc9 fix out-of-tree build with UCLIBC_HAS_CONTEXT_FUNCS 016371460 x86: Add vDSO support. 7e528892b x86: Fix __libc_sigaction implementation. 72b01dd20 remove shared FLAT support from menuconfig, not supported by Linux kernel any longer ce2eec56c Switch x86 NPTL impl to generic C code. 225478e84 aarch64: Apply relocations to use TLS GD access model. 672afe85c Add vDSO support for aarch64. f749cb5c4 Generalize vDSO code. 3a36a3100 Fix vDSO support for all supported architectures. 0694e42c9 tree: Remove ^L e1c1afff0 libuargp: restrict compatibility macros in argp.h only 4d6636f6b riscv32: allow ELF PIE noMMU build 48591e2a2 Provide fixups for riscv32. 70eea5e0f riscv64: partially revert cb9d1f53717dd67892ba943626f3d1b46f3e760b, fixes no MMU ELF 8f200b7fe riscv32: implement linuxthreads, from sorear 4ce2bd0e5 libm: fix nexttoward failures, fixed by sorear 1640c262d riscv64: implement Linuxthreads, from sorear Thanks, Waldemar

4 days, 6 hours

menuconfig aarch64 endianess

by William Roberts

Hello, I am an aarch64 machine and wanted to build uclibc with little endian support. If I use menuconfig it does not allow me to take it off of big endian, but if I manually edit the .config to little endian it works. Seems like a bug in menuconfig, where can I report this? Thanks

4 days, 20 hours

[PATCH] sparc: Fix incorrect sigreturn stub function implementation.

by Dmitry Chestnykh

This function haven't have prologue/epilogue/cfi directives etc. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- This patch fixes https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 . libc/sysdeps/linux/sparc/Makefile.arch | 2 +- libc/sysdeps/linux/sparc/sigaction.c | 25 ++--------------------- libc/sysdeps/linux/sparc/sigreturn_stub.S | 14 +++++++++++++ libc/sysdeps/linux/sparc/sysdep.h | 9 ++++++++ 4 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 libc/sysdeps/linux/sparc/sigreturn_stub.S diff --git a/libc/sysdeps/linux/sparc/Makefile.arch b/libc/sysdeps/linux/sparc/Makefile.arch index d34624f36..c9529b344 100644 --- a/libc/sysdeps/linux/sparc/Makefile.arch +++ b/libc/sysdeps/linux/sparc/Makefile.arch @@ -6,7 +6,7 @@ # CSRC-y := brk.c __syscall_error.c sigaction.c -SSRC-y := __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \ +SSRC-y := __longjmp.S setjmp.S sigreturn_stub.S bsd-setjmp.S bsd-_setjmp.S \ syscall.S urem.S udiv.S umul.S sdiv.S rem.S pipe.S fork.S vfork.S clone.S CSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += makecontext.c diff --git a/libc/sysdeps/linux/sparc/sigaction.c b/libc/sysdeps/linux/sparc/sigaction.c index 7895e3acd..447943e3a 100644 --- a/libc/sysdeps/linux/sparc/sigaction.c +++ b/libc/sysdeps/linux/sparc/sigaction.c @@ -30,8 +30,8 @@ _syscall5(int, rt_sigaction, int, a, int, b, int, c, int, d, int, e) -static void __rt_sigreturn_stub(void); -static void __sigreturn_stub(void); +void __rt_sigreturn_stub(void); +void __sigreturn_stub(void); int __libc_sigaction(int sig, const struct sigaction *act, struct sigaction *oact) { @@ -75,24 +75,3 @@ libc_hidden_weak(sigaction) # endif #endif - -static void -__rt_sigreturn_stub(void) -{ - __asm__( - "mov %0, %%g1\n\t" - "ta 0x10\n\t" - : /* no outputs */ - : "i" (__NR_rt_sigreturn) - ); -} -static void -__sigreturn_stub(void) -{ - __asm__( - "mov %0, %%g1\n\t" - "ta 0x10\n\t" - : /* no outputs */ - : "i" (__NR_sigreturn) - ); -} diff --git a/libc/sysdeps/linux/sparc/sigreturn_stub.S b/libc/sysdeps/linux/sparc/sigreturn_stub.S new file mode 100644 index 000000000..33f51409b --- /dev/null +++ b/libc/sysdeps/linux/sparc/sigreturn_stub.S @@ -0,0 +1,14 @@ +#include <sysdep.h> + + nop + nop + +ENTRY_NOCFI (__rt_sigreturn_stub) + mov __NR_rt_sigreturn, %g1 + ta 0x10 +END_NOCFI (__rt_sigreturn_stub) + +ENTRY_NOCFI (__sigreturn_stub) + mov __NR_sigreturn, %g1 + ta 0x10 +END_NOCFI (__sigreturn_stub) diff --git a/libc/sysdeps/linux/sparc/sysdep.h b/libc/sysdeps/linux/sparc/sysdep.h index c3897ec08..761d21454 100644 --- a/libc/sysdeps/linux/sparc/sysdep.h +++ b/libc/sysdeps/linux/sparc/sysdep.h @@ -17,6 +17,15 @@ C_LABEL(name) \ cfi_startproc; +#define ENTRY_NOCFI(name) \ + .align 4; \ + .global C_SYMBOL_NAME(name); \ + .type name, @function; \ +C_LABEL(name) + +#define END_NOCFI(name) \ + .size name, . - name + #define END(name) \ cfi_endproc; \ .size name, . - name -- 2.44.0

4 days, 21 hours

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel