summaryrefslogtreecommitdiffstats
path: root/third_party/tcmalloc
diff options
context:
space:
mode:
authorcraig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 13:38:19 +0000
committercraig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 13:38:19 +0000
commit9ab645068477d04d435bbdbd1d2a1a0363243641 (patch)
treef9b7accc6d46361caa43d08b61a1fa557c3a5fd2 /third_party/tcmalloc
parent9d98c225bd27bcccdd3412e4741896813fd8a48e (diff)
downloadchromium_src-9ab645068477d04d435bbdbd1d2a1a0363243641.zip
chromium_src-9ab645068477d04d435bbdbd1d2a1a0363243641.tar.gz
chromium_src-9ab645068477d04d435bbdbd1d2a1a0363243641.tar.bz2
Linux: Fix compilation issue with gcc-4.1.2.
This patch is upstream already as part of google-perftools r97. BUG=52114 TEST=compiles with older gcc Review URL: http://codereview.chromium.org/3137035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc')
-rw-r--r--third_party/tcmalloc/chromium/src/stacktrace_x86-inl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/tcmalloc/chromium/src/stacktrace_x86-inl.h b/third_party/tcmalloc/chromium/src/stacktrace_x86-inl.h
index 6753fdb..a140ab6 100644
--- a/third_party/tcmalloc/chromium/src/stacktrace_x86-inl.h
+++ b/third_party/tcmalloc/chromium/src/stacktrace_x86-inl.h
@@ -297,7 +297,7 @@ int GET_STACK_TRACE_OR_FRAMES {
// sp[2] first argument
// ...
// NOTE: This will break under llvm, since result is a copy and not in sp[2]
- sp = (void **)&pcs - 2;
+ sp = (void **)&result - 2;
#elif defined(__x86_64__)
unsigned long rbp;
// Move the value of the register %rbp into the local variable rbp.