devel May 2024

devel@uclibc-ng.org

7 participants
23 discussions

[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

6 months, 3 weeks

[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

6 months, 3 weeks

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

6 months, 3 weeks

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel May 2024