Index: benchmark/basic/tls_fetch_add.c
===================================================================
--- benchmark/basic/tls_fetch_add.c	(revision e5c04b99195bbe87492bf8f6370fc4f500485135)
+++ benchmark/basic/tls_fetch_add.c	(revision 1bcbf025a64d88a84a86c7b5d07e08eaeefc8b36)
@@ -7,5 +7,5 @@
 // thread_local Boolean. This means the entire protocol is just to "mov" instructions making it extremely cheap.
 
-_Thread_local volatile bool value;
+__thread volatile bool value;
 
 void __attribute__((noinline)) do_call() {
Index: libcfa/src/concurrency/kernel/fwd.hfa
===================================================================
--- libcfa/src/concurrency/kernel/fwd.hfa	(revision e5c04b99195bbe87492bf8f6370fc4f500485135)
+++ libcfa/src/concurrency/kernel/fwd.hfa	(revision 1bcbf025a64d88a84a86c7b5d07e08eaeefc8b36)
@@ -35,5 +35,5 @@
 extern "C" {
 	extern "Cforall" {
-		extern __attribute__((aligned(64))) _Thread_local struct KernelThreadData {
+		extern __attribute__((aligned(64))) __thread 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 e5c04b99195bbe87492bf8f6370fc4f500485135)
+++ libcfa/src/concurrency/kernel/private.hfa	(revision 1bcbf025a64d88a84a86c7b5d07e08eaeefc8b36)
@@ -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 volatile struct rseq __cfaabi_rseq;
 	}
 #else
Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision e5c04b99195bbe87492bf8f6370fc4f500485135)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision 1bcbf025a64d88a84a86c7b5d07e08eaeefc8b36)
@@ -133,5 +133,5 @@
 //-----------------------------------------------------------------------------
 // Global state
-_Thread_local struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
+__thread 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 volatile struct rseq __cfaabi_rseq @= {
 			.cpu_id : RSEQ_CPU_ID_UNINITIALIZED,
 		};
Index: libcfa/src/concurrency/preemption.cfa
===================================================================
--- libcfa/src/concurrency/preemption.cfa	(revision e5c04b99195bbe87492bf8f6370fc4f500485135)
+++ libcfa/src/concurrency/preemption.cfa	(revision 1bcbf025a64d88a84a86c7b5d07e08eaeefc8b36)
@@ -666,5 +666,5 @@
 // Kernel Signal Handlers
 //=============================================================================================
-__cfaabi_dbg_debug_do( static _Thread_local void * last_interrupt = 0; )
+__cfaabi_dbg_debug_do( static __thread void * last_interrupt = 0; )
 
 // Context switch signal handler
Index: tests/concurrent/clib_tls.c
===================================================================
--- tests/concurrent/clib_tls.c	(revision e5c04b99195bbe87492bf8f6370fc4f500485135)
+++ tests/concurrent/clib_tls.c	(revision 1bcbf025a64d88a84a86c7b5d07e08eaeefc8b36)
@@ -14,5 +14,5 @@
 
 
-_Thread_local int checkval = 0xBAADF00D;
+__thread int checkval = 0xBAADF00D;
 
 void init(void * ) {
Index: tests/concurrent/park/contention.cfa
===================================================================
--- tests/concurrent/park/contention.cfa	(revision e5c04b99195bbe87492bf8f6370fc4f500485135)
+++ tests/concurrent/park/contention.cfa	(revision 1bcbf025a64d88a84a86c7b5d07e08eaeefc8b36)
@@ -2,5 +2,5 @@
 #include <thread.hfa>
 
-_Thread_local drand48_data buffer = { 0 };
+__thread drand48_data buffer = { 0 };
 int myrand() {
 	long int result;