X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fthread%2Fx86_64%2Fsyscall_cp.s;h=788c53cc756fdf866a48c8e6ed6dea8f7a106e43;hb=52d4444f8eec1a4e7e0861859c705c3a558b4e2a;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..788c53cc 100644
--- a/src/thread/x86_64/syscall_cp.s
+++ b/src/thread/x86_64/syscall_cp.s
@@ -1,13 +1,14 @@
 .text
 .global __syscall_cp_asm
-.type   __syscall_cp_asm,%function
+.type   __syscall_cp_asm,@function
 __syscall_cp_asm:
-	lea 1f(%rip),%rax
-	mov %rax,8(%rdi)
-	mov %rsp,(%rdi)
-	mov 16(%rdi),%eax
+
+.global __cp_begin
+__cp_begin:
+	mov (%rdi),%eax
 	test %eax,%eax
-	jnz 2f
+	jnz __cancel
+	mov %rdi,%r11
 	mov %rsi,%rax
 	mov %rdx,%rdi
 	mov %rcx,%rsi
@@ -15,10 +16,8 @@ __syscall_cp_asm:
 	mov %r9,%r10
 	mov 8(%rsp),%r8
 	mov 16(%rsp),%r9
-1:	syscall
+	mov %r11,8(%rsp)
+	syscall
+.global __cp_end
+__cp_end:
 	ret
-2:	xor %edi,%edi
-	mov %rdi,8(%r10)
-	mov %rdi,(%r10)
-	dec %rdi
-	jmp pthread_exit