Date: Sun, 24 Mar 2013 01:32:19 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1219 - in trunk: . www/firefox www/firefox-nightly www/firefox-nightly/files www/seamonkey Message-ID: <201303240132.r2O1WJ2l051183@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Mar 24 01:32:19 2013
New Revision: 1219
Log:
update
Modified:
trunk/Gecko_TODO
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox-nightly/files/patch-bug851880
trunk/www/firefox/Makefile
trunk/www/seamonkey/Makefile
trunk/www/seamonkey/distinfo
Modified: trunk/Gecko_TODO
==============================================================================
--- trunk/Gecko_TODO Fri Mar 22 16:10:57 2013 (r1218)
+++ trunk/Gecko_TODO Sun Mar 24 01:32:19 2013 (r1219)
@@ -3,6 +3,7 @@
- xpcom/base/MapsMemoryReporter.cpp
- media/webrtc/trunk/src/system_wrappers/source/cpu.cc
- toolkit/crashreporter
+- libusbhid backend for Gamepad API
- OSS or GStreamer for
* media/libcubeb
* media/webrtc/trunk/src/modules/audio_device
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Fri Mar 22 16:10:57 2013 (r1218)
+++ trunk/www/firefox-nightly/Makefile.hgrev Sun Mar 24 01:32:19 2013 (r1219)
@@ -1 +1 @@
-HGREV= 125575:1d6fe70c79c5
+HGREV= 126011:0a10eca0c521
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Fri Mar 22 16:10:57 2013 (r1218)
+++ trunk/www/firefox-nightly/distinfo Sun Mar 24 01:32:19 2013 (r1219)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/1d6fe70c79c5.tar.bz2) = 10d7e9a15bb811cdc429c889aeb19a144d429df088912ca8b8cbd5d885cc3996
-SIZE (firefox-nightly/1d6fe70c79c5.tar.bz2) = 109019090
+SHA256 (firefox-nightly/0a10eca0c521.tar.bz2) = 0c4dd3fa4e2521736f3c44e9e02e86feb39e4e7694a5d5e9b577154c30ccc855
+SIZE (firefox-nightly/0a10eca0c521.tar.bz2) = 109062559
Modified: trunk/www/firefox-nightly/files/patch-bug851880
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug851880 Fri Mar 22 16:10:57 2013 (r1218)
+++ trunk/www/firefox-nightly/files/patch-bug851880 Sun Mar 24 01:32:19 2013 (r1219)
@@ -1,24 +1,22 @@
diff --git js/src/ion/AsmJS.h js/src/ion/AsmJS.h
-index 17f2bc8..1600131 100644
+index 7045145..1c9f015 100644
--- js/src/ion/AsmJS.h
+++ js/src/ion/AsmJS.h
-@@ -11,9 +11,8 @@
- // asm.js compilation is only available on desktop x86/x64 at the moment.
+@@ -17,8 +17,7 @@
// Don't panic, mobile support is coming soon.
#if defined(JS_ION) && \
-- !defined(ANDROID) && \
+ !defined(ANDROID) && \
- (defined(JS_CPU_X86) || defined(JS_CPU_X64)) && \
-- (defined(__linux__) || defined(XP_WIN))
-+ (!defined(ANDROID) && !defined(XP_MACOSX)) && \
+- (defined(__linux__) || defined(XP_WIN) || defined(XP_MACOSX))
+ (defined(JS_CPU_X86) || defined(JS_CPU_X64))
# define JS_ASMJS
#endif
diff --git js/src/ion/AsmJSSignalHandlers.cpp js/src/ion/AsmJSSignalHandlers.cpp
-index 45eeac9..50bf71c 100644
+index 5dd80d6..66deb9a 100644
--- js/src/ion/AsmJSSignalHandlers.cpp
+++ js/src/ion/AsmJSSignalHandlers.cpp
-@@ -18,6 +18,138 @@ using namespace js::ion;
+@@ -18,6 +18,120 @@ using namespace js::ion;
#ifdef JS_ASMJS
@@ -131,33 +129,15 @@
+# define R14_sig(p) ((p)->uc_mcontext.mc_r14)
+# define R15_sig(p) ((p)->uc_mcontext.mc_r15)
+#elif defined(XP_MACOSX)
-+# define XMM_sig(p,i) ((p)->uc_mcontext->__fs.__fpu_xmm##i)
-+# define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip)
-+# define RIP_sig(p) ((p)->uc_mcontext->__ss.__rip)
-+# define RAX_sig(p) ((p)->uc_mcontext->__ss.__rax)
-+# define RCX_sig(p) ((p)->uc_mcontext->__ss.__rcx)
-+# define RDX_sig(p) ((p)->uc_mcontext->__ss.__rdx)
-+# define RBX_sig(p) ((p)->uc_mcontext->__ss.__rbx)
-+# define RSP_sig(p) ((p)->uc_mcontext->__ss.__rsp)
-+# define RBP_sig(p) ((p)->uc_mcontext->__ss.__rbp)
-+# define RSI_sig(p) ((p)->uc_mcontext->__ss.__rsi)
-+# define RDI_sig(p) ((p)->uc_mcontext->__ss.__rdi)
-+# define R8_sig(p) ((p)->uc_mcontext->__ss.__r8)
-+# define R9_sig(p) ((p)->uc_mcontext->__ss.__r9)
-+# define R10_sig(p) ((p)->uc_mcontext->__ss.__r10)
-+# define R11_sig(p) ((p)->uc_mcontext->__ss.__r11)
-+# define R12_sig(p) ((p)->uc_mcontext->__ss.__r12)
-+# define R13_sig(p) ((p)->uc_mcontext->__ss.__r13)
-+# define R14_sig(p) ((p)->uc_mcontext->__ss.__r14)
-+# define R15_sig(p) ((p)->uc_mcontext->__ss.__r15)
++// Mach requires special treatment.
+#else
+# error "Don't know how to read/write to the thread state via the mcontext_t."
+#endif
+
- // Prevent races trying to install the signal handlers.
- #ifdef JS_THREADSAFE
- # include "jslock.h"
-@@ -142,66 +274,88 @@ LookupHeapAccess(const AsmJSModule &module, uint8_t *pc)
+ // For platforms where the signal/exception handler runs on the same
+ // thread/stack as the victim (Unix and Windows), we can use TLS to find any
+ // currently executing asm.js code.
+@@ -144,16 +258,37 @@ LookupHeapAccess(const AsmJSModule &module, uint8_t *pc)
# if defined(XP_WIN)
# include "jswin.h"
@@ -169,7 +149,7 @@
+# if defined(__FreeBSD__)
+# include <sys/ucontext.h> // for ucontext_t, mcontext_t
+# endif
-+
+
+# if defined(JS_CPU_X64)
+# if defined(__DragonFly__)
+# include <machine/npx.h> // for union savefpu
@@ -181,31 +161,26 @@
+# if !defined(XP_WIN)
+# define CONTEXT ucontext_t
+# endif
-
++
++# if !defined(XP_MACOSX)
static uint8_t **
-ContextToPC(PCONTEXT context)
+ContextToPC(CONTEXT *context)
{
--# if defined(JS_CPU_X64)
+ # if defined(JS_CPU_X64)
- JS_STATIC_ASSERT(sizeof(context->Rip) == sizeof(void*));
- return reinterpret_cast<uint8_t**>(&context->Rip);
--# else
++ JS_STATIC_ASSERT(sizeof(RIP_sig(context)) == sizeof(void*));
++ return reinterpret_cast<uint8_t**>(&RIP_sig(context));
+ # else
- JS_STATIC_ASSERT(sizeof(context->Eip) == sizeof(void*));
- return reinterpret_cast<uint8_t**>(&context->Eip);
--# endif
-+# if defined(JS_CPU_X86)
+ JS_STATIC_ASSERT(sizeof(EIP_sig(context)) == sizeof(void*));
+ return reinterpret_cast<uint8_t**>(&EIP_sig(context));
-+# else
-+ JS_STATIC_ASSERT(sizeof(RIP_sig(context)) == sizeof(void*));
-+ return reinterpret_cast<uint8_t**>(&RIP_sig(context));
-+# endif
+ # endif
}
--# if defined(JS_CPU_X64)
-+# if defined(JS_CPU_X64)
- static void
- SetRegisterToCoercedUndefined(CONTEXT *context, bool isFloat32, AnyRegister reg)
+@@ -163,47 +298,50 @@ SetRegisterToCoercedUndefined(CONTEXT *context, bool isFloat32, AnyRegister reg)
{
if (reg.isFloat()) {
switch (reg.fpu().code()) {
@@ -282,36 +257,43 @@
}
}
-# endif
-+# endif
++# endif // JS_CPU_X64
++# endif // !XP_MACOSX
+
+# if defined(XP_WIN)
static bool
HandleException(PEXCEPTION_POINTERS exception)
-@@ -286,133 +442,7 @@ AsmJSExceptionHandler(LPEXCEPTION_POINTERS exception)
- return EXCEPTION_CONTINUE_SEARCH;
+@@ -289,7 +427,6 @@ AsmJSExceptionHandler(LPEXCEPTION_POINTERS exception)
}
--# else // If not Windows, assume Unix
+ # elif defined(XP_MACOSX)
+-# include <sys/mman.h>
+ # include <mach/exc.h>
+
+ static uint8_t **
+@@ -615,70 +752,6 @@ AsmJSMachExceptionHandler::install(JSRuntime *rt)
+ }
+
+ # else // If not Windows or Mac, assume Unix
-# include <signal.h>
-# include <sys/mman.h>
-
-// Unfortunately, we still need OS-specific code to read/write to the thread
-// state via the mcontext_t.
--# if defined(__linux__)
-static uint8_t **
-ContextToPC(mcontext_t &context)
-{
--# if defined(JS_CPU_X86)
+-# if defined(JS_CPU_X86)
- JS_STATIC_ASSERT(sizeof(context.gregs[REG_EIP]) == sizeof(void*));
- return reinterpret_cast<uint8_t**>(&context.gregs[REG_EIP]);
--# else
+-# else
- JS_STATIC_ASSERT(sizeof(context.gregs[REG_RIP]) == sizeof(void*));
- return reinterpret_cast<uint8_t**>(&context.gregs[REG_RIP]);
--# endif
+-# endif
-}
-
--# if defined(JS_CPU_X64)
+-# if defined(JS_CPU_X64)
-static void
-SetRegisterToCoercedUndefined(mcontext_t &context, bool isFloat32, AnyRegister reg)
-{
@@ -357,73 +339,11 @@
- }
- }
-}
--# endif
--# elif defined(XP_MACOSX)
--static uint8_t **
--ContextToPC(mcontext_t context)
--{
--# if defined(JS_CPU_X86)
-- JS_STATIC_ASSERT(sizeof(context->__ss.__eip) == sizeof(void*));
-- return reinterpret_cast<uint8_t **>(&context->__ss.__eip);
--# else
-- JS_STATIC_ASSERT(sizeof(context->__ss.__rip) == sizeof(void*));
-- return reinterpret_cast<uint8_t **>(&context->__ss.__rip);
--# endif
--}
--
--# if defined(JS_CPU_X64)
--static void
--SetRegisterToCoercedUndefined(mcontext_t &context, bool isFloat32, AnyRegister reg)
--{
-- if (reg.isFloat()) {
-- switch (reg.fpu().code()) {
-- case JSC::X86Registers::xmm0: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm0); break;
-- case JSC::X86Registers::xmm1: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm1); break;
-- case JSC::X86Registers::xmm2: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm2); break;
-- case JSC::X86Registers::xmm3: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm3); break;
-- case JSC::X86Registers::xmm4: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm4); break;
-- case JSC::X86Registers::xmm5: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm5); break;
-- case JSC::X86Registers::xmm6: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm6); break;
-- case JSC::X86Registers::xmm7: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm7); break;
-- case JSC::X86Registers::xmm8: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm8); break;
-- case JSC::X86Registers::xmm9: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm9); break;
-- case JSC::X86Registers::xmm10: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm10); break;
-- case JSC::X86Registers::xmm11: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm11); break;
-- case JSC::X86Registers::xmm12: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm12); break;
-- case JSC::X86Registers::xmm13: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm13); break;
-- case JSC::X86Registers::xmm14: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm14); break;
-- case JSC::X86Registers::xmm15: SetXMMRegToNaN(isFloat32, &context->__fs.__fpu_xmm15); break;
-- default: MOZ_CRASH();
-- }
-- } else {
-- switch (reg.gpr().code()) {
-- case JSC::X86Registers::eax: context->__ss.__rax = 0; break;
-- case JSC::X86Registers::ecx: context->__ss.__rcx = 0; break;
-- case JSC::X86Registers::edx: context->__ss.__rdx = 0; break;
-- case JSC::X86Registers::ebx: context->__ss.__rbx = 0; break;
-- case JSC::X86Registers::esp: context->__ss.__rsp = 0; break;
-- case JSC::X86Registers::ebp: context->__ss.__rbp = 0; break;
-- case JSC::X86Registers::esi: context->__ss.__rsi = 0; break;
-- case JSC::X86Registers::edi: context->__ss.__rdi = 0; break;
-- case JSC::X86Registers::r8: context->__ss.__r8 = 0; break;
-- case JSC::X86Registers::r9: context->__ss.__r9 = 0; break;
-- case JSC::X86Registers::r10: context->__ss.__r10 = 0; break;
-- case JSC::X86Registers::r11: context->__ss.__r11 = 0; break;
-- case JSC::X86Registers::r12: context->__ss.__r12 = 0; break;
-- case JSC::X86Registers::r13: context->__ss.__r13 = 0; break;
-- case JSC::X86Registers::r14: context->__ss.__r14 = 0; break;
-- case JSC::X86Registers::r15: context->__ss.__r15 = 0; break;
-- default: MOZ_CRASH();
-- }
-- }
--}
--# endif
--# endif // end of OS-specific mcontext accessors
-+# else // assume XP_UNIX
+-# endif
// Be very cautious and default to not handling; we don't want to accidentally
// silence real crashes from real bugs.
-@@ -423,7 +453,7 @@ HandleSignal(int signum, siginfo_t *info, void *ctx)
+@@ -689,7 +762,7 @@ HandleSignal(int signum, siginfo_t *info, void *ctx)
if (!activation)
return false;
@@ -433,7 +353,7 @@
uint8_t *pc = *ppc;
diff --git js/src/ion/x64/Assembler-x64.cpp js/src/ion/x64/Assembler-x64.cpp
-index 9984777..8b06a55 100644
+index 9984777..bdb8808 100644
--- js/src/ion/x64/Assembler-x64.cpp
+++ js/src/ion/x64/Assembler-x64.cpp
@@ -49,7 +49,7 @@ ABIArgGenerator::next(MIRType type)
@@ -441,7 +361,7 @@
}
return current_;
-#elif defined(XP_MACOSX) || defined(__linux__)
-+#else // assume XP_UNIX
++#else
switch (type) {
case MIRType_Int32:
case MIRType_Pointer:
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Fri Mar 22 16:10:57 2013 (r1218)
+++ trunk/www/firefox/Makefile Sun Mar 24 01:32:19 2013 (r1219)
@@ -13,7 +13,7 @@
COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.9.4:${PORTSDIR}/devel/nspr \
- nss>=3.14.2:${PORTSDIR}/security/nss \
+ nss>=3.14.3:${PORTSDIR}/security/nss \
sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Fri Mar 22 16:10:57 2013 (r1218)
+++ trunk/www/seamonkey/Makefile Sun Mar 24 01:32:19 2013 (r1219)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/seamonkey/Makefile 310240 2013-01-11 16:48:10Z flo $
PORTNAME= seamonkey
-DISTVERSION= 2.17b2
+DISTVERSION= 2.17b3
CATEGORIES?= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
@@ -13,7 +13,7 @@
COMMENT= The open source, standards compliant web browser
BUILD_DEPENDS= nspr>=4.9.4:${PORTSDIR}/devel/nspr \
- nss>=3.14.2:${PORTSDIR}/security/nss \
+ nss>=3.14.3:${PORTSDIR}/security/nss \
sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
unzip:${PORTSDIR}/archivers/unzip
Modified: trunk/www/seamonkey/distinfo
==============================================================================
--- trunk/www/seamonkey/distinfo Fri Mar 22 16:10:57 2013 (r1218)
+++ trunk/www/seamonkey/distinfo Sun Mar 24 01:32:19 2013 (r1219)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.17b2.source.tar.bz2) = 663086df539f5788f325f6b3c28367f2de68f2906175e5e7da16d259615eb680
-SIZE (seamonkey-2.17b2.source.tar.bz2) = 122949808
+SHA256 (seamonkey-2.17b3.source.tar.bz2) = 773d6f73f8d59bc9202255bdfed3e8ed63a4f19d2304b9b45061c3cc40be0239
+SIZE (seamonkey-2.17b3.source.tar.bz2) = 122920846
SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0
SIZE (enigmail-1.5.1.tar.gz) = 1213954
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303240132.r2O1WJ2l051183>