From df2ac26e72f4fd9912f2144f1e308509561e6f54 Mon Sep 17 00:00:00 2001 From: jbeich Date: Tue, 12 Sep 2017 05:51:26 +0000 Subject: MFH: r449673 www/firefox: unbreak on powerpc64, sparc64 In file included from objdir/dist/include/mozilla/dom/EventTarget.h:12:0, from dom/base/nsPIDOMWindow.h:15, from objdir/dist/include/mozilla/DOMEventTargetHelper.h:13, from dom/presentation/PresentationAvailability.h:10, from dom/presentation/AvailabilityCollection.cpp:10, from objdir/dom/presentation/Unified_cpp_dom_presentation0.cpp:2: dom/base/nsWrapperCache.h:48:1: error: static assertion failed: Only support 32-bit and 64-bit static_assert(sizeof(void*) == 4, "Only support 32-bit and 64-bit"); ^ Reported by: Martin Husemann (via upstream bug) Approved by: ports-secteam blanket --- www/firefox/files/patch-bug1376277 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 www/firefox/files/patch-bug1376277 diff --git a/www/firefox/files/patch-bug1376277 b/www/firefox/files/patch-bug1376277 new file mode 100644 index 0000000..7716483 --- /dev/null +++ b/www/firefox/files/patch-bug1376277 @@ -0,0 +1,22 @@ +commit ac723ae99f3a +Author: Petr Sumbera +Date: Tue Jun 27 01:33:49 2017 -0700 + + Bug 1376277 - nsWrapperCache.h: add support for 64bits sparc build. r=glandium +--- + dom/base/nsWrapperCache.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git dom/base/nsWrapperCache.h dom/base/nsWrapperCache.h +index b00d7aceb5c8..994ed73332ff 100644 +--- dom/base/nsWrapperCache.h ++++ dom/base/nsWrapperCache.h +@@ -41,7 +41,7 @@ class nsWindowRoot; + // This may waste space for some other nsWrapperCache-derived objects that have + // a 32-bit field as their first member, but those objects are unlikely to be as + // numerous or performance-critical as DOM nodes. +-#if defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__) ++#if defined(_M_X64) || defined(__LP64__) + static_assert(sizeof(void*) == 8, "These architectures should be 64-bit"); + #define BOOL_FLAGS_ON_WRAPPER_CACHE + #else -- cgit v1.1