August 2020 - devel - example.com

[PATCH] ldso: Fix pointer cast warning
by Yann Sionneau 24 Aug '20

24 Aug '20

Fixes the following compilation warning for 64-bit arch with TLS support: CC ldso/libdl/libdl.oS ldso/libdl/libdl.c: In function 'do_dlsym': ldso/libdl/libdl.c:739:59: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] ret = _dl_tls_symaddr ((struct link_map *)sym_ref.tpnt, (Elf32_Addr)ret); ^ --- ldso/libdl/libdl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index ac0acd504..37c4a876e 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -187,7 +187,7 @@ static const char *const dl_error_names[] = { */ static void * internal_function -_dl_tls_symaddr(struct link_map *map, const Elf32_Addr st_value) +_dl_tls_symaddr(struct link_map *map, const ElfW(Addr) st_value) { # ifndef DONT_USE_TLS_INDEX tls_index tmp = @@ -736,7 +736,7 @@ static void *do_dlsym(void *vhandle, const char *name, void *caller_address) if (sym_ref.sym && (ELF_ST_TYPE(sym_ref.sym->st_info) == STT_TLS) && (sym_ref.tpnt)) { /* The found symbol is a thread-local storage variable. Return its address for the current thread. */ - ret = _dl_tls_symaddr ((struct link_map *)sym_ref.tpnt, (Elf32_Addr)ret); + ret = _dl_tls_symaddr ((struct link_map *)sym_ref.tpnt, (ElfW(Addr))ret); } #endif -- 2.17.1

1 0

[PATCH 1/1] Add {name, open}_to_handle_at() implementation
by Petr Vorel 18 Aug '20

18 Aug '20

copied from musl 1.2.1. Signed-off-by: Petr Vorel <petr.vorel(a)gmail.com> --- Hi, these are new dependencies for iproute2. Kind regards, Petr include/fcntl.h | 12 +++++++ libc/sysdeps/linux/common/Makefile.in | 2 ++ libc/sysdeps/linux/common/name_to_handle_at.c | 36 +++++++++++++++++++ libc/sysdeps/linux/common/open_by_handle_at.c | 34 ++++++++++++++++++ 4 files changed, 84 insertions(+) create mode 100644 libc/sysdeps/linux/common/name_to_handle_at.c create mode 100644 libc/sysdeps/linux/common/open_by_handle_at.c diff --git a/include/fcntl.h b/include/fcntl.h index e8a781f28..02d4b0110 100644 --- a/include/fcntl.h +++ b/include/fcntl.h @@ -281,6 +281,18 @@ extern int fallocate64 (int __fd, int __mode, __off64_t __offset, __off64_t __le # endif #endif +#if (defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU) +struct file_handle { + unsigned handle_bytes; + int handle_type; + unsigned char f_handle[]; +}; + +int name_to_handle_at(int dirfd, const char *pathname, + struct file_handle *handle, int *mount_id, int flags); +int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags); +#endif + __END_DECLS #endif /* fcntl.h */ diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index f114a5bd1..9562de52c 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -32,6 +32,8 @@ CSRC-$(UCLIBC_LINUX_SPECIFIC) += \ iopl.c \ modify_ldt.c \ module.c \ + name_to_handle_at.c \ + open_by_handle_at.c \ personality.c \ pipe2.c \ ppoll.c \ diff --git a/libc/sysdeps/linux/common/name_to_handle_at.c b/libc/sysdeps/linux/common/name_to_handle_at.c new file mode 100644 index 000000000..20c67cbca --- /dev/null +++ b/libc/sysdeps/linux/common/name_to_handle_at.c @@ -0,0 +1,36 @@ +/* + * Copyright © 2005-2020 Rich Felker, et al. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Imported from musl C library + */ + +#include <sys/syscall.h> + +#ifdef __NR_open_by_handle_at +#include <fcntl.h> +int name_to_handle_at(int dirfd, const char *pathname, + struct file_handle *handle, int *mount_id, int flags) +{ + return INLINE_SYSCALL(name_to_handle_at, 5, dirfd, pathname, handle, + mount_id, flags); +} +#endif diff --git a/libc/sysdeps/linux/common/open_by_handle_at.c b/libc/sysdeps/linux/common/open_by_handle_at.c new file mode 100644 index 000000000..5e65648a6 --- /dev/null +++ b/libc/sysdeps/linux/common/open_by_handle_at.c @@ -0,0 +1,34 @@ +/* + * Copyright © 2005-2020 Rich Felker, et al. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Imported from musl C library + */ + +#include <sys/syscall.h> + +#ifdef __NR_open_by_handle_at +#include <fcntl.h> +int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags) +{ + return INLINE_SYSCALL(open_by_handle_at, 3, mount_fd, handle, flags); +} +#endif -- 2.28.0

1 0

__riscv_flush_icache() implementation missing in RISC-V port
by Thomas Petazzoni 15 Aug '20

15 Aug '20

Hello, The __builtin___clear_cache() GCC builtin is used for example by the libffi library RISC-V port to flush the I-Cache after modifying the code. On RISC-V the internal implementation of this GCC builtin assumes the C library provides a __riscv_flush_icache() function. glibc implements this function in sysdeps/unix/sysv/linux/riscv/flush-icache.c. Due to the lack of this function in uClibc-ng, building anything that links against libffi fails, for example, libglib2: FAILED: gobject/gobject-query /home/test/autobuild/run/instance-0/output-1/host/bin/riscv64-buildroot-linux-uclibc-gcc -o gobject/gobject-query gobject/gobject-query.p/gobject-query.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group glib/libglib-2.0.so.0.6400.4 gobject/libgobject-2.0.so.0.6400.4 -Wl,--end-group -pthread '-Wl,-rpath,$ORIGIN/../glib:$ORIGIN/' -Wl,-rpath-link,/home/test/autobuild/run/instance-0/output-1/build/libglib2-2.64.4/build/glib -Wl,-rpath-link,/home/test/autobuild/run/instance-0/output-1/build/libglib2-2.64.4/build/gobject /home/test/autobuild/run/instance-0/output-1/host/lib/gcc/riscv64-buildroot-linux-uclibc/9.3.0/../../../../riscv64-buildroot-linux-uclibc/bin/ld: /home/test/autobuild/run/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/lib64/libffi.so.7: undefined reference to `__riscv_flush_icache' collect2: error: ld returned 1 exit status Would it be possible to implement this function in uClibc-ng ? Best regards, Thomas Petazzoni -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com

1 0

An issue with sys/random.h
by akater 14 Aug '20

14 Aug '20

Recently, I couldn't build GNU Emacs on a uclibc-ng-1.0.33 system. The issue eventually went to Gnulib; they pushed a workaround but concluded it's a uClibc issue. Their summary, as presented in the patch in the message below: > On uClibc, <sys/random.h> assumes prior inclusion of <stddef.h>. For details, see https://lists.gnu.org/archive/html/bug-gnulib/2020-08/msg00098.html and further down the thread. I was advised to report this to you so here it goes.

1 0

Are statically linked binaries supported with NPTL?
by Evan T Mesterhazy 13 Aug '20

13 Aug '20

I read in a paper <https://www.kernel.org/doc/ols/2006/ols2006v1-pages-409-420.pdf> from 2006 on kernel.org: > It should also be noted that statically linked binaries using TLS/NPTL are not currently supported by uClibc. Is this still the case for uClibc-ng in 2020? Thank you, Evan -- etm2131(a)columbia.edu

2 1

{name, open}_to_handle_at() not implemented on uclibc-ng (iproute2 5.8.0 dependency)
by Petr Vorel 13 Aug '20

13 Aug '20

Hi, does anybody plan to implement {name,open}_to_handle_at() in uclibc-ng? These are new dependencies for iproute2. 2 years ago it was just removed from bits/fcntl.h in 42ff2bba8 ("uClibc-ng does not implement name_to_handle_at"). Kind regards, Petr

1 0

Fix static linking with GCC-10
by Lance Fredrickson 11 Aug '20

11 Aug '20

Starting with GCC-10 multiple definitions of global variables by will be rejected. https://gcc.gnu.org/gcc-10/porting_to.html This fixes multiple definitions of _dl_pagesize and _dl_tls_static_size while attempting static linking. Of course this only occurs when compiling something that requires these symbols. First patch submission so hopefully all done correctly. thanks, Lance Fredrickson

2 1

[PATCH] xtensa: add exclusive access support
by Max Filippov 11 Aug '20

11 Aug '20

Add XCHAL definitions for S32C1I and EXCLUSIVE options to xtensa-config.h, include it in places that implement atomic operations and add implementations with exclusive access option opcodes. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- libc/sysdeps/linux/xtensa/bits/atomic.h | 128 ++++++++++++++++++ .../sysdeps/linux/xtensa/bits/xtensa-config.h | 6 + .../linuxthreads/sysdeps/xtensa/pt-machine.h | 56 ++++++++ .../nptl/sysdeps/xtensa/pthread_spin_lock.S | 16 +++ .../sysdeps/xtensa/pthread_spin_trylock.S | 17 +++ 5 files changed, 223 insertions(+) diff --git a/libc/sysdeps/linux/xtensa/bits/atomic.h b/libc/sysdeps/linux/xtensa/bits/atomic.h index efc027d1ac25..18b809998054 100644 --- a/libc/sysdeps/linux/xtensa/bits/atomic.h +++ b/libc/sysdeps/linux/xtensa/bits/atomic.h @@ -18,6 +18,7 @@ #ifndef _BITS_ATOMIC_H #define _BITS_ATOMIC_H 1 +#include <bits/xtensa-config.h> #include <inttypes.h> typedef int32_t atomic32_t; @@ -50,6 +51,128 @@ typedef uintmax_t uatomic_max_t; #define __arch_compare_and_exchange_bool_16_rel(mem, newval, oldval) \ (abort (), 0) +#if XCHAL_HAVE_EXCLUSIVE + +/* Atomically store NEWVAL in *MEM if *MEM is equal to OLDVAL. + Return the old *MEM value. */ + +#define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ + ({__typeof__(*(mem)) __tmp, __value; \ + __asm__ __volatile__( \ + " memw \n" \ + "1: l32ex %0, %2 \n" \ + " bne %0, %4, 2f \n" \ + " mov %1, %3 \n" \ + " s32ex %1, %2 \n" \ + " getex %1 \n" \ + " beqz %1, 1b \n" \ + " memw \n" \ + "2: \n" \ + : "=&a" (__value), "=&a" (__tmp) \ + : "a" (mem), "a" (newval), "a" (oldval) \ + : "memory" ); \ + __value; \ + }) + +/* Atomically store NEWVAL in *MEM if *MEM is equal to OLDVAL. + Return zero if *MEM was changed or non-zero if no exchange happened. */ + +#define __arch_compare_and_exchange_bool_32_acq(mem, newval, oldval) \ + ({__typeof__(*(mem)) __tmp, __value; \ + __asm__ __volatile__( \ + " memw \n" \ + "1: l32ex %0, %2 \n" \ + " sub %0, %4, %0 \n" \ + " bnez %0, 2f \n" \ + " mov %1, %3 \n" \ + " s32ex %1, %2 \n" \ + " getex %1 \n" \ + " beqz %1, 1b \n" \ + " movi %0, 0 \n" \ + " memw \n" \ + "2: \n" \ + : "=&a" (__value), "=&a" (__tmp) \ + : "a" (mem), "a" (newval), "a" (oldval) \ + : "memory" ); \ + __value != 0; \ + }) + +/* Store NEWVALUE in *MEM and return the old value. */ + +#define __arch_exchange_32_acq(mem, newval) \ + ({__typeof__(*(mem)) __tmp, __value; \ + __asm__ __volatile__( \ + " memw \n" \ + "1: l32ex %0, %2 \n" \ + " mov %1, %3 \n" \ + " s32ex %1, %2 \n" \ + " getex %1 \n" \ + " beqz %1, 1b \n" \ + " memw \n" \ + : "=&a" (__value), "=&a" (__tmp) \ + : "a" (mem), "a" (newval) \ + : "memory" ); \ + __value; \ + }) + +/* Add VALUE to *MEM and return the old value of *MEM. */ + +#define __arch_atomic_exchange_and_add_32(mem, value) \ + ({__typeof__(*(mem)) __tmp, __value; \ + __asm__ __volatile__( \ + " memw \n" \ + "1: l32ex %0, %2 \n" \ + " add %1, %0, %3 \n" \ + " s32ex %1, %2 \n" \ + " getex %1 \n" \ + " beqz %1, 1b \n" \ + " memw \n" \ + : "=&a" (__value), "=&a" (__tmp) \ + : "a" (mem), "a" (value) \ + : "memory" ); \ + __value; \ + }) + +/* Subtract VALUE from *MEM and return the old value of *MEM. */ + +#define __arch_atomic_exchange_and_sub_32(mem, value) \ + ({__typeof__(*(mem)) __tmp, __value; \ + __asm__ __volatile__( \ + " memw \n" \ + "1: l32ex %0, %2 \n" \ + " sub %1, %0, %3 \n" \ + " s32ex %1, %2 \n" \ + " getex %1 \n" \ + " beqz %1, 1b \n" \ + " memw \n" \ + : "=&a" (__value), "=&a" (__tmp) \ + : "a" (mem), "a" (value) \ + : "memory" ); \ + __tmp; \ + }) + +/* Decrement *MEM if it is > 0, and return the old value. */ + +#define __arch_atomic_decrement_if_positive_32(mem) \ + ({__typeof__(*(mem)) __tmp, __value; \ + __asm__ __volatile__( \ + " memw \n" \ + "1: l32ex %0, %2 \n" \ + " blti %0, 1, 2f \n" \ + " addi %1, %0, -1 \n" \ + " s32ex %1, %2 \n" \ + " getex %1 \n" \ + " beqz %1, 1b \n" \ + " memw \n" \ + "2: \n" \ + : "=&a" (__value), "=&a" (__tmp) \ + : "a" (mem) \ + : "memory" ); \ + __value; \ + }) + +#elif XCHAL_HAVE_S32C1I + /* Atomically store NEWVAL in *MEM if *MEM is equal to OLDVAL. Return the old *MEM value. */ @@ -156,6 +279,11 @@ typedef uintmax_t uatomic_max_t; __value; \ }) +#else + +#error No hardware atomic operations + +#endif /* These are the preferred public interfaces: */ diff --git a/libc/sysdeps/linux/xtensa/bits/xtensa-config.h b/libc/sysdeps/linux/xtensa/bits/xtensa-config.h index 2e60af936e6e..b99928b1e058 100644 --- a/libc/sysdeps/linux/xtensa/bits/xtensa-config.h +++ b/libc/sysdeps/linux/xtensa/bits/xtensa-config.h @@ -43,4 +43,10 @@ #undef XCHAL_NUM_AREGS #define XCHAL_NUM_AREGS 64 +#undef XCHAL_HAVE_S32C1I +#define XCHAL_HAVE_S32C1I 1 + +#undef XCHAL_HAVE_EXCLUSIVE +#define XCHAL_HAVE_EXCLUSIVE 0 + #endif /* !XTENSA_CONFIG_H */ diff --git a/libpthread/linuxthreads/sysdeps/xtensa/pt-machine.h b/libpthread/linuxthreads/sysdeps/xtensa/pt-machine.h index 82d9b540c611..0b7f58b635f3 100644 --- a/libpthread/linuxthreads/sysdeps/xtensa/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/xtensa/pt-machine.h @@ -21,6 +21,7 @@ #ifndef _PT_MACHINE_H #define _PT_MACHINE_H 1 +#include <bits/xtensa-config.h> #include <sys/syscall.h> #include <asm/unistd.h> @@ -34,6 +35,55 @@ extern long int testandset (int *spinlock); extern int __compare_and_swap (long int *p, long int oldval, long int newval); +#if XCHAL_HAVE_EXCLUSIVE + +/* Spinlock implementation; required. */ +PT_EI long int +testandset (int *spinlock) +{ + unsigned long tmp; + __asm__ volatile ( +" memw \n" +"1: l32ex %0, %1 \n" +" bnez %0, 2f \n" +" movi %0, 1 \n" +" s32ex %0, %1 \n" +" getex %0 \n" +" beqz %0, 1b \n" +" movi %0, 0 \n" +" memw \n" +"2: \n" + : "=&a" (tmp) + : "a" (spinlock) + : "memory" + ); + return tmp; +} + +PT_EI int +__compare_and_swap (long int *p, long int oldval, long int newval) +{ + unsigned long tmp; + unsigned long value; + __asm__ volatile ( +" memw \n" +"1: l32ex %0, %2 \n" +" bne %0, %4, 2f \n" +" mov %1, %3 \n" +" s32ex %1, %2 \n" +" getex %1 \n" +" beqz %1, 1b \n" +" memw \n" +"2: \n" + : "=&a" (tmp), "=&a" (value) + : "a" (p), "a" (newval), "a" (oldval) + : "memory" ); + + return tmp == oldval; +} + +#elif XCHAL_HAVE_S32C1I + /* Spinlock implementation; required. */ PT_EI long int testandset (int *spinlock) @@ -71,6 +121,12 @@ __compare_and_swap (long int *p, long int oldval, long int newval) return tmp == oldval; } +#else + +#error No hardware atomic operations + +#endif + /* Get some notion of the current stack. Need not be exactly the top of the stack, just something somewhere in the current frame. */ #define CURRENT_STACK_FRAME __builtin_frame_address (0) diff --git a/libpthread/nptl/sysdeps/xtensa/pthread_spin_lock.S b/libpthread/nptl/sysdeps/xtensa/pthread_spin_lock.S index 3386afae9e58..3faac36da12b 100644 --- a/libpthread/nptl/sysdeps/xtensa/pthread_spin_lock.S +++ b/libpthread/nptl/sysdeps/xtensa/pthread_spin_lock.S @@ -15,16 +15,32 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, see <http://www.gnu.org/licenses/>. */ +#include <bits/xtensa-config.h> #include <sysdep.h> .text ENTRY (pthread_spin_lock) +#if XCHAL_HAVE_EXCLUSIVE + memw +1: l32ex a3, a2 + bnez a3, 1b + movi a3, 1 + s32ex a3, a2 + getex a3 + beqz a3, 1b + memw +#elif XCHAL_HAVE_S32C1I movi a3, 0 wsr a3, scompare1 movi a3, 1 1: s32c1i a3, a2, 0 bnez a3, 1b +#else + +#error No hardware atomic operations + +#endif movi a2, 0 abi_ret diff --git a/libpthread/nptl/sysdeps/xtensa/pthread_spin_trylock.S b/libpthread/nptl/sysdeps/xtensa/pthread_spin_trylock.S index 72b2dda92310..0669682ec9bd 100644 --- a/libpthread/nptl/sysdeps/xtensa/pthread_spin_trylock.S +++ b/libpthread/nptl/sysdeps/xtensa/pthread_spin_trylock.S @@ -17,15 +17,32 @@ #define _ERRNO_H 1 #include <bits/errno.h> +#include <bits/xtensa-config.h> #include <sysdep.h> .text ENTRY (pthread_spin_trylock) +#if XCHAL_HAVE_EXCLUSIVE + memw + l32ex a3, a2 + bnez a3, 1f + movi a3, 1 + s32ex a3, a2 + getex a3 + addi a3, a3, -1 + memw +1: +#elif XCHAL_HAVE_S32C1I movi a3, 0 wsr a3, scompare1 movi a3, 1 s32c1i a3, a2, 0 +#else + +#error No hardware atomic operations + +#endif movi a2, EBUSY moveqz a2, a3, a3 -- 2.20.1

2 1

[PATCH] xtensa: relax memory constraint in atomic assembly
by Max Filippov 11 Aug '20

11 Aug '20

Replace "a" constraints with "+m" to avoid forcing atomic variable address into a register and let the compiler use non-zero offset in load/store opcodes. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- libc/sysdeps/linux/xtensa/bits/atomic.h | 49 +++++++++---------- .../linuxthreads/sysdeps/xtensa/pt-machine.h | 15 +++--- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/libc/sysdeps/linux/xtensa/bits/atomic.h b/libc/sysdeps/linux/xtensa/bits/atomic.h index b2be547f03e9..efc027d1ac25 100644 --- a/libc/sysdeps/linux/xtensa/bits/atomic.h +++ b/libc/sysdeps/linux/xtensa/bits/atomic.h @@ -56,16 +56,16 @@ typedef uintmax_t uatomic_max_t; #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ ({__typeof__(*(mem)) __tmp, __value; \ __asm__ __volatile__( \ - "1: l32i %1, %2, 0 \n" \ + "1: l32i %1, %2 \n" \ " bne %1, %4, 2f \n" \ " wsr %1, SCOMPARE1 \n" \ " mov %0, %1 \n" \ " mov %1, %3 \n" \ - " s32c1i %1, %2, 0 \n" \ + " s32c1i %1, %2 \n" \ " bne %0, %1, 1b \n" \ "2: \n" \ - : "=&a" (__value), "=&a" (__tmp) \ - : "a" (mem), "a" (newval), "a" (oldval) \ + : "=&a" (__value), "=&a" (__tmp), "+m" (*(mem)) \ + : "a" (newval), "a" (oldval) \ : "memory" ); \ __tmp; \ }) @@ -76,17 +76,17 @@ typedef uintmax_t uatomic_max_t; #define __arch_compare_and_exchange_bool_32_acq(mem, newval, oldval) \ ({__typeof__(*(mem)) __tmp, __value; \ __asm__ __volatile__( \ - "1: l32i %0, %2, 0 \n" \ + "1: l32i %0, %2 \n" \ " sub %1, %4, %0 \n" \ " bnez %1, 2f \n" \ " wsr %0, SCOMPARE1 \n" \ " mov %1, %3 \n" \ - " s32c1i %1, %2, 0 \n" \ + " s32c1i %1, %2 \n" \ " bne %0, %1, 1b \n" \ " movi %1, 0 \n" \ "2: \n" \ - : "=&a" (__value), "=&a" (__tmp) \ - : "a" (mem), "a" (newval), "a" (oldval) \ + : "=&a" (__value), "=&a" (__tmp), "+m" (*(mem)) \ + : "a" (newval), "a" (oldval) \ : "memory" ); \ __tmp != 0; \ }) @@ -96,13 +96,13 @@ typedef uintmax_t uatomic_max_t; #define __arch_exchange_32_acq(mem, newval) \ ({__typeof__(*(mem)) __tmp, __value; \ __asm__ __volatile__( \ - "1: l32i %0, %2, 0 \n" \ + "1: l32i %0, %2 \n" \ " wsr %0, SCOMPARE1 \n" \ " mov %1, %3 \n" \ - " s32c1i %1, %2, 0 \n" \ + " s32c1i %1, %2 \n" \ " bne %0, %1, 1b \n" \ - : "=&a" (__value), "=&a" (__tmp) \ - : "a" (mem), "a" (newval) \ + : "=&a" (__value), "=&a" (__tmp), "+m" (*(mem)) \ + : "a" (newval) \ : "memory" ); \ __tmp; \ }) @@ -112,13 +112,13 @@ typedef uintmax_t uatomic_max_t; #define __arch_atomic_exchange_and_add_32(mem, value) \ ({__typeof__(*(mem)) __tmp, __value; \ __asm__ __volatile__( \ - "1: l32i %0, %2, 0 \n" \ + "1: l32i %0, %2 \n" \ " wsr %0, SCOMPARE1 \n" \ " add %1, %0, %3 \n" \ - " s32c1i %1, %2, 0 \n" \ + " s32c1i %1, %2 \n" \ " bne %0, %1, 1b \n" \ - : "=&a" (__value), "=&a" (__tmp) \ - : "a" (mem), "a" (value) \ + : "=&a" (__value), "=&a" (__tmp), "+m" (*(mem)) \ + : "a" (value) \ : "memory" ); \ __tmp; \ }) @@ -128,13 +128,13 @@ typedef uintmax_t uatomic_max_t; #define __arch_atomic_exchange_and_sub_32(mem, value) \ ({__typeof__(*(mem)) __tmp, __value; \ __asm__ __volatile__( \ - "1: l32i %0, %2, 0 \n" \ + "1: l32i %0, %2 \n" \ " wsr %0, SCOMPARE1 \n" \ " sub %1, %0, %3 \n" \ - " s32c1i %1, %2, 0 \n" \ + " s32c1i %1, %2 \n" \ " bne %0, %1, 1b \n" \ - : "=&a" (__value), "=&a" (__tmp) \ - : "a" (mem), "a" (value) \ + : "=&a" (__value), "=&a" (__tmp), "+m" (*(mem)) \ + : "a" (value) \ : "memory" ); \ __tmp; \ }) @@ -144,16 +144,15 @@ typedef uintmax_t uatomic_max_t; #define __arch_atomic_decrement_if_positive_32(mem) \ ({__typeof__(*(mem)) __tmp, __value; \ __asm__ __volatile__( \ - "1: l32i %0, %2, 0 \n" \ + "1: l32i %0, %2 \n" \ " blti %0, 1, 2f \n" \ " wsr %0, SCOMPARE1 \n" \ " addi %1, %0, -1 \n" \ - " s32c1i %1, %2, 0 \n" \ + " s32c1i %1, %2 \n" \ " bne %0, %1, 1b \n" \ "2: \n" \ - : "=&a" (__value), "=&a" (__tmp) \ - : "a" (mem) \ - : "memory" ); \ + : "=&a" (__value), "=&a" (__tmp), "+m" (*(mem)) \ + :: "memory" ); \ __value; \ }) diff --git a/libpthread/linuxthreads/sysdeps/xtensa/pt-machine.h b/libpthread/linuxthreads/sysdeps/xtensa/pt-machine.h index 2c68ddfb5fe1..82d9b540c611 100644 --- a/libpthread/linuxthreads/sysdeps/xtensa/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/xtensa/pt-machine.h @@ -43,10 +43,9 @@ testandset (int *spinlock) " movi %0, 0 \n" " wsr %0, SCOMPARE1 \n" " movi %0, 1 \n" -" s32c1i %0, %1, 0 \n" - : "=&a" (tmp) - : "a" (spinlock) - : "memory" +" s32c1i %0, %1 \n" + : "=&a" (tmp), "+m" (*spinlock) + :: "memory" ); return tmp; } @@ -57,16 +56,16 @@ __compare_and_swap (long int *p, long int oldval, long int newval) unsigned long tmp; unsigned long value; __asm__ volatile ( -"1: l32i %0, %2, 0 \n" +"1: l32i %0, %2 \n" " bne %0, %4, 2f \n" " wsr %0, SCOMPARE1 \n" " mov %1, %0 \n" " mov %0, %3 \n" -" s32c1i %0, %2, 0 \n" +" s32c1i %0, %2 \n" " bne %1, %0, 1b \n" "2: \n" - : "=&a" (tmp), "=&a" (value) - : "a" (p), "a" (newval), "a" (oldval) + : "=&a" (tmp), "=&a" (value), "+m" (*p) + : "a" (newval), "a" (oldval) : "memory" ); return tmp == oldval; -- 2.20.1

2 1

uClibc-ng broken on hsdk
by Waldemar Brodkorb 04 Aug '20

04 Aug '20

Hi Alexey, Hi Vineet, is uClibc-ng 1.0.34 broken on Linux kernel 4.19.136? I am using gcc 9.3.0 and binutils 2.35. I get following stacktrace: [ 9.667903] Starting Linux (built with OpenADK). [ 9.673796] Freeing unused kernel memory: 592K [ 9.678323] This architecture does not have kernel memory protection. [ 9.684992] Run /sbin/init as init process [ 9.693619] potentially unexpected fatal signal 11. [ 9.698600] Path: /bin/busybox [ 9.701967] CPU: 2 PID: 1 Comm: init Not tainted 4.19.136-1 #2 [ 9.707882] [ 9.707882] [ECR ]: 0x00050200 => Invalid Write @ 0x00000000 by insn @ 0x2000181a [ 9.717373] [EFA ]: 0x00000000 [ 9.717373] [BLINK ]: 0x20001792 [ 9.717373] [ERET ]: 0x2000181a [ 9.727392] @off 0x181a in [/lib/ld-uClibc-1.0.34.so] [ 9.727392] VMA: 0x20000000 to 0x20008000 [ 9.737355] [STAT32]: 0x80081082 : IE U [ 9.741969] BTA: 0x20001792 SP: 0x5f8bdb9c FP: 0x5f8bdd2c [ 9.747648] LPS: 0x00000010 LPE: 0x00000080 LPC: 0x00000000 [ 9.753784] r00: 0x20005b64 r01: 0x00000025 r02: 0xffffffff [ 9.753784] r03: 0x00000022 r04: 0x00000000 r05: 0x00000000 [ 9.753784] r06: 0x00000000 r07: 0x00000000 r08: 0x000000de [ 9.753784] r09: 0x0000000c r10: 0x00000001 r11: 0x00000000 [ 9.753784] r12: 0x20001792 r13: 0x00000000 r14: 0x20005b64 [ 9.753784] r15: 0x2000a070 r16: 0x5f8bddf8 r17: 0x5f8bdf2c [ 9.753784] r18: 0x2000a070 r19: 0x00000000 r20: 0x5f8bddf8 [ 9.753784] r21: 0x00000000 r22: 0x00000000 r23: 0x00000000 [ 9.753784] r24: 0x5f8bdc18 r25: 0x00000000 [ 9.753784] [ 9.753784] [ 9.807098] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b [ 9.807098] With kernel 5.4.53 it just hangs on this line here: [ 2.579235] NET: Registered protocol family 1 I am using initramfs with piggyback loaded from mmc card. best regards Waldemar

2 1