5525N/AREG_EIP is already defined elsewhere for Linux.

5525N/ACan potentially send upstream.

5253N/A

5525N/Adiff --git a/js/src/asmjs/AsmJSSignalHandlers.cpp b/js/src/asmjs/AsmJSSignalHandlers.cpp

5525N/A--- a/js/src/asmjs/AsmJSSignalHandlers.cpp

5525N/A+++ b/js/src/asmjs/AsmJSSignalHandlers.cpp

5525N/A@@ -116,6 +116,9 @@

5253N/A # define R14_sig(p) ((p)->sc_r14)

5253N/A # define R15_sig(p) ((p)->sc_r15)

5253N/A #elif defined(__linux__) || defined(SOLARIS)

5253N/A+# if defined(SOLARIS)

5253N/A+# define REG_EIP EIP

5525N/A+# endif

5253N/A # if defined(__linux__)

5253N/A # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i])

5253N/A # define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP])