Kill option GPL_MATH_EMULATE.

ok deraadt@ and many others.

2 files changed, 2 insertions, 16 deletions

diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index acf150c0ca4..78f04d974c7 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.79 2006/06/12 13:18:18 dim Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.80 2006/07/25 19:16:51 kettenis Exp $	*/
 /*	$NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $	*/
 
 /*-
@@ -392,11 +392,6 @@ void	npxdrop(struct proc *);
 void	npxsave_proc(struct proc *, int);
 void	npxsave_cpu(struct cpu_info *, int);
 
-#if defined(GPL_MATH_EMULATE)
-/* math_emulate.c */
-int	math_emulate(struct trapframe *);
-#endif
-
 #ifdef USER_LDT
 /* sys_machdep.h */
 extern int user_ldt_enable;
diff --git a/sys/arch/i386/include/npx.h b/sys/arch/i386/include/npx.h
index f3b0fd1343c..c16157bc847 100644
--- a/sys/arch/i386/include/npx.h
+++ b/sys/arch/i386/include/npx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: npx.h,v 1.8 2004/07/20 05:37:14 kettenis Exp $	*/
+/*	$OpenBSD: npx.h,v 1.9 2006/07/25 19:16:51 kettenis Exp $	*/
 /*	$NetBSD: npx.h,v 1.11 1994/10/27 04:16:11 cgd Exp $	*/
 
 /*-
@@ -74,10 +74,6 @@ struct	fpacc87 {
 #endif
 };
 
-#ifdef GPL_MATH_EMULATE
-#include <gnu/arch/i386/fpemul/math_emu.h>
-#endif
-
 /* Floating point and emulator context */
 struct	save87 {
 	struct	env87 sv_env;		/* floating point control/status */
@@ -128,11 +124,6 @@ struct savexmm {
 union savefpu {
 	struct save87 sv_87;
 	struct savexmm sv_xmm;
-#ifdef GPL_MATH_EMULATE
-	union i387_union gplemu;
-#else
-	u_char emupad[176];		/* sizeof(i387_union) */
-#endif
 };
 
 /* Cyrix EMC memory - mapped coprocessor context switch information */