From 70f901bc94efa18f716ed28b924c5210b1e62375 Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Wed, 5 Jan 2022 11:01:31 +0000 Subject: [PATCH] Remove the sigcode base check on arm64 This was added with the shared page support. It is unused as we always enable the shared page on FreeBSD executables on arm64. (cherry picked from commit fbdca14953785b6309b2754a90a85180fadc2a9d) --- sys/arm64/arm64/exec_machdep.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c index cfc288e2b5a..0766be0b6a1 100644 --- a/sys/arm64/arm64/exec_machdep.c +++ b/sys/arm64/arm64/exec_machdep.c @@ -544,7 +544,6 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) struct trapframe *tf; struct sigframe *fp, frame; struct sigacts *psp; - struct sysentvec *sysent; int onstack, sig; td = curthread; @@ -602,12 +601,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) tf->tf_elr = (register_t)catcher; tf->tf_sp = (register_t)fp; - sysent = p->p_sysent; - if (sysent->sv_sigcode_base != 0) - tf->tf_lr = (register_t)sysent->sv_sigcode_base; - else - tf->tf_lr = (register_t)(sysent->sv_psstrings - - *(sysent->sv_szsigcode)); + tf->tf_lr = (register_t)p->p_sysent->sv_sigcode_base; CTR3(KTR_SIG, "sendsig: return td=%p pc=%#x sp=%#x", td, tf->tf_elr, tf->tf_sp); -- 2.45.2