Index: libcfa/src/bits/defs.hfa
===================================================================
--- libcfa/src/bits/defs.hfa	(revision fbb930ec77eae01fe0f6a0d17ebf91b832058985)
+++ libcfa/src/bits/defs.hfa	(revision 01ba701f5c1c1d6c0b87e801d9525b3d89e5269f)
@@ -24,5 +24,4 @@
 #define likely(x)   __builtin_expect(!!(x), 1)
 #define unlikely(x) __builtin_expect(!!(x), 0)
-#define thread_local _Thread_local
 
 typedef void (*fptr_t)();
Index: libcfa/src/concurrency/kernel/fwd.hfa
===================================================================
--- libcfa/src/concurrency/kernel/fwd.hfa	(revision fbb930ec77eae01fe0f6a0d17ebf91b832058985)
+++ libcfa/src/concurrency/kernel/fwd.hfa	(revision 01ba701f5c1c1d6c0b87e801d9525b3d89e5269f)
@@ -35,5 +35,5 @@
 extern "C" {
 	extern "Cforall" {
-		extern __attribute__((aligned(64))) thread_local struct KernelThreadData {
+		extern __attribute__((aligned(64))) _Thread_local struct KernelThreadData {
 			struct thread$          * volatile this_thread;
 			struct processor        * volatile this_processor;
Index: libcfa/src/concurrency/kernel/private.hfa
===================================================================
--- libcfa/src/concurrency/kernel/private.hfa	(revision fbb930ec77eae01fe0f6a0d17ebf91b832058985)
+++ libcfa/src/concurrency/kernel/private.hfa	(revision 01ba701f5c1c1d6c0b87e801d9525b3d89e5269f)
@@ -88,5 +88,5 @@
 #elif defined(CFA_HAVE_LINUX_RSEQ_H)
 	extern "Cforall" {
-		extern __attribute__((aligned(64))) thread_local volatile struct rseq __cfaabi_rseq;
+		extern __attribute__((aligned(64))) _Thread_local volatile struct rseq __cfaabi_rseq;
 	}
 #else
Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision fbb930ec77eae01fe0f6a0d17ebf91b832058985)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision 01ba701f5c1c1d6c0b87e801d9525b3d89e5269f)
@@ -133,5 +133,5 @@
 //-----------------------------------------------------------------------------
 // Global state
-thread_local struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
+_Thread_local struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
 	NULL,												// cannot use 0p
 	NULL,
@@ -153,5 +153,5 @@
 #elif defined(CFA_HAVE_LINUX_RSEQ_H)
 	extern "Cforall" {
-		__attribute__((aligned(64))) thread_local volatile struct rseq __cfaabi_rseq @= {
+		__attribute__((aligned(64))) _Thread_local volatile struct rseq __cfaabi_rseq @= {
 			.cpu_id : RSEQ_CPU_ID_UNINITIALIZED,
 		};
Index: libcfa/src/concurrency/preemption.cfa
===================================================================
--- libcfa/src/concurrency/preemption.cfa	(revision fbb930ec77eae01fe0f6a0d17ebf91b832058985)
+++ libcfa/src/concurrency/preemption.cfa	(revision 01ba701f5c1c1d6c0b87e801d9525b3d89e5269f)
@@ -666,5 +666,5 @@
 // Kernel Signal Handlers
 //=============================================================================================
-__cfaabi_dbg_debug_do( static thread_local void * last_interrupt = 0; )
+__cfaabi_dbg_debug_do( static _Thread_local void * last_interrupt = 0; )
 
 // Context switch signal handler