components/desktop/firefox/patches/firefox27-67-ion_AsmJS_x86.patch
author Stacy Yeh <stacy.yeh@oracle.com>
Mon, 11 Jan 2016 09:27:45 -0800
changeset 5255 cea0e462549a
permissions -rw-r--r--
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland

REG_EIP is already defined elsewhere for Linux. 

--- mozilla-esr31/js/src/jit/AsmJSSignalHandlers.cpp.orig	2015-06-04 17:42:51.702781399 -0700
+++ mozilla-esr31/js/src/jit/AsmJSSignalHandlers.cpp	2015-06-04 17:42:51.707794331 -0700
@@ -58,6 +58,9 @@
 # define R14_sig(p) ((p)->sc_r14)
 # define R15_sig(p) ((p)->sc_r15)
 #elif defined(__linux__) || defined(SOLARIS)
+# if defined(SOLARIS)
+#  define REG_EIP EIP
+# endif
 # if defined(__linux__)
 #  define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i])
 #  define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP])