# HG changeset patch # User Wolfgang Rosenauer # Date 1410725716 -7200 # Node ID 395d31877a011de991b7f9e8b75f84b12081c20b # Parent 9f6de8c8a5c5442170acfbff143e9fef78e1b96a removed obsolete mozilla-ppc.patch diff -r 9f6de8c8a5c5 -r 395d31877a01 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sun Sep 14 21:57:55 2014 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Sun Sep 14 22:15:16 2014 +0200 @@ -115,9 +115,6 @@ Patch10: mozilla-sle11.patch Patch11: mozilla-icu-strncat.patch Patch12: mozilla-arm-disable-edsp.patch -Patch13: mozilla-ppc.patch -Patch14: mozilla-libproxy-compat.patch - # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-kde-114.patch @@ -256,8 +253,6 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 -p1 - # Firefox %patch101 -p1 %if %suse_version >= 1140 diff -r 9f6de8c8a5c5 -r 395d31877a01 MozillaFirefox/mozilla-ppc.patch --- a/MozillaFirefox/mozilla-ppc.patch Sun Sep 14 21:57:55 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-ppc.patch \ No newline at end of file diff -r 9f6de8c8a5c5 -r 395d31877a01 mozilla-ppc.patch --- a/mozilla-ppc.patch Sun Sep 14 21:57:55 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -# HG changeset patch -# Parent 21d0e194954e451f0f1935d0ed68ee9eae432ddf -# User Wolfgang Rosenauer -Bug 746112 - RegExp hang on ppc64 in execute. - -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 -@@ -180,17 +180,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/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c ---- a/memory/mozjemalloc/jemalloc.c -+++ b/memory/mozjemalloc/jemalloc.c -@@ -1099,17 +1099,17 @@ 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(__ia64__) && !defined(__sparc__) && !defined(__mips__) -+#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !(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.