Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision 442b624ac58f31f15e1d9c787f37bfa73ec387d7)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision 88cafe7991e4d4b769f11c34a6c1af0ae4ecffba)
@@ -33,24 +33,24 @@
 // Some assembly required
 #if defined( __i386 )
-	#define CtxGet( ctx )        \
-		__asm__ volatile (     \
-			"movl %%esp,%0\n"\
-			"movl %%ebp,%1\n"\
-			: "=rm" (ctx.SP),\
-				"=rm" (ctx.FP) \
-		)
+	#define CtxGet( ctx ) __asm__ volatile ( \
+		"movl %%esp,%0\n" \
+		"movl %%ebp,%1\n" \
+		: "=rm" (ctx.SP), \
+		  "=rm" (ctx.FP) \
+	)
 #elif defined( __x86_64 )
-	#define CtxGet( ctx )        \
-		__asm__ volatile (     \
-			"movq %%rsp,%0\n"\
-			"movq %%rbp,%1\n"\
-			: "=rm" (ctx.SP),\
-				"=rm" (ctx.FP) \
-		)
-#elif defined( __ARM_ARCH )
-#define CtxGet( ctx ) __asm__ ( \
-		"mov %0,%%sp\n"   \
-		"mov %1,%%r11\n"   \
-	: "=rm" (ctx.SP), "=rm" (ctx.FP) )
+	#define CtxGet( ctx ) __asm__ volatile ( \
+		"movq %%rsp,%0\n" \
+		"movq %%rbp,%1\n" \
+		: "=rm" (ctx.SP), \
+		  "=rm" (ctx.FP) \
+	)
+#elif defined( __aarch64__ )
+	#define CtxGet( ctx ) __asm__ volatile ( \
+		"mov %0, sp\n" \
+		"mov %1, fp\n" \
+		: "=rm" (ctx.SP), \
+		  "=rm" (ctx.FP) \
+	)
 #else
 	#error unknown hardware architecture