path: root/arch/sh/pthread_arch.h
diff options
authorRich Felker <>2018-08-29 14:01:46 -0400
committerRich Felker <>2018-08-29 14:01:46 -0400
commit35cd7c0950b1cb98b62e6dfb2be87e345dac75dd (patch)
tree2d2e13ac6f781cfb1504021e7860d05919082896 /arch/sh/pthread_arch.h
parent0ec49dab6794166d67fae4764ce7fdea42ea6103 (diff)
fix async thread cancellation on sh-fdpic
if __cp_cancel was reached via __syscall_cp, r12 will necessarily still contain a GOT pointer (for or for the static-linked main program) valid for entering __cancel. however, in the case of async cancellation, r12 may contain any scratch value; it's not necessarily even a valid GOT pointer for the code that was interrupted. unlike in commit 0ec49dab6794166d67fae4764ce7fdea42ea6103 where the corresponding issue was fixed for powerpc64, there is fundamentally no way for fdpic code to recompute its GOT pointer. so a new mechanism is introduced for cancel_handler to write a GOT register value into the interrupted context on archs where it is needed.
Diffstat (limited to 'arch/sh/pthread_arch.h')
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sh/pthread_arch.h b/arch/sh/pthread_arch.h
index 41fefacf..a7dd27a6 100644
--- a/arch/sh/pthread_arch.h
+++ b/arch/sh/pthread_arch.h
@@ -10,3 +10,8 @@ static inline struct pthread *__pthread_self()
#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
#define MC_PC sc_pc
+#ifdef __FDPIC__
+#define MC_GOT sc_regs[12]
+#define CANCEL_GOT (*(uintptr_t *)((char *)__syscall_cp_asm+sizeof(uintptr_t)))