From 9d75222418a1e7d1d5025614bdc265d7ad3555ea Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Tue, 28 Feb 2006 18:28:54 +0000 Subject: [PATCH] Bug 328855 - Support x86-64 in nsStackFrameUnix, r=dbaron git-svn-id: svn://10.0.0.236/trunk@191410 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/base/nsStackFrameUnix.cpp | 2 +- mozilla/xpcom/base/nsTraceRefcntImpl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/xpcom/base/nsStackFrameUnix.cpp b/mozilla/xpcom/base/nsStackFrameUnix.cpp index 6899a44dbf0..b568ddfaeb2 100644 --- a/mozilla/xpcom/base/nsStackFrameUnix.cpp +++ b/mozilla/xpcom/base/nsStackFrameUnix.cpp @@ -83,7 +83,7 @@ void DemangleSymbol(const char * aSymbol, } -#if defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code +#if defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC) || defined(__x86_64__)) // i386 or PPC Linux stackwalking code void DumpStackToFile(FILE* aStream) diff --git a/mozilla/xpcom/base/nsTraceRefcntImpl.cpp b/mozilla/xpcom/base/nsTraceRefcntImpl.cpp index f72683be580..98054138b7c 100644 --- a/mozilla/xpcom/base/nsTraceRefcntImpl.cpp +++ b/mozilla/xpcom/base/nsTraceRefcntImpl.cpp @@ -823,7 +823,7 @@ nsTraceRefcntImpl::WalkTheStack(FILE* aStream) // WIN32 x86 stack walking code // i386 or PPC Linux stackwalking code or Solaris -#elif (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))) +#elif (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC) || defined(__x86_64__))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))) #include "nsStackFrameUnix.h" NS_COM void nsTraceRefcntImpl::WalkTheStack(FILE* aStream)