From bc5f816a7a4038255ac55e47ae6c5ef13acb8a85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Wed, 18 Sep 2024 03:18:42 +0200
Subject: [PATCH] mips: use preferred asm mnemomic jr for better assembler
 compatibility

The LLVM assembler reportedly assembles the form using the j mnemonic
incorrectly (see issue 107460). The jr form is canonical and avoids
this problem, so use it instead.
---
 crt/mips/crtn.s    | 4 ++--
 crt/mips64/crtn.s  | 4 ++--
 crt/mipsn32/crtn.s | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crt/mips/crtn.s b/crt/mips/crtn.s
index 506a04b78..92eb3d0ef 100644
--- a/crt/mips/crtn.s
+++ b/crt/mips/crtn.s
@@ -3,11 +3,11 @@
 .section .init
 	lw $gp,24($sp)
 	lw $ra,28($sp)
-	j $ra
+	jr $ra
 	addu $sp,$sp,32
 
 .section .fini
 	lw $gp,24($sp)
 	lw $ra,28($sp)
-	j $ra
+	jr $ra
 	addu $sp,$sp,32
diff --git a/crt/mips64/crtn.s b/crt/mips64/crtn.s
index f3930b240..8f090ed39 100644
--- a/crt/mips64/crtn.s
+++ b/crt/mips64/crtn.s
@@ -3,11 +3,11 @@
 .section .init
 	ld $gp,16($sp)
 	ld $ra,24($sp)
-	j $ra
+	jr $ra
 	daddu $sp,$sp,32
 
 .section .fini
 	ld $gp,16($sp)
 	ld $ra,24($sp)
-	j $ra
+	jr $ra
 	daddu $sp,$sp,32
diff --git a/crt/mipsn32/crtn.s b/crt/mipsn32/crtn.s
index dccd7e890..0679eac3d 100644
--- a/crt/mipsn32/crtn.s
+++ b/crt/mipsn32/crtn.s
@@ -2,11 +2,11 @@
 .section	.init
 	ld	$gp, 16($sp)
 	ld	$ra, 24($sp)
-	j	$ra
+	jr	$ra
 	addu	$sp, $sp, 32
 
 .section	.fini
 	ld	$gp, 16($sp)
 	ld	$ra, 24($sp)
-	j	$ra
+	jr	$ra
 	addu	$sp, $sp, 32