Browse Source

fix async thread cancellation on powerpc64

entering the local entry point for __cancel from __cp_cancel is valid
if __cp_cancel was reached from __syscall_cp, since both are in libc
and share the same TOC pointer, but it is not valid if __cp_cancel was
reached when cancel_handler rewrote the program counter for
asynchronous cancellation of code outside libc.

to ensure __cancel is entered with a valid TOC pointer, recompute the
correct value in a PC-relative manner before jumping.
Rich Felker 6 years ago
parent
commit
0ec49dab67
1 changed files with 7 additions and 0 deletions
  1. 7 0
      src/thread/powerpc64/syscall_cp.s

+ 7 - 0
src/thread/powerpc64/syscall_cp.s

@@ -34,4 +34,11 @@ __cp_end:
 	blr
 
 __cp_cancel:
+	mflr 0
+	bl 1f
+	.long .TOC.-.
+1:	mflr 3
+	lwa 2, 0(3)
+	add 2, 2, 3
+	mtlr 0
 	b __cancel