From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu, 29 Aug 2024 19:52:27 +0000 (-0300)
Subject: linux: mips: Fix syscall_cancell build for __mips_isa_rev >= 6
X-Git-Tag: glibc-2.41~702
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1927f718fcc48bdaea03086bdc2adf11279d655b;p=thirdparty%2Fglibc.git

linux: mips: Fix syscall_cancell build for __mips_isa_rev >= 6

Use beqzc instead of bnel.

Checked with a mipsisa64r6el-n64-linux-gnu build and some nptl
cancellation tests on qemu.
---

diff --git a/sysdeps/unix/sysv/linux/mips/mips64/syscall_cancel.S b/sysdeps/unix/sysv/linux/mips/mips64/syscall_cancel.S
index f172041324..cfc0596b6a 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/syscall_cancel.S
+++ b/sysdeps/unix/sysv/linux/mips/mips64/syscall_cancel.S
@@ -77,7 +77,11 @@ __syscall_cancel_arch_end:
 
 	.set noreorder
 	.set nomacro
+#if __mips_isa_rev >= 6
+	beqzc	$7, 1f
+#else
 	bnel	a3, zero, 1f
+#endif
 	SUBU	v0, zero, v0
 	.set macro
 	.set reorder