1 REG_EIP is already defined elsewhere for Linux.

     2 Can potentially send upstream.

     3 

     4 diff --git a/js/src/asmjs/AsmJSSignalHandlers.cpp b/js/src/asmjs/AsmJSSignalHandlers.cpp

     5 --- a/js/src/asmjs/AsmJSSignalHandlers.cpp

     6 +++ b/js/src/asmjs/AsmJSSignalHandlers.cpp

     7 @@ -116,6 +116,9 @@

     8  # define R14_sig(p) ((p)->sc_r14)

     9  # define R15_sig(p) ((p)->sc_r15)

    10  #elif defined(__linux__) || defined(SOLARIS)

    11 +# if defined(SOLARIS)

    12 +#  define REG_EIP EIP

    13 +# endif 

    14  # if defined(__linux__)

    15  #  define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i])

    16  #  define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP])