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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/tcmalloc/chromium/src/stacktrace_config.h

Issue 7430007: Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch. Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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
« third_party/tcmalloc/chromium/src/common.cc ('K') | « third_party/tcmalloc/chromium/src/stacktrace.cc ('k') | third_party/tcmalloc/chromium/src/stacktrace_nacl-inl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/tcmalloc/chromium/src/stacktrace_config.h
===================================================================
--- third_party/tcmalloc/chromium/src/stacktrace_config.h (revision 94429)
+++ third_party/tcmalloc/chromium/src/stacktrace_config.h (working copy)
@@ -46,8 +46,11 @@
#ifndef BASE_STACKTRACE_CONFIG_H_
#define BASE_STACKTRACE_CONFIG_H_
-// First, the i386 and x86_64 case.
-#if (defined(__i386__) || defined(__x86_64__)) && __GNUC__ >= 2
+#ifdef __native_client__
+# define STACKTRACE_INL_HEADER "base/stacktrace_nacl-inl.h"
+
+// i386 and x86_64 case.
+#elif (defined(__i386__) || defined(__x86_64__)) && __GNUC__ >= 2
# if !defined(NO_FRAME_POINTER)
# define STACKTRACE_INL_HEADER "stacktrace_x86-inl.h"
# define STACKTRACE_SKIP_CONTEXT_ROUTINES 1
« third_party/tcmalloc/chromium/src/common.cc ('K') | « third_party/tcmalloc/chromium/src/stacktrace.cc ('k') | third_party/tcmalloc/chromium/src/stacktrace_nacl-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698