Index: /trunk/source/lisp-kernel/platform-solarisx64.h
===================================================================
--- /trunk/source/lisp-kernel/platform-solarisx64.h	(revision 13952)
+++ /trunk/source/lisp-kernel/platform-solarisx64.h	(revision 13953)
@@ -37,13 +37,8 @@
 #define eflags_register(xp) xpGPR(xp,Iflags)
 #define xpXMMregs(x)(&((x)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xmm[0]))
-#define xmMXCSR(x) ((x)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xstatus)
+#define xpMXCSR(x) ((x)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xstatus)
 #define SIGNUM_FOR_INTN_TRAP SIGSEGV
-#ifdef X8664
 #define IS_MAYBE_INT_TRAP(info,xp) ((xpGPR(xp,REG_TRAPNO)==0xd)&&((xpGPR(xp,REG_ERR)&7)==2))
 #define IS_PAGE_FAULT(info,xp) (xpGPR(xp,REG_TRAPNO)==0xe)
-#else
-#define IS_MAYBE_INT_TRAP(info,xp) ((xpGPR(xp,TRAPNO)==0xd)&&((xpGPR(xp,ERR)&7)==2))
-#define IS_PAGE_FAULT(info,xp) (xpGPR(xp,TRAPNO)==0xe)
-#endif
 #define SIGRETURN(context) setcontext(context)
 
Index: /trunk/source/lisp-kernel/platform-solarisx86.h
===================================================================
--- /trunk/source/lisp-kernel/platform-solarisx86.h	(revision 13952)
+++ /trunk/source/lisp-kernel/platform-solarisx86.h	(revision 13953)
@@ -40,11 +40,6 @@
 #define xmMXCSR(x) ((x)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xstatus)
 #define SIGNUM_FOR_INTN_TRAP SIGSEGV
-#ifdef X8664
-#define IS_MAYBE_INT_TRAP(info,xp) ((xpGPR(xp,REG_TRAPNO)==0xd)&&((xpGPR(xp,REG_ERR)&7)==2))
-#define IS_PAGE_FAULT(info,xp) (xpGPR(xp,REG_TRAPNO)==0xe)
-#else
 #define IS_MAYBE_INT_TRAP(info,xp) ((xpGPR(xp,TRAPNO)==0xd)&&((xpGPR(xp,ERR)&7)==2))
 #define IS_PAGE_FAULT(info,xp) (xpGPR(xp,TRAPNO)==0xe)
-#endif
 #define SIGRETURN(context) setcontext(context)