X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fx86_64%2Fsyscall_cp.s;h=4f101716d4ee0cd50461f45a0da6b2edb2be3d4c;hb=6aeb9c6703670649ee09b3c8575fb428168bb75c;hp=1894ce191c4dc7f9df3aaf2f9748537e86444343;hpb=feee98903cd8119d9a3db62589246a940f44a9f5;p=musl

diff --git a/src/thread/x86_64/syscall_cp.s b/src/thread/x86_64/syscall_cp.s
index 1894ce19..4f101716 100644
--- a/src/thread/x86_64/syscall_cp.s
+++ b/src/thread/x86_64/syscall_cp.s
@@ -1,13 +1,21 @@
 .text
+.global __cp_begin
+.hidden __cp_begin
+.global __cp_end
+.hidden __cp_end
+.global __cp_cancel
+.hidden __cp_cancel
+.hidden __cancel
 .global __syscall_cp_asm
-.type   __syscall_cp_asm,%function
+.hidden __syscall_cp_asm
+.type   __syscall_cp_asm,@function
 __syscall_cp_asm:
-	lea 1f(%rip),%rax
-	mov %rax,8(%rdi)
-	mov %rsp,(%rdi)
-	mov 16(%rdi),%eax
+
+__cp_begin:
+	mov (%rdi),%eax
 	test %eax,%eax
-	jnz 2f
+	jnz __cp_cancel
+	mov %rdi,%r11
 	mov %rsi,%rax
 	mov %rdx,%rdi
 	mov %rcx,%rsi
@@ -15,10 +23,9 @@ __syscall_cp_asm:
 	mov %r9,%r10
 	mov 8(%rsp),%r8
 	mov 16(%rsp),%r9
-1:	syscall
+	mov %r11,8(%rsp)
+	syscall
+__cp_end:
 	ret
-2:	xor %edi,%edi
-	mov %rdi,8(%r10)
-	mov %rdi,(%r10)
-	dec %rdi
-	jmp pthread_exit
+__cp_cancel:
+	jmp __cancel