summaryrefslogtreecommitdiffstats
path: root/third_party/tcmalloc/chromium/src/stacktrace_config.h
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-12 10:37:07 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-12 10:37:07 +0000
commitd38093cebd5f1cf854024b4203ab4c8df5493855 (patch)
treee16021ee23455edafae4fcdd680a797b2d43a56d /third_party/tcmalloc/chromium/src/stacktrace_config.h
parent245bad9e9960496c1b09f2894c7f90d320993e8d (diff)
downloadchromium_src-d38093cebd5f1cf854024b4203ab4c8df5493855.zip
chromium_src-d38093cebd5f1cf854024b4203ab4c8df5493855.tar.gz
chromium_src-d38093cebd5f1cf854024b4203ab4c8df5493855.tar.bz2
Land http://codereview.chromium.org/576001 again temporarily.
TBR=jar,antonm Review URL: http://codereview.chromium.org/596083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc/chromium/src/stacktrace_config.h')
-rw-r--r--third_party/tcmalloc/chromium/src/stacktrace_config.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/third_party/tcmalloc/chromium/src/stacktrace_config.h b/third_party/tcmalloc/chromium/src/stacktrace_config.h
index 3bd0fb3..b58ab1d 100644
--- a/third_party/tcmalloc/chromium/src/stacktrace_config.h
+++ b/third_party/tcmalloc/chromium/src/stacktrace_config.h
@@ -46,17 +46,8 @@
#ifndef BASE_STACKTRACE_CONFIG_H_
#define BASE_STACKTRACE_CONFIG_H_
-// First, the i386 case.
-#if defined(__i386__) && __GNUC__ >= 2
-# if !defined(NO_FRAME_POINTER)
-# define STACKTRACE_INL_HEADER "stacktrace_x86-inl.h"
-# define STACKTRACE_SKIP_CONTEXT_ROUTINES 1
-# else
-# define STACKTRACE_INL_HEADER "stacktrace_generic-inl.h"
-# endif
-
-// Now, the x86_64 case.
-#elif defined(__x86_64__) && __GNUC__ >= 2
+// First, the i386 and x86_64 case.
+#if (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