Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision d3ba775d8ac5416c9c4015ef24dca70b09023946)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision 8d1ad36cef9bb7b219f38dfae154e557ae4f238e)
@@ -228,4 +228,5 @@
 		__init_stats( __cfaabi_tls.this_stats );
 	#endif
+	mainProcessor->local_data = &__cfaabi_tls;
 
 	// Enable preemption
@@ -282,4 +283,6 @@
 	#endif
 
+	mainProcessor->local_data = 0p;
+
 	unregister_tls( mainProcessor );
 
@@ -329,4 +332,5 @@
 	__cfaabi_tls.this_thread    = 0p;
 	__cfaabi_tls.preemption_state.[enabled, disable_count] = [false, 1];
+	proc->local_data = &__cfaabi_tls;
 
 	register_tls( proc );
@@ -368,4 +372,6 @@
 		#endif
 	#endif
+
+	proc->local_data = 0p;
 
 	unregister_tls( proc );
@@ -500,4 +506,6 @@
 
 	this.init.thrd = initT;
+
+	this.local_data = 0p;
 
 	this.idle = eventfd(0, 0);