From e5beda73e64da2f117a3590be5dc41f54208ad69e2e021072faba3975bf449f5 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 16 Jul 2012 18:54:48 +0000 Subject: [PATCH] - PPC fixes: * reenabled mozilla-yarr-pcre.patch to fix build for PPC * add patches for bmo#750620 and bmo#746112 * fix xpcshell segfault on ppc OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=285 --- MozillaFirefox.changes | 5 +- MozillaFirefox.spec | 2 + mozilla-ppc.patch | 115 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 mozilla-ppc.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index d3a1d9a7..41cae64e 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -4,10 +4,13 @@ Sat Jul 14 19:31:51 UTC 2012 - wr@rosenauer.org - update to 14.0.1 (bnc#) - license change from tri license to MPL-2.0 - fix crashreporter restart option (bmo#762780) -- reenabled mozilla-yarr-pcre.patch to fix build for PPC - require NSS 3.13.5 - remove mozjs pacrunner obsoletes again for now - adopted mozilla-prefer_plugin_pref.patch +- PPC fixes: + * reenabled mozilla-yarr-pcre.patch to fix build for PPC + * add patches for bmo#750620 and bmo#746112 + * fix xpcshell segfault on ppc ------------------------------------------------------------------- Fri Jun 15 12:37:09 UTC 2012 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index fd3638f0..cc4f140e 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -98,6 +98,7 @@ Patch13: mozilla-yarr-pcre.patch Patch14: mozilla-gcc47.patch Patch15: mozilla-arm-disable-edsp.patch Patch16: mozilla-crashreporter-restart-args.patch +Patch17: mozilla-ppc.patch # Firefox/browser Patch30: firefox-browser-css.patch Patch31: firefox-kde.patch @@ -228,6 +229,7 @@ cd $RPM_BUILD_DIR/mozilla %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 # %patch30 -p1 %if %suse_version >= 1110 diff --git a/mozilla-ppc.patch b/mozilla-ppc.patch new file mode 100644 index 00000000..e260fd3a --- /dev/null +++ b/mozilla-ppc.patch @@ -0,0 +1,115 @@ +# HG changeset patch +# Parent 67e6f1e1d06ca3d54cea1d26877c2a68f0c096e5 +# User Wolfgang Rosenauer +Bug 746112 - RegExp hang on ppc64 in execute. +Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15 + +diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h +--- a/js/src/yarr/YarrInterpreter.h ++++ b/js/src/yarr/YarrInterpreter.h +@@ -162,17 +162,17 @@ struct ByteTerm { + , m_invert(invert) + { + atom.characterClass = characterClass; + atom.quantityType = QuantifierFixedCount; + atom.quantityCount = 1; + inputPosition = inputPos; + } + +- ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) ++ ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) __attribute__((noinline)) + : type(type) + , m_capture(capture) + , m_invert(false) + { + atom.subpatternId = subpatternId; + atom.parenthesesDisjunction = parenthesesInfo; + atom.quantityType = QuantifierFixedCount; + atom.quantityCount = 1; +@@ -183,17 +183,17 @@ struct ByteTerm { + : type(type) + , m_capture(false) + , m_invert(invert) + { + atom.quantityType = QuantifierFixedCount; + atom.quantityCount = 1; + } + +- ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) ++ ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) __attribute__((noinline)) + : type(type) + , m_capture(capture) + , m_invert(invert) + { + atom.subpatternId = subpatternId; + atom.quantityType = QuantifierFixedCount; + atom.quantityCount = 1; + inputPosition = inputPos; +diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h +--- a/js/src/yarr/YarrPattern.h ++++ b/js/src/yarr/YarrPattern.h +@@ -166,17 +166,17 @@ struct PatternTerm { + , m_capture(false) + , m_invert(invert) + { + characterClass = charClass; + quantityType = QuantifierFixedCount; + quantityCount = 1; + } + +- PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) ++ PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) __attribute__((noinline)) + : type(type) + , m_capture(capture) + , m_invert(invert) + { + parentheses.disjunction = disjunction; + parentheses.subpatternId = subpatternId; + parentheses.isCopy = false; + parentheses.isTerminal = false; +diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c +--- a/memory/jemalloc/jemalloc.c ++++ b/memory/jemalloc/jemalloc.c +@@ -1086,17 +1086,19 @@ struct arena_s { + static unsigned ncpus; + #endif + + /* + * When MALLOC_STATIC_SIZES is defined most of the parameters + * controlling the malloc behavior are defined as compile-time constants + * for best performance and cannot be altered at runtime. + */ ++#if !(defined(__powerpc__)) + #define MALLOC_STATIC_SIZES 1 ++#endif + + #ifdef MALLOC_STATIC_SIZES + + /* + * VM page size. It must divide the runtime CPU page size or the code + * will abort. + */ + #define pagesize_2pow ((size_t) 12) +diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h +--- a/mfbt/double-conversion/utils.h ++++ b/mfbt/double-conversion/utils.h +@@ -49,17 +49,18 @@ + // evaluate: 89255.0/1e22. If the floating-point stack is 64 bits wide then + // the result is equal to 89255e-22. + // The best way to test this, is to create a division-function and to compare + // the output of the division with the expected result. (Inlining must be + // disabled.) + // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) + #if defined(_M_X64) || defined(__x86_64__) || \ + defined(__ARMEL__) || \ +- defined(_MIPS_ARCH_MIPS32R2) ++ defined(_MIPS_ARCH_MIPS32R2) || \ ++ defined(__powerpc__) || defined(__powerpc64__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) + // Windows uses a 64bit wide floating point stack. + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #else + #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS + #endif // _WIN32