diff --git a/arch/sparcv8leon3/jmp.S b/arch/sparcv8leon3/jmp.S
index 3adc2d63..a95e9187 100644
--- a/arch/sparcv8leon3/jmp.S
+++ b/arch/sparcv8leon3/jmp.S
@@ -112,8 +112,11 @@ _longjmp:
 .type sigsetjmp, #function
 sigsetjmp:
 	cmp %o1, 0
-	bne setjmp
+	bne 1f
+	nop
+	jmp _setjmp
 	nop
-	ba _setjmp
+1:
+	jmp setjmp
 	nop
 .size sigsetjmp, .-sigsetjmp
diff --git a/arch/sparcv8leon3/syscalls.S b/arch/sparcv8leon3/syscalls.S
index 1a7517ba..9f565a11 100644
--- a/arch/sparcv8leon3/syscalls.S
+++ b/arch/sparcv8leon3/syscalls.S
@@ -37,7 +37,7 @@ sym: \
 .globl vfork
 .type vfork, #function
 vfork:
-	ba vforksvc
+	jmp vforksvc
 	nop
 .size vfork, .-vfork