From owner-freebsd-gecko@FreeBSD.ORG Fri Mar 29 02:27:35 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7F126DA3 for ; Fri, 29 Mar 2013 02:27:35 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id EE0DE3FF for ; Fri, 29 Mar 2013 02:27:34 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r2T2RXFA088092 for ; Fri, 29 Mar 2013 02:27:33 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r2T2RStf086169 for freebsd-gecko@freebsd.org; Fri, 29 Mar 2013 02:27:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 29 Mar 2013 02:27:28 GMT Message-Id: <201303290227.r2T2RStf086169@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1221 - in trunk: . www/firefox www/firefox-nightly www/firefox-nightly/files www/seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 02:27:35 -0000 Author: jbeich Date: Fri Mar 29 02:27:28 2013 New Revision: 1221 Log: update Deleted: trunk/www/firefox-nightly/files/patch-bug851880 Modified: trunk/Gecko_TODO trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Sun Mar 24 22:35:12 2013 (r1220) +++ trunk/Gecko_TODO Fri Mar 29 02:27:28 2013 (r1221) @@ -3,7 +3,9 @@ - xpcom/base/MapsMemoryReporter.cpp - media/webrtc/trunk/src/system_wrappers/source/cpu.cc - toolkit/crashreporter -- libusbhid backend for Gamepad API +- netwerk/wifi backend can be based on + www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc +- libusbhid(3) for hal/linux/LinuxGamepad.cpp - OSS or GStreamer for * media/libcubeb * media/webrtc/trunk/src/modules/audio_device @@ -26,7 +28,6 @@ (layers.acceleration.force-enabled -> true ?) jbeich: -- webrtc (testing?) - switch to --ignore-unresolved-symbol (waiting for binutils 2.24) - add Gtk3 support (not landed in m-c yet) - move PGO to bsd.gecko.mk (blocked by USE_PYTHON_BUILD in *-esr) Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Sun Mar 24 22:35:12 2013 (r1220) +++ trunk/www/firefox-nightly/Makefile Fri Mar 29 02:27:28 2013 (r1221) @@ -14,7 +14,7 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.9.6:${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/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Sun Mar 24 22:35:12 2013 (r1220) +++ trunk/www/firefox-nightly/Makefile.hgrev Fri Mar 29 02:27:28 2013 (r1221) @@ -1 +1 @@ -HGREV= 126011:0a10eca0c521 +HGREV= 126602:8aeabe064932 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Sun Mar 24 22:35:12 2013 (r1220) +++ trunk/www/firefox-nightly/distinfo Fri Mar 29 02:27:28 2013 (r1221) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/0a10eca0c521.tar.bz2) = 0c4dd3fa4e2521736f3c44e9e02e86feb39e4e7694a5d5e9b577154c30ccc855 -SIZE (firefox-nightly/0a10eca0c521.tar.bz2) = 109062559 +SHA256 (firefox-nightly/8aeabe064932.tar.bz2) = 1cabae3104db638812f24e5456d68b38d0b8209e39dd10c5cf51951127aaddcf +SIZE (firefox-nightly/8aeabe064932.tar.bz2) = 108995013 Deleted: trunk/www/firefox-nightly/files/patch-bug851880 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug851880 Fri Mar 29 02:27:28 2013 (r1220) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,376 +0,0 @@ -diff --git js/src/ion/AsmJS.h js/src/ion/AsmJS.h -index 7045145..1c9f015 100644 ---- js/src/ion/AsmJS.h -+++ js/src/ion/AsmJS.h -@@ -17,8 +17,7 @@ - // Don't panic, mobile support is coming soon. - #if defined(JS_ION) && \ - !defined(ANDROID) && \ -- (defined(JS_CPU_X86) || defined(JS_CPU_X64)) && \ -- (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 5dd80d6..66deb9a 100644 ---- js/src/ion/AsmJSSignalHandlers.cpp -+++ js/src/ion/AsmJSSignalHandlers.cpp -@@ -18,6 +18,120 @@ using namespace js::ion; - - #ifdef JS_ASMJS - -+#if defined(XP_WIN) -+# define XMM_sig(p,i) ((p)->Xmm##i) -+# define EIP_sig(p) ((p)->Eip) -+# define RIP_sig(p) ((p)->Rip) -+# define RAX_sig(p) ((p)->Rax) -+# define RCX_sig(p) ((p)->Rcx) -+# define RDX_sig(p) ((p)->Rdx) -+# define RBX_sig(p) ((p)->Rbx) -+# define RSP_sig(p) ((p)->Rsp) -+# define RBP_sig(p) ((p)->Rbp) -+# define RSI_sig(p) ((p)->Rsi) -+# define RDI_sig(p) ((p)->Rdi) -+# define R8_sig(p) ((p)->R8) -+# define R9_sig(p) ((p)->R9) -+# define R10_sig(p) ((p)->R10) -+# define R11_sig(p) ((p)->R11) -+# define R12_sig(p) ((p)->R12) -+# define R13_sig(p) ((p)->R13) -+# define R14_sig(p) ((p)->R14) -+# define R15_sig(p) ((p)->R15) -+#elif defined(__OpenBSD__) -+# define XMM_sig(p,i) ((p)->sc_fpstate->fx_xmm[i]) -+# define EIP_sig(p) ((p)->sc_eip) -+# define RIP_sig(p) ((p)->sc_rip) -+# define RAX_sig(p) ((p)->sc_rax) -+# define RCX_sig(p) ((p)->sc_rcx) -+# define RDX_sig(p) ((p)->sc_rdx) -+# define RBX_sig(p) ((p)->sc_rbx) -+# define RSP_sig(p) ((p)->sc_rsp) -+# define RBP_sig(p) ((p)->sc_rbp) -+# define RSI_sig(p) ((p)->sc_rsi) -+# define RDI_sig(p) ((p)->sc_rdi) -+# define R8_sig(p) ((p)->sc_r8) -+# define R9_sig(p) ((p)->sc_r9) -+# define R10_sig(p) ((p)->sc_r10) -+# define R11_sig(p) ((p)->sc_r11) -+# define R12_sig(p) ((p)->sc_r12) -+# define R13_sig(p) ((p)->sc_r13) -+# define R14_sig(p) ((p)->sc_r14) -+# define R15_sig(p) ((p)->sc_r15) -+#elif defined(__linux__) || defined(SOLARIS) -+# if defined(__linux__) -+# define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i]) -+# else -+# define XMM_sig(p,i) ((p)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xmm[i]) -+# endif -+# define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP]) -+# define RIP_sig(p) ((p)->uc_mcontext.gregs[REG_RIP]) -+# define RAX_sig(p) ((p)->uc_mcontext.gregs[REG_RAX]) -+# define RCX_sig(p) ((p)->uc_mcontext.gregs[REG_RCX]) -+# define RDX_sig(p) ((p)->uc_mcontext.gregs[REG_RDX]) -+# define RBX_sig(p) ((p)->uc_mcontext.gregs[REG_RBX]) -+# define RSP_sig(p) ((p)->uc_mcontext.gregs[REG_RSP]) -+# define RBP_sig(p) ((p)->uc_mcontext.gregs[REG_RBP]) -+# define RSI_sig(p) ((p)->uc_mcontext.gregs[REG_RSI]) -+# define RDI_sig(p) ((p)->uc_mcontext.gregs[REG_RDI]) -+# define R8_sig(p) ((p)->uc_mcontext.gregs[REG_R8]) -+# define R9_sig(p) ((p)->uc_mcontext.gregs[REG_R9]) -+# define R10_sig(p) ((p)->uc_mcontext.gregs[REG_R10]) -+# define R11_sig(p) ((p)->uc_mcontext.gregs[REG_R11]) -+# define R12_sig(p) ((p)->uc_mcontext.gregs[REG_R12]) -+# define R13_sig(p) ((p)->uc_mcontext.gregs[REG_R13]) -+# define R14_sig(p) ((p)->uc_mcontext.gregs[REG_R14]) -+# define R15_sig(p) ((p)->uc_mcontext.gregs[REG_R15]) -+#elif defined(__NetBSD__) -+# define XMM_sig(p,i) (((struct fxsave64 *)(p)->uc_mcontext.__fpregs)->fx_xmm[i]) -+# define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP]) -+# define RIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RIP]) -+# define RAX_sig(p) ((p)->uc_mcontext.__gregs[_REG_RAX]) -+# define RCX_sig(p) ((p)->uc_mcontext.__gregs[_REG_RCX]) -+# define RDX_sig(p) ((p)->uc_mcontext.__gregs[_REG_RDX]) -+# define RBX_sig(p) ((p)->uc_mcontext.__gregs[_REG_RBX]) -+# define RSP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RSP]) -+# define RBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RBP]) -+# define RSI_sig(p) ((p)->uc_mcontext.__gregs[_REG_RSI]) -+# define RDI_sig(p) ((p)->uc_mcontext.__gregs[_REG_RDI]) -+# define R8_sig(p) ((p)->uc_mcontext.__gregs[_REG_R8]) -+# define R9_sig(p) ((p)->uc_mcontext.__gregs[_REG_R9]) -+# define R10_sig(p) ((p)->uc_mcontext.__gregs[_REG_R10]) -+# define R11_sig(p) ((p)->uc_mcontext.__gregs[_REG_R11]) -+# define R12_sig(p) ((p)->uc_mcontext.__gregs[_REG_R12]) -+# define R13_sig(p) ((p)->uc_mcontext.__gregs[_REG_R13]) -+# define R14_sig(p) ((p)->uc_mcontext.__gregs[_REG_R14]) -+# define R15_sig(p) ((p)->uc_mcontext.__gregs[_REG_R15]) -+#elif defined(__DragonFly__) || defined(__FreeBSD__) -+# if defined(__DragonFly__) -+# define XMM_sig(p,i) (((union savefpu *)(p)->uc_mcontext.mc_fpregs)->sv_xmm.sv_xmm[i]) -+# else -+# define XMM_sig(p,i) (((struct savefpu *)(p)->uc_mcontext.mc_fpstate)->sv_xmm[i]) -+# endif -+# define EIP_sig(p) ((p)->uc_mcontext.mc_eip) -+# define RIP_sig(p) ((p)->uc_mcontext.mc_rip) -+# define RAX_sig(p) ((p)->uc_mcontext.mc_rax) -+# define RCX_sig(p) ((p)->uc_mcontext.mc_rcx) -+# define RDX_sig(p) ((p)->uc_mcontext.mc_rdx) -+# define RBX_sig(p) ((p)->uc_mcontext.mc_rbx) -+# define RSP_sig(p) ((p)->uc_mcontext.mc_rsp) -+# define RBP_sig(p) ((p)->uc_mcontext.mc_rbp) -+# define RSI_sig(p) ((p)->uc_mcontext.mc_rsi) -+# define RDI_sig(p) ((p)->uc_mcontext.mc_rdi) -+# define R8_sig(p) ((p)->uc_mcontext.mc_r8) -+# define R9_sig(p) ((p)->uc_mcontext.mc_r9) -+# define R10_sig(p) ((p)->uc_mcontext.mc_r10) -+# define R11_sig(p) ((p)->uc_mcontext.mc_r11) -+# define R12_sig(p) ((p)->uc_mcontext.mc_r12) -+# define R13_sig(p) ((p)->uc_mcontext.mc_r13) -+# define R14_sig(p) ((p)->uc_mcontext.mc_r14) -+# define R15_sig(p) ((p)->uc_mcontext.mc_r15) -+#elif defined(XP_MACOSX) -+// Mach requires special treatment. -+#else -+# error "Don't know how to read/write to the thread state via the mcontext_t." -+#endif -+ - // 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" -+# else -+# include -+# include -+# endif -+ -+# if defined(__FreeBSD__) -+# include // for ucontext_t, mcontext_t -+# endif - -+# if defined(JS_CPU_X64) -+# if defined(__DragonFly__) -+# include // for union savefpu -+# elif defined(__FreeBSD__) || defined(__OpenBSD__) -+# include // for struct savefpu/fxsave64 -+# endif -+# endif -+ -+# 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) -- JS_STATIC_ASSERT(sizeof(context->Rip) == sizeof(void*)); -- return reinterpret_cast(&context->Rip); -+ JS_STATIC_ASSERT(sizeof(RIP_sig(context)) == sizeof(void*)); -+ return reinterpret_cast(&RIP_sig(context)); - # else -- JS_STATIC_ASSERT(sizeof(context->Eip) == sizeof(void*)); -- return reinterpret_cast(&context->Eip); -+ JS_STATIC_ASSERT(sizeof(EIP_sig(context)) == sizeof(void*)); -+ return reinterpret_cast(&EIP_sig(context)); - # endif - } - -@@ -163,47 +298,50 @@ SetRegisterToCoercedUndefined(CONTEXT *context, bool isFloat32, AnyRegister reg) - { - if (reg.isFloat()) { - switch (reg.fpu().code()) { -- case JSC::X86Registers::xmm0: SetXMMRegToNaN(isFloat32, &context->Xmm0); break; -- case JSC::X86Registers::xmm1: SetXMMRegToNaN(isFloat32, &context->Xmm1); break; -- case JSC::X86Registers::xmm2: SetXMMRegToNaN(isFloat32, &context->Xmm2); break; -- case JSC::X86Registers::xmm3: SetXMMRegToNaN(isFloat32, &context->Xmm3); break; -- case JSC::X86Registers::xmm4: SetXMMRegToNaN(isFloat32, &context->Xmm4); break; -- case JSC::X86Registers::xmm5: SetXMMRegToNaN(isFloat32, &context->Xmm5); break; -- case JSC::X86Registers::xmm6: SetXMMRegToNaN(isFloat32, &context->Xmm6); break; -- case JSC::X86Registers::xmm7: SetXMMRegToNaN(isFloat32, &context->Xmm7); break; -- case JSC::X86Registers::xmm8: SetXMMRegToNaN(isFloat32, &context->Xmm8); break; -- case JSC::X86Registers::xmm9: SetXMMRegToNaN(isFloat32, &context->Xmm9); break; -- case JSC::X86Registers::xmm10: SetXMMRegToNaN(isFloat32, &context->Xmm10); break; -- case JSC::X86Registers::xmm11: SetXMMRegToNaN(isFloat32, &context->Xmm11); break; -- case JSC::X86Registers::xmm12: SetXMMRegToNaN(isFloat32, &context->Xmm12); break; -- case JSC::X86Registers::xmm13: SetXMMRegToNaN(isFloat32, &context->Xmm13); break; -- case JSC::X86Registers::xmm14: SetXMMRegToNaN(isFloat32, &context->Xmm14); break; -- case JSC::X86Registers::xmm15: SetXMMRegToNaN(isFloat32, &context->Xmm15); break; -+ case JSC::X86Registers::xmm0: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 0)); break; -+ case JSC::X86Registers::xmm1: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 1)); break; -+ case JSC::X86Registers::xmm2: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 2)); break; -+ case JSC::X86Registers::xmm3: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 3)); break; -+ case JSC::X86Registers::xmm4: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 4)); break; -+ case JSC::X86Registers::xmm5: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 5)); break; -+ case JSC::X86Registers::xmm6: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 6)); break; -+ case JSC::X86Registers::xmm7: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 7)); break; -+ case JSC::X86Registers::xmm8: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 8)); break; -+ case JSC::X86Registers::xmm9: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 9)); break; -+ case JSC::X86Registers::xmm10: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 10)); break; -+ case JSC::X86Registers::xmm11: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 11)); break; -+ case JSC::X86Registers::xmm12: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 12)); break; -+ case JSC::X86Registers::xmm13: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 13)); break; -+ case JSC::X86Registers::xmm14: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 14)); break; -+ case JSC::X86Registers::xmm15: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 15)); break; - default: MOZ_CRASH(); - } - } else { - switch (reg.gpr().code()) { -- case JSC::X86Registers::eax: context->Rax = 0; break; -- case JSC::X86Registers::ecx: context->Rcx = 0; break; -- case JSC::X86Registers::edx: context->Rdx = 0; break; -- case JSC::X86Registers::ebx: context->Rbx = 0; break; -- case JSC::X86Registers::esp: context->Rsp = 0; break; -- case JSC::X86Registers::ebp: context->Rbp = 0; break; -- case JSC::X86Registers::esi: context->Rsi = 0; break; -- case JSC::X86Registers::edi: context->Rdi = 0; break; -- case JSC::X86Registers::r8: context->R8 = 0; break; -- case JSC::X86Registers::r9: context->R9 = 0; break; -- case JSC::X86Registers::r10: context->R10 = 0; break; -- case JSC::X86Registers::r11: context->R11 = 0; break; -- case JSC::X86Registers::r12: context->R12 = 0; break; -- case JSC::X86Registers::r13: context->R13 = 0; break; -- case JSC::X86Registers::r14: context->R14 = 0; break; -- case JSC::X86Registers::r15: context->R15 = 0; break; -+ case JSC::X86Registers::eax: RAX_sig(context) = 0; break; -+ case JSC::X86Registers::ecx: RCX_sig(context) = 0; break; -+ case JSC::X86Registers::edx: RDX_sig(context) = 0; break; -+ case JSC::X86Registers::ebx: RBX_sig(context) = 0; break; -+ case JSC::X86Registers::esp: RSP_sig(context) = 0; break; -+ case JSC::X86Registers::ebp: RBP_sig(context) = 0; break; -+ case JSC::X86Registers::esi: RSI_sig(context) = 0; break; -+ case JSC::X86Registers::edi: RDI_sig(context) = 0; break; -+ case JSC::X86Registers::r8: R8_sig(context) = 0; break; -+ case JSC::X86Registers::r9: R9_sig(context) = 0; break; -+ case JSC::X86Registers::r10: R10_sig(context) = 0; break; -+ case JSC::X86Registers::r11: R11_sig(context) = 0; break; -+ case JSC::X86Registers::r12: R12_sig(context) = 0; break; -+ case JSC::X86Registers::r13: R13_sig(context) = 0; break; -+ case JSC::X86Registers::r14: R14_sig(context) = 0; break; -+ case JSC::X86Registers::r15: R15_sig(context) = 0; break; - default: MOZ_CRASH(); - } - } - } --# endif -+# endif // JS_CPU_X64 -+# endif // !XP_MACOSX -+ -+# if defined(XP_WIN) - - static bool - HandleException(PEXCEPTION_POINTERS exception) -@@ -289,7 +427,6 @@ AsmJSExceptionHandler(LPEXCEPTION_POINTERS exception) - } - - # elif defined(XP_MACOSX) --# include - # include - - static uint8_t ** -@@ -615,70 +752,6 @@ AsmJSMachExceptionHandler::install(JSRuntime *rt) - } - - # else // If not Windows or Mac, assume Unix --# include --# include -- --// Unfortunately, we still need OS-specific code to read/write to the thread --// state via the mcontext_t. --static uint8_t ** --ContextToPC(mcontext_t &context) --{ --# if defined(JS_CPU_X86) -- JS_STATIC_ASSERT(sizeof(context.gregs[REG_EIP]) == sizeof(void*)); -- return reinterpret_cast(&context.gregs[REG_EIP]); --# else -- JS_STATIC_ASSERT(sizeof(context.gregs[REG_RIP]) == sizeof(void*)); -- return reinterpret_cast(&context.gregs[REG_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.fpregs->_xmm[0]); break; -- case JSC::X86Registers::xmm1: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[1]); break; -- case JSC::X86Registers::xmm2: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[2]); break; -- case JSC::X86Registers::xmm3: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[3]); break; -- case JSC::X86Registers::xmm4: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[4]); break; -- case JSC::X86Registers::xmm5: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[5]); break; -- case JSC::X86Registers::xmm6: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[6]); break; -- case JSC::X86Registers::xmm7: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[7]); break; -- case JSC::X86Registers::xmm8: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[8]); break; -- case JSC::X86Registers::xmm9: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[9]); break; -- case JSC::X86Registers::xmm10: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[10]); break; -- case JSC::X86Registers::xmm11: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[11]); break; -- case JSC::X86Registers::xmm12: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[12]); break; -- case JSC::X86Registers::xmm13: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[13]); break; -- case JSC::X86Registers::xmm14: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[14]); break; -- case JSC::X86Registers::xmm15: SetXMMRegToNaN(isFloat32, &context.fpregs->_xmm[15]); break; -- default: MOZ_CRASH(); -- } -- } else { -- switch (reg.gpr().code()) { -- case JSC::X86Registers::eax: context.gregs[REG_RAX] = 0; break; -- case JSC::X86Registers::ecx: context.gregs[REG_RCX] = 0; break; -- case JSC::X86Registers::edx: context.gregs[REG_RDX] = 0; break; -- case JSC::X86Registers::ebx: context.gregs[REG_RBX] = 0; break; -- case JSC::X86Registers::esp: context.gregs[REG_RSP] = 0; break; -- case JSC::X86Registers::ebp: context.gregs[REG_RBP] = 0; break; -- case JSC::X86Registers::esi: context.gregs[REG_RSI] = 0; break; -- case JSC::X86Registers::edi: context.gregs[REG_RDI] = 0; break; -- case JSC::X86Registers::r8: context.gregs[REG_R8] = 0; break; -- case JSC::X86Registers::r9: context.gregs[REG_R9] = 0; break; -- case JSC::X86Registers::r10: context.gregs[REG_R10] = 0; break; -- case JSC::X86Registers::r11: context.gregs[REG_R11] = 0; break; -- case JSC::X86Registers::r12: context.gregs[REG_R12] = 0; break; -- case JSC::X86Registers::r13: context.gregs[REG_R13] = 0; break; -- case JSC::X86Registers::r14: context.gregs[REG_R14] = 0; break; -- case JSC::X86Registers::r15: context.gregs[REG_R15] = 0; break; -- default: MOZ_CRASH(); -- } -- } --} --# endif - - // Be very cautious and default to not handling; we don't want to accidentally - // silence real crashes from real bugs. -@@ -689,7 +762,7 @@ HandleSignal(int signum, siginfo_t *info, void *ctx) - if (!activation) - return false; - -- mcontext_t &context = reinterpret_cast(ctx)->uc_mcontext; -+ CONTEXT *context = (CONTEXT *)ctx; - uint8_t **ppc = ContextToPC(context); - uint8_t *pc = *ppc; - -diff --git js/src/ion/x64/Assembler-x64.cpp js/src/ion/x64/Assembler-x64.cpp -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) - JS_NOT_REACHED("Unexpected argument type"); - } - return current_; --#elif defined(XP_MACOSX) || defined(__linux__) -+#else - switch (type) { - case MIRType_Int32: - case MIRType_Pointer: -@@ -72,8 +72,6 @@ ABIArgGenerator::next(MIRType type) - JS_NOT_REACHED("Unexpected argument type"); - } - return current_; --#else --# error "Missing ABI" - #endif - } - Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sun Mar 24 22:35:12 2013 (r1220) +++ trunk/www/firefox/Makefile Fri Mar 29 02:27:28 2013 (r1221) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $ PORTNAME= firefox -DISTVERSION= 20.0b6 +DISTVERSION= 20.0b7 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Sun Mar 24 22:35:12 2013 (r1220) +++ trunk/www/firefox/distinfo Fri Mar 29 02:27:28 2013 (r1221) @@ -1,2 +1,2 @@ -SHA256 (firefox-20.0b6.source.tar.bz2) = 4e5bfe78a9969358c8714a7914e124aade5664d7a5964d3ee3606e12b0845e36 -SIZE (firefox-20.0b6.source.tar.bz2) = 99841370 +SHA256 (firefox-20.0b7.source.tar.bz2) = 70f77b0f29d849d9583d6f67c44ca39e0ac7a86866f07f51eb79538907d30285 +SIZE (firefox-20.0b7.source.tar.bz2) = 100234375 Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Sun Mar 24 22:35:12 2013 (r1220) +++ trunk/www/seamonkey/Makefile Fri Mar 29 02:27:28 2013 (r1221) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/seamonkey/Makefile 310240 2013-01-11 16:48:10Z flo $ PORTNAME= seamonkey -DISTVERSION= 2.17b3 +DISTVERSION= 2.17b4 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Sun Mar 24 22:35:12 2013 (r1220) +++ trunk/www/seamonkey/distinfo Fri Mar 29 02:27:28 2013 (r1221) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.17b3.source.tar.bz2) = 773d6f73f8d59bc9202255bdfed3e8ed63a4f19d2304b9b45061c3cc40be0239 -SIZE (seamonkey-2.17b3.source.tar.bz2) = 122920846 +SHA256 (seamonkey-2.17b4.source.tar.bz2) = 545aaa054abebc88947328cd87d0614ea2b7c4d8a7cc384dfc7b3b6ddcb2a742 +SIZE (seamonkey-2.17b4.source.tar.bz2) = 122942459 SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0 SIZE (enigmail-1.5.1.tar.gz) = 1213954