aboutsummaryrefslogtreecommitdiffstats
path: root/testing/firefox/disable-moz-stackwalk.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-11-15 18:19:01 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-11-15 18:19:01 +0000
commite9a0d6ecb6e0ee28fb46bafacf4580acc4f6c248 (patch)
treeb5e934f97fe255c000c6cfcd60054b898ff385f4 /testing/firefox/disable-moz-stackwalk.patch
parentf990b4097693af55af3ec044b04338a4b036bf67 (diff)
testing/firefox: upgrade to 50.0
Diffstat (limited to 'testing/firefox/disable-moz-stackwalk.patch')
-rw-r--r--testing/firefox/disable-moz-stackwalk.patch26
1 files changed, 10 insertions, 16 deletions
diff --git a/testing/firefox/disable-moz-stackwalk.patch b/testing/firefox/disable-moz-stackwalk.patch
index f4e14038b45..7f0f280decf 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