diff options
author | Elliott Hughes <enh@google.com> | 2024-04-08 16:32:25 +0000 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2024-04-08 16:32:25 +0000 |
commit | 9e892499d9cb5f42ee44cfb3544441baf26c2ac0 (patch) | |
tree | 0d802fa11b9a72cca466dd70706c3720c4cf6622 | |
parent | b97459693eefb6c8e39e560cd1febef6177afd82 (diff) | |
download | bionic-9e892499d9cb5f42ee44cfb3544441baf26c2ac0.tar.gz |
riscv64: use L() in the handful of places we didn't already.
Change-Id: If34ae7a0eb3f7d0bd84018de4b987fd437decf58
-rw-r--r-- | libc/arch-riscv64/bionic/__bionic_clone.S | 8 | ||||
-rw-r--r-- | libc/arch-riscv64/bionic/setjmp.S | 4 | ||||
-rw-r--r-- | libc/arch-riscv64/bionic/syscall.S | 6 | ||||
-rw-r--r-- | libc/arch-riscv64/bionic/vfork.S | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/libc/arch-riscv64/bionic/__bionic_clone.S b/libc/arch-riscv64/bionic/__bionic_clone.S index 28278577b..be386b148 100644 --- a/libc/arch-riscv64/bionic/__bionic_clone.S +++ b/libc/arch-riscv64/bionic/__bionic_clone.S @@ -41,19 +41,19 @@ ENTRY_PRIVATE(__bionic_clone) 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 81b1e358d..5de10992c 100644 --- a/libc/arch-riscv64/bionic/setjmp.S +++ b/libc/arch-riscv64/bionic/setjmp.S @@ -205,7 +205,7 @@ ENTRY_WEAK_FOR_NATIVE_BRIDGE(siglongjmp) // 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 @@ ENTRY_WEAK_FOR_NATIVE_BRIDGE(siglongjmp) 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 1a6e60a9d..ca735c7f9 100644 --- a/libc/arch-riscv64/bionic/syscall.S +++ b/libc/arch-riscv64/bionic/syscall.S @@ -44,10 +44,10 @@ ENTRY(syscall) // 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 29ab405bc..06ebc3e37 100644 --- a/libc/arch-riscv64/bionic/vfork.S +++ b/libc/arch-riscv64/bionic/vfork.S @@ -51,16 +51,16 @@ ENTRY(vfork) 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) |