From 01961b12bc71d6eb4d9bda3632d73bb6764b8e85 Mon Sep 17 00:00:00 2001 From: Vladimir Murzin Date: Mon, 18 Jul 2022 12:57:24 +0100 Subject: linuxthread/arm: Unlock ldrex/strex varsion of testandset for __ARM_ARCH >= 7 Thomas has repored failure building ARM 32-bit systems for ARMv8 cores CC libpthread/linuxthreads/mutex.os /tmp/ccn8SFKU.s: Assembler messages: /tmp/ccn8SFKU.s:162: Error: swp{b} use is obsoleted for ARMv8 and later /tmp/ccn8SFKU.s:186: Error: swp{b} use is obsoleted for ARMv8 and later /tmp/ccn8SFKU.s:203: Error: swp{b} use is obsoleted for ARMv8 and later /tmp/ccn8SFKU.s:224: Error: swp{b} use is obsoleted for ARMv8 and later make[1]: *** [Makerules:369: libpthread/linuxthreads/mutex.os] Error 1 This is due to libpthread/linuxthreads/sysdeps/arm/pt-machine.h which uses the swp instruction that is not allowed on ARMv8. All __ARM_ARCH >= 7 support ldrex/strex instructions, so unlock testandset() varaint for them. Reported-by: Thomas Petazzoni Signed-off-by: Vladimir Murzin --- libpthread/linuxthreads/sysdeps/arm/pt-machine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpthread/linuxthreads/sysdeps/arm/pt-machine.h b/libpthread/linuxthreads/sysdeps/arm/pt-machine.h index b00b10495..3250961cf 100644 --- a/libpthread/linuxthreads/sysdeps/arm/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/arm/pt-machine.h @@ -28,7 +28,7 @@ # define PT_EI __extern_always_inline #endif -#if defined(__thumb2__) +#if __ARM_ARCH >= 7 || defined(__thumb2__) /* Spinlock implementation; required. */ PT_EI long int testandset (int *spinlock) -- cgit v1.2.3