Index: third_party/tcmalloc/chromium/src/thread_cache.cc |
diff --git a/third_party/tcmalloc/chromium/src/thread_cache.cc b/third_party/tcmalloc/chromium/src/thread_cache.cc |
index 1ad0f6d66d675011b7ec7db74a6f5b1a0afdf9b7..7ca92719b3d4ccc448333d9e21117aed85c9bf2c 100644 |
--- a/third_party/tcmalloc/chromium/src/thread_cache.cc |
+++ b/third_party/tcmalloc/chromium/src/thread_cache.cc |
@@ -66,7 +66,11 @@ ThreadCache* ThreadCache::next_memory_steal_ = NULL; |
__thread ThreadCache* ThreadCache::threadlocal_heap_ |
// See comments in thread_cache.h about this. Bug here: |
// http://code.google.com/p/chromium/issues/detail?id=124489 |
-#if defined(HAVE___ATTRIBUTE__) && !defined(PGO_GENERATE) |
+// |
+// gcc has a problem with this tls model on arm. |
+// See https://bugs.chromium.org/p/chromium/issues/detail?id=650137 |
+#if defined(HAVE___ATTRIBUTE__) && !defined(PGO_GENERATE) && \ |
+ !(!defined(__clang__) && defined(OS_CHROMEOS) && defined(__arm__)) |
__attribute__ ((tls_model ("initial-exec"))) |
# endif |
; |