Deleted on ifdef dontdef

Added ifdef for GPL_MATH_EMULATE so we get the extra padding that is needed
in the save87 struct.

sys/amd64/include/fpu.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- *	$Id$
+ *	$Id: npx.h,v 1.2 1993/10/16 14:39:22 rgrimes Exp $
  */
 
 /*
@@ -73,11 +73,13 @@ struct	fpacc87 {
 struct	save87 {
 	struct	env87 sv_env;		/* floating point control/status */
 	struct	fpacc87	sv_ac[8];	/* accumulator contents, 0-7 */
-#ifndef dontdef
 	u_long	sv_ex_sw;	/* status word for last exception (was pad) */
 	u_long	sv_ex_tw;	/* tag word for last exception (was pad) */
-	u_char	sv_pad[8 * 2 - 2 * 4];	/* bogus historical padding */
-#endif
+#ifdef GPL_MATH_EMULATE
+        u_char  sv_pad[60];
+#else
+        u_char	sv_pad[8 * 2 - 2 * 4];	/* bogus historical padding */
+#endif /* GPL_MATH_EMULATE */
 };
 
 /* Cyrix EMC memory - mapped coprocessor context switch information */

sys/amd64/include/npx.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- *	$Id$
+ *	$Id: npx.h,v 1.2 1993/10/16 14:39:22 rgrimes Exp $
  */
 
 /*
@@ -73,11 +73,13 @@ struct	fpacc87 {
 struct	save87 {
 	struct	env87 sv_env;		/* floating point control/status */
 	struct	fpacc87	sv_ac[8];	/* accumulator contents, 0-7 */
-#ifndef dontdef
 	u_long	sv_ex_sw;	/* status word for last exception (was pad) */
 	u_long	sv_ex_tw;	/* tag word for last exception (was pad) */
-	u_char	sv_pad[8 * 2 - 2 * 4];	/* bogus historical padding */
-#endif
+#ifdef GPL_MATH_EMULATE
+        u_char  sv_pad[60];
+#else
+        u_char	sv_pad[8 * 2 - 2 * 4];	/* bogus historical padding */
+#endif /* GPL_MATH_EMULATE */
 };
 
 /* Cyrix EMC memory - mapped coprocessor context switch information */

sys/i386/include/npx.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- *	$Id$
+ *	$Id: npx.h,v 1.2 1993/10/16 14:39:22 rgrimes Exp $
  */
 
 /*
@@ -73,11 +73,13 @@ struct	fpacc87 {
 struct	save87 {
 	struct	env87 sv_env;		/* floating point control/status */
 	struct	fpacc87	sv_ac[8];	/* accumulator contents, 0-7 */
-#ifndef dontdef
 	u_long	sv_ex_sw;	/* status word for last exception (was pad) */
 	u_long	sv_ex_tw;	/* tag word for last exception (was pad) */
-	u_char	sv_pad[8 * 2 - 2 * 4];	/* bogus historical padding */
-#endif
+#ifdef GPL_MATH_EMULATE
+        u_char  sv_pad[60];
+#else
+        u_char	sv_pad[8 * 2 - 2 * 4];	/* bogus historical padding */
+#endif /* GPL_MATH_EMULATE */
 };
 
 /* Cyrix EMC memory - mapped coprocessor context switch information */