Index: libcfa/src/concurrency/CtxSwitch-x86_64.S
===================================================================
--- libcfa/src/concurrency/CtxSwitch-x86_64.S	(revision f019069552a31e2e04cad9e68134e465a83e4c2a)
+++ libcfa/src/concurrency/CtxSwitch-x86_64.S	(revision d88f8b3b78a378191ec01bdeee75e6703bc0cc66)
@@ -80,61 +80,4 @@
 
 //-----------------------------------------------------------------------------
-// Part of a 2 part context switch routine, use with CtxRet, stores the current context and then makes a function call
-	.text
-	.align 2
-	.globl CtxStore
-	.type  CtxStore, @function
-CtxStore:
-
-	// Save volatile registers on the stack.
-
-	pushq %r15
-	pushq %r14
-	pushq %r13
-	pushq %r12
-	pushq %rbx
-
-	// Save old context in the "from" area.
-
-	movq %rsp,SP_OFFSET(%rdi)
-	movq %rbp,FP_OFFSET(%rdi)
-
-	mfence
-
-	// Don't load a new context, directly jump to the desired function
-#if defined(PIC)
-	call __suspend_callback@plt
-#else
-	call __suspend_callback
-#endif
-	.size  CtxStore, .-CtxStore
-
-//-----------------------------------------------------------------------------
-// Part of a 2 part context switch routine, use with CtxStore, context switches to the desired target without saving the current context
-	.text
-	.align 2
-	.globl CtxRet
-	.type  CtxRet, @function
-CtxRet:
-	// Load new context from the "to" area.
-
-	movq SP_OFFSET(%rdi),%rsp
-	movq FP_OFFSET(%rdi),%rbp
-
-	// Load volatile registers from the stack.
-
-	popq %rbx
-	popq %r12
-	popq %r13
-	popq %r14
-	popq %r15
-
-	// Return to thread.
-
-	ret
-	.size  CtxRet, .-CtxRet
-
-
-//-----------------------------------------------------------------------------
 // Stub used to create new stacks which are ready to be context switched to
 	.text