MFH: r439995

gecko: apply r439551 + r439993 to other ports

Approved by:	ports-secteam blanket (mainly for mips)

6 files changed, 290 insertions, 0 deletions

diff --git a/mail/thunderbird/files/patch-bug1359051 b/mail/thunderbird/files/patch-bug1359051
new file mode 100644
index 0000000..b3dcbb4
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug1359051
@@ -0,0 +1,31 @@
+commit fe7592e16fcc
+Author: Sean Stangl <sstangl@mozilla.com>
+Date:   Mon Apr 24 07:10:58 2017 -0700
+
+    Bug 1359051 - Define cacheFlush for non-Simulator ARM64 builds. r=tcampbell
+---
+ js/src/jit/ExecutableAllocator.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h
+index 3a42918142ef..570a25ff0dc3 100644
+--- 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);
+     }
+-#elif defined(JS_CODEGEN_ARM) && defined(XP_IOS)
++#elif (defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64)) && defined(XP_IOS)
+     static void cacheFlush(void* code, size_t size)
+     {
+         sys_icache_invalidate(code, size);
+@@ -297,7 +297,7 @@ class ExecutableAllocator
+                 : "r0", "r1", "r2");
+         }
+     }
+-#elif defined(JS_CODEGEN_ARM64) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__)
++#elif defined(JS_CODEGEN_ARM64)
+     static void cacheFlush(void* code, size_t size)
+     {
+ 	__clear_cache(code, (void *)((size_t)code + size));
diff --git a/mail/thunderbird/files/patch-bug1359142 b/mail/thunderbird/files/patch-bug1359142
new file mode 100644
index 0000000..d6f5563
--- /dev/null
+++ b/mail/thunderbird/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
+--- 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)
+ # 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)
diff --git a/www/firefox-esr/files/patch-bug1359051 b/www/firefox-esr/files/patch-bug1359051
new file mode 100644
index 0000000..b4da1ca
--- /dev/null
+++ b/www/firefox-esr/files/patch-bug1359051
@@ -0,0 +1,31 @@
+commit fe7592e16fcc
+Author: Sean Stangl <sstangl@mozilla.com>
+Date:   Mon Apr 24 07:10:58 2017 -0700
+
+    Bug 1359051 - Define cacheFlush for non-Simulator ARM64 builds. r=tcampbell
+---
+ js/src/jit/ExecutableAllocator.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+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
+@@ -259,7 +259,7 @@ class ExecutableAllocator
+     {
+         __clear_cache(code, reinterpret_cast<char*>(code) + size);
+     }
+-#elif defined(JS_CODEGEN_ARM) && defined(XP_IOS)
++#elif (defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64)) && defined(XP_IOS)
+     static void cacheFlush(void* code, size_t size)
+     {
+         sys_icache_invalidate(code, size);
+@@ -297,7 +297,7 @@ class ExecutableAllocator
+                 : "r0", "r1", "r2");
+         }
+     }
+-#elif defined(JS_CODEGEN_ARM64) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__)
++#elif defined(JS_CODEGEN_ARM64)
+     static void cacheFlush(void* code, size_t size)
+     {
+ 	__clear_cache(code, (void *)((size_t)code + size));
diff --git a/www/firefox-esr/files/patch-bug1359142 b/www/firefox-esr/files/patch-bug1359142
new file mode 100644
index 0000000..b7998c5
--- /dev/null
+++ b/www/firefox-esr/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)
diff --git a/www/libxul/files/patch-bug1359142 b/www/libxul/files/patch-bug1359142
new file mode 100644
index 0000000..8c7ab0a
--- /dev/null
+++ b/www/libxul/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/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)
+ # 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)
diff --git a/www/seamonkey/files/patch-bug1359142 b/www/seamonkey/files/patch-bug1359142
new file mode 100644
index 0000000..6e5fc6e
--- /dev/null
+++ b/www/seamonkey/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
+--- 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)
+ # 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)