Index: sparc/include/mcontext.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/include/mcontext.h,v
retrieving revision 1.16
diff -p -u -u -b -w -r1.16 mcontext.h
--- sparc/include/mcontext.h	18 Feb 2018 15:29:29 -0000	1.16
+++ sparc/include/mcontext.h	19 Feb 2018 08:18:48 -0000
@@ -147,9 +147,6 @@ typedef struct {
 #define _UC_MACHINE_PAD	8		/* Padding appended to ucontext_t */
 #define	_UC_MACHINE_SP(uc)	(((uc)->uc_mcontext.__gregs[_REG_O6]) + 0x7ff)
 #define	_UC_MACHINE_FP(uc)	(((__greg_t *)_UC_MACHINE_SP(uc))[15])
-#define _UC_MACHINE32_PAD	43	/* compat_netbsd32 variant */
-#define	_UC_MACHINE32_SP(uc)	((uc)->uc_mcontext.__gregs[_REG_O6])
-#define	_UC_MACHINE32_FP(uc)	(((__greg_t *)_UC_MACHINE32_SP(uc))[15])
 #else
 #define _UC_MACHINE_PAD	43		/* Padding appended to ucontext_t */
 #define	_UC_MACHINE_SP(uc)	((uc)->uc_mcontext.__gregs[_REG_O6])
Index: sparc64/include/mcontext.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/include/mcontext.h,v
retrieving revision 1.9
diff -p -u -u -b -w -r1.9 mcontext.h
--- sparc64/include/mcontext.h	12 Sep 2012 02:00:54 -0000	1.9
+++ sparc64/include/mcontext.h	19 Feb 2018 08:18:48 -0000
@@ -76,4 +76,8 @@ typedef struct {
 #define	_UC_CLRSTACK	0x00020000
 #define	_UC_TLSBASE	0x00080000
 
+#define	_UC_MACHINE32_PAD	43	/* compat_netbsd32 variant */
+#define	_UC_MACHINE32_SP(uc)	((uc)->uc_mcontext.__gregs[_REG_O6])
+#define	_UC_MACHINE32_FP(uc)	(((__greg32_t *)_UC_MACHINE32_SP(uc))[15])
+
 #endif /* _SPARC64_MCONTEXT_H_ */