diff options
Diffstat (limited to 'mail/thunderbird/patches/patch-ax')
| -rw-r--r-- | mail/thunderbird/patches/patch-ax | 59 |
1 files changed, 51 insertions, 8 deletions
diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax index abb226b8568..d7274f22237 100644 --- a/mail/thunderbird/patches/patch-ax +++ b/mail/thunderbird/patches/patch-ax @@ -1,13 +1,56 @@ -$NetBSD: patch-ax,v 1.13 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-ax,v 1.14 2014/07/27 20:04:59 ryoon Exp $ ---- mozilla/xpcom/base/nsStackWalk.cpp.orig 2013-10-23 22:09:21.000000000 +0000 +--- mozilla/xpcom/base/nsStackWalk.cpp.orig 2014-07-18 00:05:57.000000000 +0000 +++ mozilla/xpcom/base/nsStackWalk.cpp -@@ -853,7 +853,7 @@ void DemangleSymbol(const char * aSymbol - } +@@ -33,8 +33,8 @@ static CriticalAddress gCriticalAddress; + #include <dlfcn.h> + #endif + +-#define NSSTACKWALK_SUPPORTS_MACOSX \ +- (defined(XP_MACOSX) && \ ++#define NSSTACKWALK_SUPPORTS_DARWIN \ ++ (defined(XP_DARWIN) && \ + (defined(__i386) || defined(__ppc__) || defined(HAVE__UNWIND_BACKTRACE))) + + #define NSSTACKWALK_SUPPORTS_LINUX \ +@@ -42,11 +42,11 @@ static CriticalAddress gCriticalAddress; + ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ + defined(HAVE__UNWIND_BACKTRACE))) + +-#define NSSTACKWALK_SUPPORTS_SOLARIS \ ++#define notNSSTACKWALK_SUPPORTS_SOLARIS \ + (defined(__sun) && \ + (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))) +-#if NSSTACKWALK_SUPPORTS_MACOSX ++#if NSSTACKWALK_SUPPORTS_DARWIN + #include <pthread.h> + #include <CoreServices/CoreServices.h> + +@@ -838,7 +838,7 @@ NS_FormatCodeAddressDetails(void *aPC, c + + // WIN32 x86 stack walking code + // i386 or PPC Linux stackwalking code or Solaris +-#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_SOLARIS || NSSTACKWALK_SUPPORTS_MACOSX) ++#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_SOLARIS || NSSTACKWALK_SUPPORTS_DARWIN) + + #include <stdlib.h> + #include <string.h> +@@ -1162,7 +1162,7 @@ FramePointerStackWalk(NS_WalkStackCallba + (long(next) & 3)) { + break; + } +-#if (defined(__ppc__) && defined(XP_MACOSX)) || defined(__powerpc64__) ++#if (defined(__ppc__) && defined(XP_DARWIN)) || defined(__powerpc64__) + // ppc mac or powerpc64 linux + void *pc = *(bp+2); + bp += 3; +@@ -1192,7 +1192,7 @@ FramePointerStackWalk(NS_WalkStackCallba + } --#if NSSTACKWALK_SUPPORTS_SOLARIS -+#if notNSSTACKWALK_SUPPORTS_SOLARIS + #define X86_OR_PPC (defined(__i386) || defined(PPC) || defined(__ppc__)) +-#if X86_OR_PPC && (NSSTACKWALK_SUPPORTS_MACOSX || NSSTACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code ++#if X86_OR_PPC && (NSSTACKWALK_SUPPORTS_DARWIN || NSSTACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code - /* - * Stack walking code for Solaris courtesy of Bart Smaalder's "memtrak". + EXPORT_XPCOM_API(nsresult) + NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, |