57 lines
2.1 KiB
C++
57 lines
2.1 KiB
C++
$NetBSD: patch-mozilla_xpcom_base_nsStackWalk.cpp,v 1.5 2015/02/15 02:11:03 ryoon Exp $
|
|
|
|
--- mozilla/xpcom/base/nsStackWalk.cpp.orig 2015-02-05 04:38:49.000000000 +0000
|
|
+++ mozilla/xpcom/base/nsStackWalk.cpp
|
|
@@ -34,12 +34,12 @@ static CriticalAddress gCriticalAddress;
|
|
#define _GNU_SOURCE
|
|
#endif
|
|
|
|
-#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
|
|
+#if defined(HAVE_DLOPEN) || defined(XP_DARWIN)
|
|
#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 \
|
|
@@ -47,7 +47,7 @@ static CriticalAddress gCriticalAddress;
|
|
((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
|
|
defined(HAVE__UNWIND_BACKTRACE)))
|
|
|
|
-#if NSSTACKWALK_SUPPORTS_MACOSX
|
|
+#if NSSTACKWALK_SUPPORTS_DARWIN
|
|
#include <pthread.h>
|
|
#include <CoreServices/CoreServices.h>
|
|
|
|
@@ -832,7 +832,7 @@ NS_DescribeCodeAddress(void* aPC, nsCode
|
|
}
|
|
|
|
// i386 or PPC Linux stackwalking code
|
|
-#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_MACOSX)
|
|
+#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_DARWIN)
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
@@ -903,7 +903,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;
|
|
@@ -933,7 +933,7 @@ FramePointerStackWalk(NS_WalkStackCallba
|
|
}
|
|
|
|
#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
|
|
|
|
EXPORT_XPCOM_API(nsresult)
|
|
NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames,
|