Index: uspace/lib/libc/arch/arm32/include/tls.h
===================================================================
--- uspace/lib/libc/arch/arm32/include/tls.h	(revision 9ae22ba11c1a294894242607929d65e81a3c524b)
+++ uspace/lib/libc/arch/arm32/include/tls.h	(revision 1cbed6b67e561945fc06922f3d178d328ae94041)
@@ -41,5 +41,5 @@
 #define CONFIG_TLS_VARIANT_1
 
-/** Offsets for accessing __thread variables are shifted 8 bytes higher. */
+/** Offsets for accessing thread-local variables are shifted 8 bytes higher. */
 #define ARM_TP_OFFSET  (-8)
 
Index: uspace/lib/libc/generic/async.c
===================================================================
--- uspace/lib/libc/generic/async.c	(revision 9ae22ba11c1a294894242607929d65e81a3c524b)
+++ uspace/lib/libc/generic/async.c	(revision 1cbed6b67e561945fc06922f3d178d328ae94041)
@@ -175,5 +175,5 @@
 
 /** Identifier of the incoming connection handled by the current fibril. */
-__thread connection_t *FIBRIL_connection;
+fibril_local connection_t *FIBRIL_connection;
 
 static void default_client_connection(ipc_callid_t callid, ipc_call_t *call);
Index: uspace/lib/libc/generic/fibril.c
===================================================================
--- uspace/lib/libc/generic/fibril.c	(revision 9ae22ba11c1a294894242607929d65e81a3c524b)
+++ uspace/lib/libc/generic/fibril.c	(revision 1cbed6b67e561945fc06922f3d178d328ae94041)
@@ -65,6 +65,6 @@
 /** Number of threads that are executing a manager fibril and are serialized. */
 static int serialized_threads;	/* Protected by async_futex */
-/** Thread-local count of serialization. If > 0, we must not preempt */
-static __thread int serialization_count;
+/** Fibril-local count of serialization. If > 0, we must not preempt */
+static fibril_local int serialization_count;
 
 /** Setup fibril information into TCB structure */
Index: uspace/lib/libc/include/fibril.h
===================================================================
--- uspace/lib/libc/include/fibril.h	(revision 9ae22ba11c1a294894242607929d65e81a3c524b)
+++ uspace/lib/libc/include/fibril.h	(revision 1cbed6b67e561945fc06922f3d178d328ae94041)
@@ -73,4 +73,7 @@
 typedef struct fibril fibril_t;
 
+/** Fibril-local variable specifier */
+#define fibril_local __thread
+
 extern int context_save(context_t *c);
 extern void context_restore(context_t *c) __attribute__ ((noreturn));