diff --git a/compiler-rt/lib/hwasan/hwasan_setjmp_riscv64.S b/compiler-rt/lib/hwasan/hwasan_setjmp_riscv64.S
--- a/compiler-rt/lib/hwasan/hwasan_setjmp_riscv64.S
+++ b/compiler-rt/lib/hwasan/hwasan_setjmp_riscv64.S
@@ -36,7 +36,7 @@
 __interceptor_setjmp:
   CFI_STARTPROC
   addi x11, x0, 0
-  j    __interceptor_sigsetjmp
+  tail __interceptor_sigsetjmp
   CFI_ENDPROC
 ASM_SIZE(__interceptor_setjmp)