diff options
| author | Łukasz Stelmach <l.stelmach@samsung.com> | 2022-09-16 21:31:27 +0200 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2022-09-16 23:25:45 -0400 |
| commit | 22c96052acf78c5f4644117bece38715fc7210cf (patch) | |
| tree | 578c52f2c9d03da45664759520d63df607acfc58 | |
| parent | 5652e12cce80825297c3e0666991deb10310343c (diff) | |
| download | glibc-22c96052acf78c5f4644117bece38715fc7210cf.zip glibc-22c96052acf78c5f4644117bece38715fc7210cf.tar.gz glibc-22c96052acf78c5f4644117bece38715fc7210cf.tar.bz2 | |
RISC-V: Allow long jumps to __syscall_error
__syscall_error may end up farther than 1MiB away from a caller,
especially when linking statically large binaries. tail allows for
4GiB jumps and is reduced to j when a linked symbol is within range.
Fixes: 36960f0c76 ("RISC-V: Linux Syscall Interface")
Fixes: 7f33b09c65 ("RISC-V: Linux ABI")
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
| -rw-r--r-- | sysdeps/unix/sysv/linux/riscv/clone.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/riscv/getcontext.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/riscv/setcontext.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/riscv/swapcontext.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/riscv/sysdep.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/riscv/vfork.S | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/riscv/clone.S b/sysdeps/unix/sysv/linux/riscv/clone.S index d7d2915..45ea8f1 100644 --- a/sysdeps/unix/sysv/linux/riscv/clone.S +++ b/sysdeps/unix/sysv/linux/riscv/clone.S @@ -63,7 +63,7 @@ L (invalid): li a0, -EINVAL /* Something bad happened -- no child created. */ L (error): - j __syscall_error + tail __syscall_error END (__clone) /* Load up the arguments to the function. Put this block of code in diff --git a/sysdeps/unix/sysv/linux/riscv/getcontext.S b/sysdeps/unix/sysv/linux/riscv/getcontext.S index 499f70b..f4f8288 100644 --- a/sysdeps/unix/sysv/linux/riscv/getcontext.S +++ b/sysdeps/unix/sysv/linux/riscv/getcontext.S @@ -70,7 +70,7 @@ LEAF (__getcontext) ret -99: j __syscall_error +99: tail __syscall_error PSEUDO_END (__getcontext) diff --git a/sysdeps/unix/sysv/linux/riscv/setcontext.S b/sysdeps/unix/sysv/linux/riscv/setcontext.S index e3bc84a..1e529b9 100644 --- a/sysdeps/unix/sysv/linux/riscv/setcontext.S +++ b/sysdeps/unix/sysv/linux/riscv/setcontext.S @@ -92,7 +92,7 @@ LEAF (__setcontext) jr t1 -99: j __syscall_error +99: tail __syscall_error END (__setcontext) libc_hidden_def (__setcontext) diff --git a/sysdeps/unix/sysv/linux/riscv/swapcontext.S b/sysdeps/unix/sysv/linux/riscv/swapcontext.S index 4da615f..287ba36 100644 --- a/sysdeps/unix/sysv/linux/riscv/swapcontext.S +++ b/sysdeps/unix/sysv/linux/riscv/swapcontext.S @@ -118,7 +118,7 @@ LEAF (__swapcontext) jr t1 -99: j __syscall_error +99: tail __syscall_error PSEUDO_END (__swapcontext) diff --git a/sysdeps/unix/sysv/linux/riscv/sysdep.h b/sysdeps/unix/sysv/linux/riscv/sysdep.h index 37ff07a..9b03b10 100644 --- a/sysdeps/unix/sysv/linux/riscv/sysdep.h +++ b/sysdeps/unix/sysv/linux/riscv/sysdep.h @@ -102,7 +102,7 @@ # else # define SYSCALL_ERROR_HANDLER(name) \ .Lsyscall_error ## name: \ - j __syscall_error; + tail __syscall_error; # endif /* Performs a system call, not setting errno. */ diff --git a/sysdeps/unix/sysv/linux/riscv/vfork.S b/sysdeps/unix/sysv/linux/riscv/vfork.S index 0970543..1482406 100644 --- a/sysdeps/unix/sysv/linux/riscv/vfork.S +++ b/sysdeps/unix/sysv/linux/riscv/vfork.S @@ -39,7 +39,7 @@ LEAF (__libc_vfork) bltz a0, 1f ret -1: j __syscall_error +1: tail __syscall_error END (__libc_vfork) weak_alias (__libc_vfork, vfork) |