Index: src/libcfa/concurrency/preemption.c
===================================================================
--- src/libcfa/concurrency/preemption.c	(revision b68382146bfc9aa68160d565370751e4f3074dd7)
+++ src/libcfa/concurrency/preemption.c	(revision 258e6ad5514eaa16b463685225a14ac3a880f5c8)
@@ -10,6 +10,6 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jan 23 13:56:32 2018
-// Update Count     : 6
+// Last Modified On : Tue Jan 23 17:59:30 2018
+// Update Count     : 7
 //
 
@@ -299,7 +299,11 @@
 // Receives SIGUSR1 signal and causes the current thread to yield
 void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ) {
+#if defined( __ARM_ARCH )
 	__cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.arm_pc); )
-
-	// Check if it is safe to preempt here
+#else
+	__cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.gregs[CFA_REG_IP]); )
+#endif
+
+		// Check if it is safe to preempt here
 	if( !preemption_ready() ) { return; }