summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lkm/fpu/Makefile4
-rw-r--r--lkm/gnufpu/Makefile7
-rw-r--r--sys/gnu/i386/fpemul/fpu_entry.c11
-rw-r--r--sys/i386/i386/math_emulate.c6
-rw-r--r--sys/modules/fpu/Makefile4
-rw-r--r--sys/modules/gnufpu/Makefile7
6 files changed, 19 insertions, 20 deletions
diff --git a/lkm/fpu/Makefile b/lkm/fpu/Makefile
index ca2be1f..5a16be5 100644
--- a/lkm/fpu/Makefile
+++ b/lkm/fpu/Makefile
@@ -1,7 +1,7 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:47:51 peter Exp $
.PATH: ${.CURDIR}/../../sys/i386/i386
-KMOD= fpu
+KMOD= fpu_mod
SRCS= math_emulate.c
NOMAN=
PSEUDO_LKM=
diff --git a/lkm/gnufpu/Makefile b/lkm/gnufpu/Makefile
index 7f70eb8..3d9b07f 100644
--- a/lkm/gnufpu/Makefile
+++ b/lkm/gnufpu/Makefile
@@ -1,7 +1,7 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:47:52 peter Exp $
.PATH: ${.CURDIR}/../../sys/gnu/i386/fpemul
-KMOD= gnufpu
+KMOD= gnufpu_mod
SRCS= div_small.s errors.c fpu_arith.c fpu_aux.c fpu_entry.c fpu_etc.c \
fpu_trig.c get_address.c load_store.c poly_2xm1.c poly_atan.c \
poly_div.s poly_l2.c poly_mul64.s poly_sin.c poly_tan.c \
@@ -12,6 +12,7 @@ PSEUDO_LKM=
CFLAGS+= -DLKM -I${.CURDIR}/../../sys/sys
.s.o:
- cpp -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o
+ ${CC} -x assembler-with-cpp -DLOCORE ${CFLAGS} -c \
+ ${.IMPSRC} -o ${.TARGET}
.include <bsd.kmod.mk>
diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c
index 60a3e07..5d737fd 100644
--- a/sys/gnu/i386/fpemul/fpu_entry.c
+++ b/sys/gnu/i386/fpemul/fpu_entry.c
@@ -55,7 +55,7 @@
*
* W. Metzenthen June 1994.
*
- * $Id: fpu_entry.c,v 1.11 1997/02/22 09:29:06 peter Exp $
+ * $Id: fpu_entry.c,v 1.12 1997/06/14 15:11:03 bde Exp $
*
*/
@@ -76,10 +76,6 @@
#include <sys/proc.h>
#include <sys/kernel.h>
-#ifdef LKM
-#include <sys/lkm.h>
-#endif
-
#include <machine/cpu.h>
#include <machine/pcb.h>
@@ -512,9 +508,10 @@ gnufpu_unload(struct lkm_table *lkmtp, int cmd)
}
int
-gnufpu(struct lkm_table *lkmtp, int cmd, int ver)
+gnufpu_mod(struct lkm_table *lkmtp, int cmd, int ver)
{
- DISPATCH(lkmtp, cmd, ver, gnufpu_load, gnufpu_unload, lkm_nullcmd);
+ MOD_DISPATCH(gnufpu, lkmtp, cmd, ver, gnufpu_load, gnufpu_unload,
+ lkm_nullcmd);
}
#else /* !LKM */
diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c
index a91946d..ad8d3bb 100644
--- a/sys/i386/i386/math_emulate.c
+++ b/sys/i386/i386/math_emulate.c
@@ -6,7 +6,7 @@
* [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj]
*
* from: 386BSD 0.1
- * $Id: math_emulate.c,v 1.23 1997/05/09 09:46:50 peter Exp $
+ * $Id: math_emulate.c,v 1.24 1997/07/20 08:37:20 bde Exp $
*/
/*
@@ -1563,9 +1563,9 @@ fpu_unload(struct lkm_table *lkmtp, int cmd)
}
int
-fpu(struct lkm_table *lkmtp, int cmd, int ver)
+fpu_mod(struct lkm_table *lkmtp, int cmd, int ver)
{
- DISPATCH(lkmtp, cmd, ver, fpu_load, fpu_unload, lkm_nullcmd);
+ MOD_DISPATCH(fpu, lkmtp, cmd, ver, fpu_load, fpu_unload, lkm_nullcmd);
}
#else /* !LKM */
diff --git a/sys/modules/fpu/Makefile b/sys/modules/fpu/Makefile
index ca2be1f..5a16be5 100644
--- a/sys/modules/fpu/Makefile
+++ b/sys/modules/fpu/Makefile
@@ -1,7 +1,7 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:47:51 peter Exp $
.PATH: ${.CURDIR}/../../sys/i386/i386
-KMOD= fpu
+KMOD= fpu_mod
SRCS= math_emulate.c
NOMAN=
PSEUDO_LKM=
diff --git a/sys/modules/gnufpu/Makefile b/sys/modules/gnufpu/Makefile
index 7f70eb8..3d9b07f 100644
--- a/sys/modules/gnufpu/Makefile
+++ b/sys/modules/gnufpu/Makefile
@@ -1,7 +1,7 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:47:52 peter Exp $
.PATH: ${.CURDIR}/../../sys/gnu/i386/fpemul
-KMOD= gnufpu
+KMOD= gnufpu_mod
SRCS= div_small.s errors.c fpu_arith.c fpu_aux.c fpu_entry.c fpu_etc.c \
fpu_trig.c get_address.c load_store.c poly_2xm1.c poly_atan.c \
poly_div.s poly_l2.c poly_mul64.s poly_sin.c poly_tan.c \
@@ -12,6 +12,7 @@ PSEUDO_LKM=
CFLAGS+= -DLKM -I${.CURDIR}/../../sys/sys
.s.o:
- cpp -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o
+ ${CC} -x assembler-with-cpp -DLOCORE ${CFLAGS} -c \
+ ${.IMPSRC} -o ${.TARGET}
.include <bsd.kmod.mk>
OpenPOWER on IntegriCloud