diff --git a/nx/Makefile b/nx/Makefile
index 85e1990a..5db6df16 100644
--- a/nx/Makefile
+++ b/nx/Makefile
@@ -32,7 +32,7 @@ INCLUDES	:=	include
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-ARCH	:=	-march=armv8-a -mtp=soft -fPIC
+ARCH	:=	-march=armv8-a -mtp=soft -fPIC -ftls-model=local-exec
 
 CFLAGS	:=	-g -Wall -Werror \
 			-ffunction-sections \
diff --git a/nx/source/devices/fs_dev.c b/nx/source/devices/fs_dev.c
index 59c141e0..161c5af6 100644
--- a/nx/source/devices/fs_dev.c
+++ b/nx/source/devices/fs_dev.c
@@ -110,8 +110,8 @@ static fsdev_fsdevice fsdev_fsdevices[32];
 /*! @endcond */
 
 static char     __cwd[PATH_MAX+1] = "/";
-static /*__thread*/ char     __fixedpath[PATH_MAX+1];
-//static /*__thread*/ uint16_t __utf16path[PATH_MAX+1];
+static __thread char     __fixedpath[PATH_MAX+1];
+//static __thread uint16_t __utf16path[PATH_MAX+1];
 
 static fsdev_fsdevice *fsdevFindDevice(const char *name)
 {
@@ -658,7 +658,7 @@ fsdev_write_safe(struct _reent *r,
   /* Copy to internal buffer and write in chunks.
    * You cannot write from read-only memory.
    */
-  static /*__thread*/ char tmp_buffer[8192];
+  static __thread char tmp_buffer[8192];
   while(len > 0)
   {
     size_t toWrite = len;