diff options
Diffstat (limited to 'testing/firefox/disable-moz-stackwalk.patch')
| -rw-r--r-- | testing/firefox/disable-moz-stackwalk.patch | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/testing/firefox/disable-moz-stackwalk.patch b/testing/firefox/disable-moz-stackwalk.patch index f4e14038b4..7f0f280dec 100644 --- a/testing/firefox/disable-moz-stackwalk.patch +++ b/testing/firefox/disable-moz-stackwalk.patch @@ -1,17 +1,11 @@ -MOZ_STACKWALK_SUPPORTS_LINUX requires GLIBC extensions, Android or -libunwind. Disable it unconditionally now as otherwise x86 build fails. - ---- firefox-45.0/mozglue/misc/StackWalk.cpp.orig -+++ firefox-45.0/mozglue/misc/StackWalk.cpp -@@ -42,10 +42,7 @@ - (defined(XP_DARWIN) && \ - (defined(__i386) || defined(__ppc__) || defined(HAVE__UNWIND_BACKTRACE))) +--- ./mozglue/misc/StackWalk.cpp.orig ++++ ./mozglue/misc/StackWalk.cpp +@@ -42,7 +42,7 @@ + #endif --#define MOZ_STACKWALK_SUPPORTS_LINUX \ -- (defined(linux) && \ -- ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ -- defined(HAVE__UNWIND_BACKTRACE))) -+#define MOZ_STACKWALK_SUPPORTS_LINUX 0 - - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) - #define HAVE___LIBC_STACK_END 1 + #if (defined(linux) && \ +- ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ ++ ((defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || \ + defined(HAVE__UNWIND_BACKTRACE))) + #define MOZ_STACKWALK_SUPPORTS_LINUX 1 + #else |