From 1b7eaf06179cd7d3e15b35774fe12ff7aba39daa Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 19 Mar 2015 15:25:05 -0700
Subject: [PATCH] Disable tlsdesc stuff.

---
 sysdeps/arm/nacl/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysdeps/arm/nacl/Makefile b/sysdeps/arm/nacl/Makefile
index afe27333aa9..5e56895cbd5 100644
--- a/sysdeps/arm/nacl/Makefile
+++ b/sysdeps/arm/nacl/Makefile
@@ -1,5 +1,5 @@
-# XXX temporary until the compiler build can be fixed
-sysdep-CPPFLAGS += -D__ARM_NEON__=1
+# We don't really support TLSDESC, even though the compiler thinks it does.
+have-arm-tls-desc = no
 
 ifeq ($(subdir),csu)
 sysdep_routines += aeabi_read_tp
-- 
2.47.2