Merge "riscv64: use L() in the handful of places we didn't already." into main
diff --git a/libc/arch-riscv64/bionic/__bionic_clone.S b/libc/arch-riscv64/bionic/__bionic_clone.S
index 2827857..be386b1 100644
--- a/libc/arch-riscv64/bionic/__bionic_clone.S
+++ b/libc/arch-riscv64/bionic/__bionic_clone.S
@@ -41,19 +41,19 @@
ecall
# Are we the child?
- beqz a0, .L_bc_child
+ beqz a0, L(child)
# Did the clone(2) fail?
- bltz a0, .L_bc_failure
+ bltz a0, L(failure)
# Nope, we're the parent, and our work here is done.
ret
-.L_bc_failure:
+L(failure):
# Set errno if something went wrong.
neg a0, a0
tail __set_errno_internal
-.L_bc_child:
+L(child):
# We're in the child now. Set the end of the frame record chain.
li fp, 0
# Setting ra to 0 will make the unwinder stop at __start_thread.
diff --git a/libc/arch-riscv64/bionic/setjmp.S b/libc/arch-riscv64/bionic/setjmp.S
index 81b1e35..5de1099 100644
--- a/libc/arch-riscv64/bionic/setjmp.S
+++ b/libc/arch-riscv64/bionic/setjmp.S
@@ -205,7 +205,7 @@
// Check the checksum before doing anything.
m_calculate_checksum t0, a0, t1
ld t1, _JB_CHECKSUM(a0)
- bne t0, t1, 3f
+ bne t0, t1, L(checksum_failure)
// Do we need to restore the signal mask?
ld a2, _JB_SIGFLAG(a0)
@@ -290,7 +290,7 @@
mv a0, a1
ret
-3:
+L(checksum_failure):
call __bionic_setjmp_checksum_mismatch
END(siglongjmp)
diff --git a/libc/arch-riscv64/bionic/syscall.S b/libc/arch-riscv64/bionic/syscall.S
index 1a6e60a..ca735c7 100644
--- a/libc/arch-riscv64/bionic/syscall.S
+++ b/libc/arch-riscv64/bionic/syscall.S
@@ -44,10 +44,10 @@
// Did it fail?
li a7, -MAX_ERRNO
- bgtu a0, a7, 1f
-
+ bgtu a0, a7, L(failure)
ret
-1:
+
+L(failure):
neg a0, a0
tail __set_errno_internal
END(syscall)
diff --git a/libc/arch-riscv64/bionic/vfork.S b/libc/arch-riscv64/bionic/vfork.S
index 29ab405..06ebc3e 100644
--- a/libc/arch-riscv64/bionic/vfork.S
+++ b/libc/arch-riscv64/bionic/vfork.S
@@ -51,16 +51,16 @@
ecall
// if (rc == 0) we're the child, and finished...
- beqz a0, .L_success
+ beqz a0, L(success)
// else if (rc != 0): reset cached_pid_ and vforked_...
sw t2, 20(t0)
// ...and work out whether we succeeded or failed.
- bltz a0, .L_failure
-.L_success:
+ bltz a0, L(failure)
+L(success):
ret
-.L_failure:
+L(failure):
neg a0, a0
tail __set_errno_internal
END(vfork)