Merge branch 'master' of ssh://pkgs.fedoraproject.org/xulrunner
This commit is contained in:
Martin Stransky
commit
09dda616bc
10 changed files with 109 additions and 426 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -27,3 +27,4 @@ xulrunner-1.9.3.0b3.source.tar.bz2
|
|||
/xulrunner-11.0b7.source.tar.bz2
|
||||
/xulrunner-11.0.source.tar.bz2
|
||||
/xulrunner-12.0.source.tar.bz2
|
||||
/xulrunner-13.0.source.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -up xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h
|
||||
--- xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 2012-04-21 00:03:53.000000000 +0200
|
||||
+++ xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h 2012-05-04 10:23:50.000000000 +0200
|
||||
@@ -445,8 +445,6 @@ public:
|
||||
diff -up xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h
|
||||
--- xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 2012-06-01 14:04:02.000000000 +0200
|
||||
+++ xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h 2012-06-04 10:43:23.694175924 +0200
|
||||
@@ -467,8 +467,6 @@ public:
|
||||
{
|
||||
sync_instruction_memory((caddr_t)code, size);
|
||||
}
|
||||
|
|
@ -10,10 +10,10 @@ diff -up xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator
|
|||
#endif
|
||||
|
||||
private:
|
||||
diff -up xulrunner-12.0/mozilla-release/js/src/Makefile.in.691898 xulrunner-12.0/mozilla-release/js/src/Makefile.in
|
||||
--- xulrunner-12.0/mozilla-release/js/src/Makefile.in.691898 2012-04-21 00:03:53.000000000 +0200
|
||||
+++ xulrunner-12.0/mozilla-release/js/src/Makefile.in 2012-05-04 11:09:57.000000000 +0200
|
||||
@@ -349,20 +349,23 @@ CPPSRCS += checks.cc \
|
||||
diff -up xulrunner-13.0/mozilla-release/js/src/Makefile.in.691898 xulrunner-13.0/mozilla-release/js/src/Makefile.in
|
||||
--- xulrunner-13.0/mozilla-release/js/src/Makefile.in.691898 2012-06-01 14:04:02.000000000 +0200
|
||||
+++ xulrunner-13.0/mozilla-release/js/src/Makefile.in 2012-06-04 10:45:57.023808537 +0200
|
||||
@@ -337,20 +337,23 @@ CPPSRCS += checks.cc \
|
||||
# END enclude sources for V8 dtoa
|
||||
#############################################
|
||||
|
||||
|
|
@ -47,25 +47,30 @@ diff -up xulrunner-12.0/mozilla-release/js/src/Makefile.in.691898 xulrunner-12.0
|
|||
$(NULL)
|
||||
else
|
||||
|
||||
diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp
|
||||
--- xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 2012-04-21 00:03:56.000000000 +0200
|
||||
+++ xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp 2012-05-04 11:13:37.000000000 +0200
|
||||
@@ -392,7 +392,6 @@ Class js::RegExpClass = {
|
||||
regexp_trace
|
||||
};
|
||||
@@ -918,4 +921,3 @@ endif
|
||||
#
|
||||
# END kludges for the Nitro assembler
|
||||
###############################################
|
||||
-
|
||||
diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp
|
||||
--- xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 2012-06-01 14:04:05.000000000 +0200
|
||||
+++ xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp 2012-06-04 10:43:23.695175928 +0200
|
||||
@@ -167,7 +167,6 @@ MatchPairs::checkAgainst(size_t inputLen
|
||||
|
||||
/* detail::RegExpCode */
|
||||
|
||||
-#if ENABLE_YARR_JIT
|
||||
void
|
||||
RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
|
||||
RegExpCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
|
||||
{
|
||||
@@ -424,42 +423,6 @@ RegExpPrivateCode::reportYarrError(JSCon
|
||||
@@ -199,46 +198,9 @@ RegExpCode::reportYarrError(JSContext *c
|
||||
}
|
||||
}
|
||||
|
||||
-#else /* !ENABLE_YARR_JIT */
|
||||
-
|
||||
-void
|
||||
-RegExpPrivateCode::reportPCREError(JSContext *cx, int error)
|
||||
-RegExpCode::reportPCREError(JSContext *cx, int error)
|
||||
-{
|
||||
-#define REPORT(msg_) \
|
||||
- JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_ERROR, js_GetErrorMessage, NULL, msg_); \
|
||||
|
|
@ -99,11 +104,69 @@ diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrun
|
|||
-#endif /* ENABLE_YARR_JIT */
|
||||
-
|
||||
bool
|
||||
js::ParseRegExpFlags(JSContext *cx, JSString *flagStr, RegExpFlag *flagsOut)
|
||||
RegExpCode::compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags)
|
||||
{
|
||||
diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h
|
||||
--- xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 2012-04-21 00:03:56.000000000 +0200
|
||||
+++ xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h 2012-05-04 11:20:17.000000000 +0200
|
||||
-#if ENABLE_YARR_JIT
|
||||
/* Parse the pattern. */
|
||||
ErrorCode yarrError;
|
||||
YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
|
||||
@@ -255,7 +217,7 @@ RegExpCode::compile(JSContext *cx, JSLin
|
||||
* case we have to bytecode compile it.
|
||||
*/
|
||||
|
||||
-#ifdef JS_METHODJIT
|
||||
+#if ENABLE_YARR_JIT && defined(JS_METHODJIT)
|
||||
if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
|
||||
JSC::ExecutableAllocator *execAlloc = cx->runtime->getExecutableAllocator(cx);
|
||||
if (!execAlloc) {
|
||||
@@ -276,21 +238,11 @@ RegExpCode::compile(JSContext *cx, JSLin
|
||||
return false;
|
||||
}
|
||||
|
||||
+#if ENABLE_YARR_JIT
|
||||
codeBlock.setFallBack(true);
|
||||
+#endif
|
||||
byteCode = byteCompile(yarrPattern, bumpAlloc).get();
|
||||
return true;
|
||||
-#else /* !defined(ENABLE_YARR_JIT) */
|
||||
- int error = 0;
|
||||
- compiled = jsRegExpCompile(pattern.chars(), pattern.length(),
|
||||
- ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase,
|
||||
- multiline() ? JSRegExpMultiline : JSRegExpSingleLine,
|
||||
- parenCount, &error);
|
||||
- if (error) {
|
||||
- reportPCREError(cx, error);
|
||||
- return false;
|
||||
- }
|
||||
- return true;
|
||||
-#endif
|
||||
}
|
||||
|
||||
RegExpRunStatus
|
||||
@@ -305,19 +257,12 @@ RegExpCode::execute(JSContext *cx, const
|
||||
else
|
||||
result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
|
||||
#else
|
||||
- result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount);
|
||||
+ result = JSC::Yarr::interpret(byteCode, chars, start, length, output);
|
||||
#endif
|
||||
|
||||
if (result == -1)
|
||||
return RegExpRunStatus_Success_NotFound;
|
||||
|
||||
-#if !ENABLE_YARR_JIT
|
||||
- if (result < 0) {
|
||||
- reportPCREError(cx, result);
|
||||
- return RegExpRunStatus_Error;
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
JS_ASSERT(result >= 0);
|
||||
return RegExpRunStatus_Success;
|
||||
}
|
||||
diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h
|
||||
--- xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h.691898 2012-06-01 14:04:05.000000000 +0200
|
||||
+++ xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h 2012-06-04 10:47:03.609081248 +0200
|
||||
@@ -51,10 +51,8 @@
|
||||
#include "yarr/Yarr.h"
|
||||
#if ENABLE_YARR_JIT
|
||||
|
|
@ -114,11 +177,11 @@ diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunne
|
|||
#endif
|
||||
+#include "yarr/YarrSyntaxChecker.h"
|
||||
|
||||
namespace js {
|
||||
/*
|
||||
* JavaScript Regular Expressions
|
||||
@@ -112,68 +110,51 @@ namespace detail {
|
||||
|
||||
@@ -242,68 +240,51 @@ static const jschar GreedyStarChars[] =
|
||||
/* Abstracts away the gross |RegExpPrivate| backend details. */
|
||||
class RegExpPrivateCode
|
||||
class RegExpCode
|
||||
{
|
||||
-#if ENABLE_YARR_JIT
|
||||
typedef JSC::Yarr::BytecodePattern BytecodePattern;
|
||||
|
|
@ -138,7 +201,7 @@ diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunne
|
|||
+ BytecodePattern *byteCode;
|
||||
|
||||
public:
|
||||
RegExpPrivateCode()
|
||||
RegExpCode()
|
||||
:
|
||||
#if ENABLE_YARR_JIT
|
||||
codeBlock(),
|
||||
|
|
@ -149,7 +212,7 @@ diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunne
|
|||
+ byteCode(NULL)
|
||||
{ }
|
||||
|
||||
~RegExpPrivateCode() {
|
||||
~RegExpCode() {
|
||||
#if ENABLE_YARR_JIT
|
||||
codeBlock.release();
|
||||
+#endif
|
||||
|
|
@ -190,89 +253,29 @@ diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunne
|
|||
-#endif
|
||||
}
|
||||
|
||||
inline bool compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, uintN *parenCount,
|
||||
diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject-inl.h
|
||||
--- xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 2012-04-21 00:03:56.000000000 +0200
|
||||
+++ xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject-inl.h 2012-05-04 11:17:01.000000000 +0200
|
||||
@@ -357,6 +357,7 @@ detail::RegExpPrivate::create(JSContext
|
||||
return RetType(priv);
|
||||
bool compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags);
|
||||
diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h
|
||||
--- xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 2012-06-01 14:04:05.000000000 +0200
|
||||
+++ xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h 2012-06-04 10:43:23.695175928 +0200
|
||||
@@ -137,6 +137,7 @@ RegExpObject::setSticky(bool enabled)
|
||||
setSlot(STICKY_FLAG_SLOT, BooleanValue(enabled));
|
||||
}
|
||||
|
||||
+#if ENABLE_YARR_JIT
|
||||
/* This function should be deleted once bad Android platforms phase out. See bug 604774. */
|
||||
inline bool
|
||||
detail::RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx)
|
||||
@@ -367,12 +368,12 @@ detail::RegExpPrivateCode::isJITRuntimeE
|
||||
detail::RegExpCode::isJITRuntimeEnabled(JSContext *cx)
|
||||
@@ -147,6 +148,7 @@ detail::RegExpCode::isJITRuntimeEnabled(
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
+#endif
|
||||
|
||||
inline bool
|
||||
detail::RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts,
|
||||
uintN *parenCount, RegExpFlag flags)
|
||||
{
|
||||
-#if ENABLE_YARR_JIT
|
||||
/* Parse the pattern. */
|
||||
ErrorCode yarrError;
|
||||
YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
|
||||
@@ -389,7 +390,7 @@ detail::RegExpPrivateCode::compile(JSCon
|
||||
* case we have to bytecode compile it.
|
||||
*/
|
||||
|
||||
-#ifdef JS_METHODJIT
|
||||
+#if ENABLE_YARR_JIT && defined(JS_METHODJIT)
|
||||
if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
|
||||
JSC::ExecutableAllocator *execAlloc = cx->runtime->getExecutableAllocator(cx);
|
||||
if (!execAlloc) {
|
||||
@@ -410,21 +411,11 @@ detail::RegExpPrivateCode::compile(JSCon
|
||||
return false;
|
||||
}
|
||||
|
||||
+#if ENABLE_YARR_JIT
|
||||
codeBlock.setFallBack(true);
|
||||
+#endif
|
||||
byteCode = byteCompile(yarrPattern, bumpAlloc).get();
|
||||
return true;
|
||||
-#else /* !defined(ENABLE_YARR_JIT) */
|
||||
- int error = 0;
|
||||
- compiled = jsRegExpCompile(pattern.chars(), pattern.length(),
|
||||
- ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase,
|
||||
- multiline() ? JSRegExpMultiline : JSRegExpSingleLine,
|
||||
- parenCount, &error);
|
||||
- if (error) {
|
||||
- reportPCREError(cx, error);
|
||||
- return false;
|
||||
- }
|
||||
- return true;
|
||||
-#endif
|
||||
}
|
||||
|
||||
inline bool
|
||||
@@ -466,19 +457,12 @@ detail::RegExpPrivateCode::execute(JSCon
|
||||
else
|
||||
result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
|
||||
#else
|
||||
- result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount);
|
||||
+ result = JSC::Yarr::interpret(byteCode, chars, start, length, output);
|
||||
#endif
|
||||
|
||||
if (result == -1)
|
||||
return RegExpRunStatus_Success_NotFound;
|
||||
|
||||
-#if !ENABLE_YARR_JIT
|
||||
- if (result < 0) {
|
||||
- reportPCREError(cx, result);
|
||||
- return RegExpRunStatus_Error;
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
JS_ASSERT(result >= 0);
|
||||
return RegExpRunStatus_Success;
|
||||
}
|
||||
diff -up xulrunner-12.0/mozilla-release/js/src/yarr/wtfbridge.h.691898 xulrunner-12.0/mozilla-release/js/src/yarr/wtfbridge.h
|
||||
--- xulrunner-12.0/mozilla-release/js/src/yarr/wtfbridge.h.691898 2012-04-21 00:03:56.000000000 +0200
|
||||
+++ xulrunner-12.0/mozilla-release/js/src/yarr/wtfbridge.h 2012-05-04 10:23:50.000000000 +0200
|
||||
RegExpToShared(JSContext *cx, JSObject &obj, RegExpGuard *g)
|
||||
diff -up xulrunner-13.0/mozilla-release/js/src/yarr/wtfbridge.h.691898 xulrunner-13.0/mozilla-release/js/src/yarr/wtfbridge.h
|
||||
--- xulrunner-13.0/mozilla-release/js/src/yarr/wtfbridge.h.691898 2012-06-01 14:04:05.000000000 +0200
|
||||
+++ xulrunner-13.0/mozilla-release/js/src/yarr/wtfbridge.h 2012-06-04 10:43:23.696175932 +0200
|
||||
@@ -49,9 +49,7 @@
|
||||
#include "jsprvtd.h"
|
||||
#include "vm/String.h"
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
# HG changeset patch
|
||||
# Parent 6292e55419d1730a2e88a56fd30b2440ce0b393a
|
||||
# User Raúl Porcel <armin76@gentoo.org>
|
||||
Bug XXXXXX - Fix TARGET_CPU usage on ARM
|
||||
|
||||
|
||||
diff --git a/xpcom/glue/objs.mk b/xpcom/glue/objs.mk
|
||||
--- a/xpcom/glue/objs.mk
|
||||
+++ b/xpcom/glue/objs.mk
|
||||
@@ -71,13 +71,13 @@ XPCOM_GLUENS_SRC_LCPPSRCS = \
|
||||
SSE.cpp \
|
||||
unused.cpp \
|
||||
nsProxyRelease.cpp \
|
||||
nsTextFormatter.cpp \
|
||||
GenericFactory.cpp \
|
||||
FileUtils.cpp \
|
||||
$(NULL)
|
||||
|
||||
-ifeq (arm,$(TARGET_CPU))
|
||||
+ifneq (,$(filter arm%,$(TARGET_CPU)))
|
||||
XPCOM_GLUENS_SRC_LCPPSRCS += arm.cpp
|
||||
endif
|
||||
|
||||
XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS))
|
||||
|
|
@ -1,212 +0,0 @@
|
|||
diff -up xulrunner-12.0/mozilla-release/configure.in.734335 xulrunner-12.0/mozilla-release/configure.in
|
||||
--- xulrunner-12.0/mozilla-release/configure.in.734335 2012-04-20 18:03:44.000000000 -0400
|
||||
+++ xulrunner-12.0/mozilla-release/configure.in 2012-05-07 04:40:57.526363561 -0400
|
||||
@@ -2124,10 +2124,33 @@ fi
|
||||
dnl ========================================================
|
||||
dnl SPS Profiler
|
||||
dnl ========================================================
|
||||
-MOZ_ARG_ENABLE_BOOL(sps,
|
||||
-[ --enable-sps Enable sps profiling tool.],
|
||||
- MOZ_ENABLE_PROFILER_SPS=1,
|
||||
- MOZ_ENABLE_PROFILER_SPS= )
|
||||
+MOZ_ENABLE_PROFILER_SPS=1
|
||||
+
|
||||
+case "${OS_TARGET}" in
|
||||
+Android)
|
||||
+ case "${CPU_ARCH}" in
|
||||
+ x86 | arm) ;;
|
||||
+ *)
|
||||
+ MOZ_ENABLE_PROFILER_SPS=
|
||||
+ esac
|
||||
+ ;;
|
||||
+Linux)
|
||||
+ case "${CPU_ARCH}" in
|
||||
+ x86 | x86_64) ;;
|
||||
+ *)
|
||||
+ MOZ_ENABLE_PROFILER_SPS=
|
||||
+ esac
|
||||
+ ;;
|
||||
+WINNT|Darwin) ;;
|
||||
+*)
|
||||
+ MOZ_ENABLE_PROFILER_SPS=
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
+MOZ_ARG_DISABLE_BOOL(sps,
|
||||
+[ --disable-sps Disable sps profiling tool.],
|
||||
+ MOZ_ENABLE_PROFILER_SPS=,
|
||||
+ MOZ_ENABLE_PROFILER_SPS=1)
|
||||
if test -n "$MOZ_ENABLE_PROFILER_SPS"; then
|
||||
AC_DEFINE(MOZ_ENABLE_PROFILER_SPS)
|
||||
fi
|
||||
diff -up xulrunner-12.0/mozilla-release/configure.734335 xulrunner-12.0/mozilla-release/configure
|
||||
--- xulrunner-12.0/mozilla-release/configure.734335 2012-05-07 04:49:48.696360057 -0400
|
||||
+++ xulrunner-12.0/mozilla-release/configure 2012-05-07 04:50:10.396360262 -0400
|
||||
@@ -119,7 +119,7 @@ ac_help="$ac_help
|
||||
ac_help="$ac_help
|
||||
--enable-jprof Enable jprof profiling tool (needs mozilla/tools/jprof). Implies --enable-profiling."
|
||||
ac_help="$ac_help
|
||||
- --enable-sps Enable sps profiling tool."
|
||||
+ --disable-sps Disable sps profiling tool."
|
||||
ac_help="$ac_help
|
||||
--enable-shark Enable shark remote profiling. Implies --enable-profiling."
|
||||
ac_help="$ac_help
|
||||
@@ -7255,13 +7255,36 @@ EOF
|
||||
|
||||
fi
|
||||
|
||||
+MOZ_ENABLE_PROFILER_SPS=1
|
||||
+
|
||||
+case "${OS_TARGET}" in
|
||||
+Android)
|
||||
+ case "${CPU_ARCH}" in
|
||||
+ x86 | arm) ;;
|
||||
+ *)
|
||||
+ MOZ_ENABLE_PROFILER_SPS=
|
||||
+ esac
|
||||
+ ;;
|
||||
+Linux)
|
||||
+ case "${CPU_ARCH}" in
|
||||
+ x86 | x86_64) ;;
|
||||
+ *)
|
||||
+ MOZ_ENABLE_PROFILER_SPS=
|
||||
+ esac
|
||||
+ ;;
|
||||
+WINNT|Darwin) ;;
|
||||
+*)
|
||||
+ MOZ_ENABLE_PROFILER_SPS=
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
# Check whether --enable-sps or --disable-sps was given.
|
||||
if test "${enable_sps+set}" = set; then
|
||||
enableval="$enable_sps"
|
||||
- if test "$enableval" = "yes"; then
|
||||
+ if test "$enableval" = "no"; then
|
||||
+ MOZ_ENABLE_PROFILER_SPS=
|
||||
+ elif test "$enableval" = "yes"; then
|
||||
MOZ_ENABLE_PROFILER_SPS=1
|
||||
- elif test "$enableval" = "no"; then
|
||||
- MOZ_ENABLE_PROFILER_SPS=
|
||||
else
|
||||
{ echo "configure: error: Option, sps, does not take an argument ($enableval)." 1>&2; exit 1; }
|
||||
fi
|
||||
diff -up xulrunner-12.0/mozilla-release/toolkit/library/Makefile.in.734335 xulrunner-12.0/mozilla-release/toolkit/library/Makefile.in
|
||||
--- xulrunner-12.0/mozilla-release/toolkit/library/Makefile.in.734335 2012-04-20 18:04:09.000000000 -0400
|
||||
+++ xulrunner-12.0/mozilla-release/toolkit/library/Makefile.in 2012-05-07 04:40:57.526363561 -0400
|
||||
@@ -315,7 +315,9 @@ endif
|
||||
|
||||
STATIC_LIBS += thebes gl ycbcr
|
||||
|
||||
+ifdef MOZ_ENABLE_PROFILER_SPS
|
||||
COMPONENT_LIBS += profiler
|
||||
+endif
|
||||
|
||||
ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
|
||||
COMPONENT_LIBS += widget_windows
|
||||
diff -up xulrunner-12.0/mozilla-release/toolkit/library/nsStaticXULComponents.cpp.734335 xulrunner-12.0/mozilla-release/toolkit/library/nsStaticXULComponents.cpp
|
||||
--- xulrunner-12.0/mozilla-release/toolkit/library/nsStaticXULComponents.cpp.734335 2012-04-20 18:04:09.000000000 -0400
|
||||
+++ xulrunner-12.0/mozilla-release/toolkit/library/nsStaticXULComponents.cpp 2012-05-07 04:40:57.526363561 -0400
|
||||
@@ -198,6 +198,12 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#if defined(MOZ_ENABLE_PROFILER_SPS)
|
||||
+#define PROFILER_MODULE MODULE(nsProfilerModule)
|
||||
+#else
|
||||
+#define PROFILER_MODULE
|
||||
+#endif
|
||||
+
|
||||
#define XUL_MODULES \
|
||||
MODULE(nsUConvModule) \
|
||||
MODULE(nsI18nModule) \
|
||||
@@ -214,7 +220,7 @@
|
||||
MODULE(nsWindowDataSourceModule) \
|
||||
MODULE(nsParserModule) \
|
||||
MODULE(nsGfxModule) \
|
||||
- MODULE(nsProfilerModule) \
|
||||
+ PROFILER_MODULE \
|
||||
WIDGET_MODULES \
|
||||
MODULE(nsImageLib2Module) \
|
||||
ICON_MODULE \
|
||||
diff -up xulrunner-12.0/mozilla-release/tools/profiler/Makefile.in.734335 xulrunner-12.0/mozilla-release/tools/profiler/Makefile.in
|
||||
--- xulrunner-12.0/mozilla-release/tools/profiler/Makefile.in.734335 2012-04-20 18:04:10.000000000 -0400
|
||||
+++ xulrunner-12.0/mozilla-release/tools/profiler/Makefile.in 2012-05-07 04:40:57.526363561 -0400
|
||||
@@ -48,8 +48,10 @@ VPATH = \
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
-EXPORTS = \
|
||||
- sampler.h \
|
||||
+EXPORTS = sampler.h
|
||||
+
|
||||
+ifdef MOZ_ENABLE_PROFILER_SPS
|
||||
+EXPORTS += \
|
||||
sps_sampler.h \
|
||||
thread_helper.h \
|
||||
$(NULL)
|
||||
@@ -68,6 +70,7 @@ IS_COMPONENT = 1
|
||||
CPPSRCS = \
|
||||
nsProfilerFactory.cpp \
|
||||
nsProfiler.cpp \
|
||||
+ TableTicker.cpp \
|
||||
$(NULL)
|
||||
|
||||
XPIDLSRCS = \
|
||||
@@ -79,42 +82,31 @@ EXTRA_JS_MODULES = \
|
||||
$(NULL)
|
||||
|
||||
ifneq (,$(filter Android Linux,$(OS_TARGET)))
|
||||
-
|
||||
-DEFINES += -DMOZ_ENABLE_PROFILER_SPS
|
||||
-
|
||||
CPPSRCS += \
|
||||
shared-libraries-linux.cc \
|
||||
platform-linux.cc \
|
||||
- TableTicker.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
+
|
||||
ifeq ($(OS_TARGET),Darwin)
|
||||
# For now we use platform-linux.cc because we can't unwind
|
||||
# another thread on mac using backtrace(), the implementation
|
||||
# for platform-macosx.cc is in the hg history and should be
|
||||
# used when we can stackwalk using a thread handle.
|
||||
-
|
||||
-DEFINES += -DMOZ_ENABLE_PROFILER_SPS
|
||||
-
|
||||
CPPSRCS += \
|
||||
shared-libraries-macos.cc \
|
||||
platform-linux.cc \
|
||||
- TableTicker.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_TARGET),WINNT)
|
||||
-
|
||||
-DEFINES += -DMOZ_ENABLE_PROFILER_SPS
|
||||
-
|
||||
CPPSRCS += \
|
||||
shared-libraries-win32.cc \
|
||||
platform-win32.cc \
|
||||
- TableTicker.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
-
|
||||
+endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
diff -up xulrunner-12.0/mozilla-release/tools/profiler/sampler.h.734335 xulrunner-12.0/mozilla-release/tools/profiler/sampler.h
|
||||
--- xulrunner-12.0/mozilla-release/tools/profiler/sampler.h.734335 2012-04-20 18:04:10.000000000 -0400
|
||||
+++ xulrunner-12.0/mozilla-release/tools/profiler/sampler.h 2012-05-07 04:40:57.526363561 -0400
|
||||
@@ -78,7 +78,7 @@
|
||||
#define SAMPLER_H
|
||||
|
||||
// Redefine the macros for platforms where SPS is supported.
|
||||
-#if defined(ANDROID) || defined(__linux__) || defined(XP_MACOSX) || defined(XP_WIN)
|
||||
+#ifdef MOZ_ENABLE_PROFILER_SPS
|
||||
|
||||
#include "sps_sampler.h"
|
||||
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
diff -up mozilla-esr10/js/src/jsgcchunk.cpp.old mozilla-esr10/js/src/jsgcchunk.cpp
|
||||
--- mozilla-esr10/js/src/jsgcchunk.cpp.old 2012-03-03 04:28:25.000000000 +0100
|
||||
+++ mozilla-esr10/js/src/jsgcchunk.cpp 2012-04-18 10:11:55.123376498 +0200
|
||||
@@ -366,9 +366,14 @@ CommitMemory(void *addr, size_t size)
|
||||
bool
|
||||
DecommitMemory(void *addr, size_t size)
|
||||
{
|
||||
+// A workaround for Bug 746112 - endless loop on ppc64
|
||||
+#if !(defined(__powerpc__))
|
||||
JS_ASSERT(uintptr_t(addr) % 4096UL == 0);
|
||||
int result = madvise(addr, size, MADV_DONTNEED);
|
||||
return result != -1;
|
||||
+#else
|
||||
+ return true;
|
||||
+#endif
|
||||
}
|
||||
#else
|
||||
# error "No CommitMemory defined on this platform."
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc
|
||||
--- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file 2012-01-24 09:00:00.000000000 +0100
|
||||
+++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc 2012-01-25 15:30:43.707796295 +0100
|
||||
@@ -5,6 +5,9 @@
|
||||
#include "base/file_util.h"
|
||||
|
||||
#include <fcntl.h>
|
||||
+#if defined(ANDROID) || defined(OS_POSIX)
|
||||
+#include <unistd.h>
|
||||
+#endif
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc
|
||||
--- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file 2012-01-24 09:00:00.000000000 +0100
|
||||
+++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc 2012-01-25 15:13:11.947771212 +0100
|
||||
@@ -6,6 +6,9 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
+#if defined(ANDROID) || defined(OS_POSIX)
|
||||
+#include <unistd.h>
|
||||
+#endif
|
||||
|
||||
#include "eintr_wrapper.h"
|
||||
#include "base/logging.h"
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
80c3e5927274de7f181fb5f931ac5fd4 xulrunner-12.0.source.tar.bz2
|
||||
f50ca7656eec47030b396f39075fa980 xulrunner-13.0.source.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,15 +1,3 @@
|
|||
diff -up mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 mozilla-beta/ipc/chromium/src/base/time_posix.cc
|
||||
--- mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 2012-01-24 03:00:00.000000000 -0500
|
||||
+++ mozilla-beta/ipc/chromium/src/base/time_posix.cc 2012-01-30 14:12:49.198472212 -0500
|
||||
@@ -14,6 +14,8 @@
|
||||
#include <time.h>
|
||||
#endif
|
||||
|
||||
+#include <unistd.h>
|
||||
+
|
||||
#include <limits>
|
||||
|
||||
#include "base/basictypes.h"
|
||||
diff -up mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 mozilla-beta/toolkit/crashreporter/client/Makefile.in
|
||||
--- mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 2012-01-30 14:41:14.475441039 -0500
|
||||
+++ mozilla-beta/toolkit/crashreporter/client/Makefile.in 2012-01-30 14:43:03.587646656 -0500
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
diff -up mozilla-release/dom/plugins/base/npapi.h.BAD mozilla-release/dom/plugins/base/npapi.h
|
||||
--- mozilla-release/dom/plugins/base/npapi.h.BAD 2011-12-06 13:31:16.364405916 -0500
|
||||
+++ mozilla-release/dom/plugins/base/npapi.h 2011-12-06 13:31:47.131109006 -0500
|
||||
@@ -379,7 +379,7 @@ typedef enum {
|
||||
, NPPVpluginCoreAnimationLayer = 1003
|
||||
#endif
|
||||
|
||||
-#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
|
||||
+#if defined(MOZ_PLATFORM_MAEMO) && ((MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6))
|
||||
, NPPVpluginWindowlessLocalBool = 2002
|
||||
#endif
|
||||
} NPPVariable;
|
||||
@@ -432,7 +432,7 @@ typedef enum {
|
||||
, NPNVsupportsCompositingCoreAnimationPluginsBool = 74656 /* TRUE if the browser supports
|
||||
CA model compositing */
|
||||
#endif
|
||||
-#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
|
||||
+#if defined(MOZ_PLATFORM_MAEMO) && ((MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6))
|
||||
, NPNVSupportsWindowlessLocal = 2002
|
||||
#endif
|
||||
} NPNVariable;
|
||||
|
|
@ -72,8 +72,8 @@
|
|||
|
||||
Summary: XUL Runtime for Gecko Applications
|
||||
Name: xulrunner
|
||||
Version: 12.0
|
||||
Release: 7%{?pre_tag}%{?dist}
|
||||
Version: 13.0
|
||||
Release: 1%{?pre_tag}%{?dist}
|
||||
URL: http://developer.mozilla.org/En/XULRunner
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
Group: Applications/Internet
|
||||
|
|
@ -100,15 +100,9 @@ Patch20: mozilla-193-pkgconfig.patch
|
|||
Patch24: crashreporter-remove-static.patch
|
||||
|
||||
# Upstream patches
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=707993
|
||||
Patch39: xulrunner-8.0-fix-maemo-checks-in-npapi.patch
|
||||
Patch43: mozilla-file.patch
|
||||
Patch46: mozilla-724615.patch
|
||||
Patch47: mozilla-691898.patch
|
||||
Patch48: mozilla-734335.patch
|
||||
%ifarch ppc ppc64
|
||||
Patch49: mozilla-746112.patch
|
||||
Patch50: mozilla-746112-1.patch
|
||||
%endif
|
||||
|
||||
# ---------------------------------------------------
|
||||
|
|
@ -246,14 +240,9 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
|
|||
%patch20 -p2 -b .pk
|
||||
%patch24 -p1 -b .static
|
||||
|
||||
%patch39 -p1 -b .707993
|
||||
%patch43 -p1 -b .file
|
||||
%patch46 -p1 -b .724615
|
||||
%patch47 -p2 -b .691898
|
||||
%patch48 -p2 -b .734335
|
||||
%ifarch ppc ppc64
|
||||
%patch49 -p2 -b .746112
|
||||
%patch50 -p1 -b .746112-1
|
||||
%endif
|
||||
|
||||
%{__rm} -f .mozconfig
|
||||
|
|
@ -512,6 +501,9 @@ fi
|
|||
#---------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Mon Jun 4 2012 Martin Stransky <stransky@redhat.com> - 13.0-1
|
||||
- Update to 13.0
|
||||
|
||||
* Mon May 28 2012 Martin Stransky <stransky@redhat.com> - 12.0-7
|
||||
- More ppc(64) fixes - mozbz#746112
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue