Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: third_party/tcmalloc/chromium/src/thread_cache.cc

Issue 10035012: Added compile-time define to add "initial-exec" attribute. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added comments. Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 765786ff40302004b1b128bc38ebcafdf8309d58..20e89c25a0e5866e97f2843f14eacdb719cc7598 100644
--- a/third_party/tcmalloc/chromium/src/thread_cache.cc
+++ b/third_party/tcmalloc/chromium/src/thread_cache.cc
@@ -64,7 +64,10 @@ int ThreadCache::thread_heap_count_ = 0;
ThreadCache* ThreadCache::next_memory_steal_ = NULL;
#ifdef HAVE_TLS
__thread ThreadCache* ThreadCache::threadlocal_heap_
-# ifdef HAVE___ATTRIBUTE__
+// This code links against pyautolib.so which causes it to fail when dlopen()'d.
+// This is a workaround for that. By passing in -DPGO_GENERATE, we can disable
+// the "initial-exec" variable attribute.
+#if defined(HAVE___ATTRIBUTE__) && ! defined(PGO_GENERATE)
Alexander Potapenko 2012/04/24 10:38:15 Ditto.
asharif1 2012/04/24 17:50:12 Done.
__attribute__ ((tls_model ("initial-exec")))
# endif
;

Powered by Google App Engine
This is Rietveld 408576698