Date: Wed, 3 May 2017 00:15:01 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439995 - in head: mail/thunderbird/files www/firefox-esr/files www/libxul/files www/seamonkey/files Message-ID: <201705030015.v430F118046762@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed May 3 00:15:01 2017 New Revision: 439995 URL: https://svnweb.freebsd.org/changeset/ports/439995 Log: gecko: apply r439551 + r439993 to other ports Added: head/mail/thunderbird/files/patch-bug1359051 - copied, changed from r439994, head/www/firefox/files/patch-bug1359051 head/mail/thunderbird/files/patch-bug1359142 - copied, changed from r439994, head/www/firefox/files/patch-bug1359142 head/www/firefox-esr/files/patch-bug1359051 - copied, changed from r439994, head/www/firefox/files/patch-bug1359051 head/www/firefox-esr/files/patch-bug1359142 - copied unchanged from r439994, head/www/firefox/files/patch-bug1359142 head/www/libxul/files/patch-bug1359142 - copied, changed from r439994, head/www/firefox/files/patch-bug1359142 head/www/seamonkey/files/patch-bug1359142 - copied, changed from r439994, head/www/firefox/files/patch-bug1359142 Copied and modified: head/mail/thunderbird/files/patch-bug1359051 (from r439994, head/www/firefox/files/patch-bug1359051) ============================================================================== --- head/www/firefox/files/patch-bug1359051 Tue May 2 23:56:20 2017 (r439994, copy source) +++ head/mail/thunderbird/files/patch-bug1359051 Wed May 3 00:15:01 2017 (r439995) @@ -9,8 +9,8 @@ Date: Mon Apr 24 07:10:58 2017 -0700 diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h index 3a42918142ef..570a25ff0dc3 100644 ---- js/src/jit/ExecutableAllocator.h -+++ js/src/jit/ExecutableAllocator.h +--- mozilla/js/src/jit/ExecutableAllocator.h ++++ mozilla/js/src/jit/ExecutableAllocator.h @@ -259,7 +259,7 @@ class ExecutableAllocator { __clear_cache(code, reinterpret_cast<char*>(code) + size); @@ -28,4 +28,4 @@ index 3a42918142ef..570a25ff0dc3 100644 +#elif defined(JS_CODEGEN_ARM64) static void cacheFlush(void* code, size_t size) { - vixl::CPU::EnsureIAndDCacheCoherency(code, size); + __clear_cache(code, (void *)((size_t)code + size)); Copied and modified: head/mail/thunderbird/files/patch-bug1359142 (from r439994, head/www/firefox/files/patch-bug1359142) ============================================================================== --- head/www/firefox/files/patch-bug1359142 Tue May 2 23:56:20 2017 (r439994, copy source) +++ head/mail/thunderbird/files/patch-bug1359142 Wed May 3 00:15:01 2017 (r439995) @@ -2,8 +2,8 @@ Define EPC_sig and RFP_sig for JS_CODEGE diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp index 1ab76eeb4bd9..bcdff0487837 100644 ---- js/src/wasm/WasmSignalHandlers.cpp -+++ js/src/wasm/WasmSignalHandlers.cpp +--- mozilla/js/src/wasm/WasmSignalHandlers.cpp ++++ mozilla/js/src/wasm/WasmSignalHandlers.cpp @@ -108,7 +108,19 @@ class AutoSetHandlingSegFault # define R12_sig(p) ((p)->sc_r12) # define R13_sig(p) ((p)->sc_r13) Copied and modified: head/www/firefox-esr/files/patch-bug1359051 (from r439994, head/www/firefox/files/patch-bug1359051) ============================================================================== --- head/www/firefox/files/patch-bug1359051 Tue May 2 23:56:20 2017 (r439994, copy source) +++ head/www/firefox-esr/files/patch-bug1359051 Wed May 3 00:15:01 2017 (r439995) @@ -28,4 +28,4 @@ index 3a42918142ef..570a25ff0dc3 100644 +#elif defined(JS_CODEGEN_ARM64) static void cacheFlush(void* code, size_t size) { - vixl::CPU::EnsureIAndDCacheCoherency(code, size); + __clear_cache(code, (void *)((size_t)code + size)); Copied: head/www/firefox-esr/files/patch-bug1359142 (from r439994, head/www/firefox/files/patch-bug1359142) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox-esr/files/patch-bug1359142 Wed May 3 00:15:01 2017 (r439995, copy of r439994, head/www/firefox/files/patch-bug1359142) @@ -0,0 +1,57 @@ +Define EPC_sig and RFP_sig for JS_CODEGEN_(ARM64|MIPS) on BSDs + +diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp +index 1ab76eeb4bd9..bcdff0487837 100644 +--- js/src/wasm/WasmSignalHandlers.cpp ++++ js/src/wasm/WasmSignalHandlers.cpp +@@ -108,7 +108,19 @@ class AutoSetHandlingSegFault + # 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) ++# if defined(__arm__) ++# define R15_sig(p) ((p)->sc_pc) ++# else ++# define R15_sig(p) ((p)->sc_r15) ++# endif ++# if defined(__aarch64__) ++# define EPC_sig(p) ((p)->sc_elr) ++# define RFP_sig(p) ((p)->sc_x[29]) ++# endif ++# if defined(__mips__) ++# define EPC_sig(p) ((p)->sc_pc) ++# define RFP_sig(p) ((p)->sc_regs[30]) ++# endif + #elif defined(__linux__) || defined(SOLARIS) + # if defined(__linux__) + # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i]) +@@ -171,6 +183,14 @@ class AutoSetHandlingSegFault + # 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]) ++# if defined(__aarch64__) ++# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_X29]) ++# endif ++# if defined(__mips__) ++# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8]) ++# endif + #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + # if defined(__DragonFly__) + # define XMM_sig(p,i) (((union savefpu*)(p)->uc_mcontext.mc_fpregs)->sv_xmm.sv_xmm[i]) +@@ -200,6 +220,14 @@ class AutoSetHandlingSegFault + # else + # define R15_sig(p) ((p)->uc_mcontext.mc_r15) + # endif ++# if defined(__FreeBSD__) && defined(__aarch64__) ++# define EPC_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_elr) ++# define RFP_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_x[29]) ++# endif ++# if defined(__FreeBSD__) && defined(__mips__) ++# define EPC_sig(p) ((p)->uc_mcontext.mc_pc) ++# define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30]) ++# endif + #elif defined(XP_DARWIN) + # define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip) + # define EBP_sig(p) ((p)->uc_mcontext->__ss.__ebp) Copied and modified: head/www/libxul/files/patch-bug1359142 (from r439994, head/www/firefox/files/patch-bug1359142) ============================================================================== --- head/www/firefox/files/patch-bug1359142 Tue May 2 23:56:20 2017 (r439994, copy source) +++ head/www/libxul/files/patch-bug1359142 Wed May 3 00:15:01 2017 (r439995) @@ -2,8 +2,8 @@ Define EPC_sig and RFP_sig for JS_CODEGE diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp index 1ab76eeb4bd9..bcdff0487837 100644 ---- js/src/wasm/WasmSignalHandlers.cpp -+++ js/src/wasm/WasmSignalHandlers.cpp +--- js/src/asmjs/AsmJSSignalHandlers.cpp ++++ js/src/asmjs/AsmJSSignalHandlers.cpp @@ -108,7 +108,19 @@ class AutoSetHandlingSegFault # define R12_sig(p) ((p)->sc_r12) # define R13_sig(p) ((p)->sc_r13) Copied and modified: head/www/seamonkey/files/patch-bug1359142 (from r439994, head/www/firefox/files/patch-bug1359142) ============================================================================== --- head/www/firefox/files/patch-bug1359142 Tue May 2 23:56:20 2017 (r439994, copy source) +++ head/www/seamonkey/files/patch-bug1359142 Wed May 3 00:15:01 2017 (r439995) @@ -2,8 +2,8 @@ Define EPC_sig and RFP_sig for JS_CODEGE diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp index 1ab76eeb4bd9..bcdff0487837 100644 ---- js/src/wasm/WasmSignalHandlers.cpp -+++ js/src/wasm/WasmSignalHandlers.cpp +--- mozilla/js/src/asmjs/WasmSignalHandlers.cpp ++++ mozilla/js/src/asmjs/WasmSignalHandlers.cpp @@ -108,7 +108,19 @@ class AutoSetHandlingSegFault # define R12_sig(p) ((p)->sc_r12) # define R13_sig(p) ((p)->sc_r13)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705030015.v430F118046762>