Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch.

third_party/tcmalloc/chromium/src/profile-handler.cc

Index: third_party/tcmalloc/chromium/src/profile-handler.cc
===================================================================
--- third_party/tcmalloc/chromium/src/profile-handler.cc	(revision 94429)
+++ third_party/tcmalloc/chromium/src/profile-handler.cc	(working copy)
@@ -36,7 +36,7 @@
 #include "config.h"
 #include "profile-handler.h"
 
-#if !(defined(__CYGWIN__) || defined(__CYGWIN32__))
+#if !(defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(__native_client__)
 
 #include <stdio.h>
 #include <errno.h>
@@ -478,12 +478,14 @@
   ProfileHandler::Instance()->GetState(state);
 }
 
-#else  // OS_CYGWIN
+#else  // !defined(OS_CYGWIN) && !defined(__native_client__)
 
 // ITIMER_PROF doesn't work under cygwin.  ITIMER_REAL is available, but doesn't
 // work as well for profiling, and also interferes with alarm().  Because of
 // these issues, unless a specific need is identified, profiler support is
 // disabled under Cygwin.
+//
+// Native Client runtime also does not have signals working.
 extern "C" void ProfileHandlerRegisterThread() {
 }
 
@@ -501,4 +503,4 @@
 extern "C" void ProfileHandlerGetState(ProfileHandlerState* state) {
 }
 
-#endif  // OS_CYGWIN
+#endif  // !defined(OS_CYGWIN) && !defined(__native_client__)
Property changes on: third_party/tcmalloc/chromium/src/profile-handler.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/third_party/tcmalloc/vendor/src/profile-handler.cc:r93000