diff options
| author | swallace <swallace@FreeBSD.org> | 1994-09-18 07:39:55 +0000 |
|---|---|---|
| committer | swallace <swallace@FreeBSD.org> | 1994-09-18 07:39:55 +0000 |
| commit | 434f1e20532ba667976b7b790db644056bf0e33f (patch) | |
| tree | 65395e7060a9411f43fd42a5bc4302de52240343 | |
| parent | cd06daa86a990c8e97b5dd877786b8971d71eaf4 (diff) | |
| download | FreeBSD-src-434f1e20532ba667976b7b790db644056bf0e33f.zip FreeBSD-src-434f1e20532ba667976b7b790db644056bf0e33f.tar.gz | |
Makefile: add ${LDDESTDIR} to linking of boot code so ${DESTDIR}/usr/lib
is used instead of /usr/lib
io.c: add #include <machine/cpufunc.h> as instructed by David Greenman to
avoid inb/outb linking errors.
NOTE: I just discovered that if GNUC is not used the inline functions will not be expanded from the include file and real inb/outb functions would
be needed.
| -rw-r--r-- | sys/i386/boot/Makefile | 4 | ||||
| -rw-r--r-- | sys/i386/boot/biosboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/i386/boot/biosboot/io.c | 4 | ||||
| -rw-r--r-- | sys/i386/boot/io.c | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/sys/i386/boot/Makefile b/sys/i386/boot/Makefile index aceb270..fb01dbc 100644 --- a/sys/i386/boot/Makefile +++ b/sys/i386/boot/Makefile @@ -20,7 +20,7 @@ # the rights to redistribute these changes. # # from: Mach, Revision 2.2 92/04/04 11:33:46 rpd -# $Id: Makefile,v 1.11 1994/08/21 17:47:24 paul Exp $ +# $Id: Makefile,v 1.12 1994/08/21 18:15:45 paul Exp $ # wd0: @@ -51,7 +51,7 @@ OBJS = start.o table.o boot2.o boot.o asm.o bios.o io.o disk.o sys.o $(CC) $(CFLAGS) -c $< boot: $(OBJS) - $(LD) -Bstatic -N -T 0 -o boot $(OBJS) $(LIBS) + $(LD) -Bstatic -N -T 0 -o boot $(OBJS) $(LIBS) ${LDDESTDIR} cp boot boot.sym @strip boot @size boot diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile index aceb270..fb01dbc 100644 --- a/sys/i386/boot/biosboot/Makefile +++ b/sys/i386/boot/biosboot/Makefile @@ -20,7 +20,7 @@ # the rights to redistribute these changes. # # from: Mach, Revision 2.2 92/04/04 11:33:46 rpd -# $Id: Makefile,v 1.11 1994/08/21 17:47:24 paul Exp $ +# $Id: Makefile,v 1.12 1994/08/21 18:15:45 paul Exp $ # wd0: @@ -51,7 +51,7 @@ OBJS = start.o table.o boot2.o boot.o asm.o bios.o io.o disk.o sys.o $(CC) $(CFLAGS) -c $< boot: $(OBJS) - $(LD) -Bstatic -N -T 0 -o boot $(OBJS) $(LIBS) + $(LD) -Bstatic -N -T 0 -o boot $(OBJS) $(LIBS) ${LDDESTDIR} cp boot boot.sym @strip boot @size boot diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c index b4517c6..5c460d9 100644 --- a/sys/i386/boot/biosboot/io.c +++ b/sys/i386/boot/biosboot/io.c @@ -25,9 +25,11 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:57 rpd - * $Id: io.c,v 1.6 1994/06/16 03:53:29 adam Exp $ + * $Id: io.c,v 1.7 1994/09/16 13:33:17 davidg Exp $ */ +#include <machine/cpufunc.h> + #define K_RDWR 0x60 /* keyboard data & cmds (read/write) */ #define K_STATUS 0x64 /* keyboard status */ #define K_CMD 0x64 /* keybd ctlr command (write-only) */ diff --git a/sys/i386/boot/io.c b/sys/i386/boot/io.c index b4517c6..5c460d9 100644 --- a/sys/i386/boot/io.c +++ b/sys/i386/boot/io.c @@ -25,9 +25,11 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:57 rpd - * $Id: io.c,v 1.6 1994/06/16 03:53:29 adam Exp $ + * $Id: io.c,v 1.7 1994/09/16 13:33:17 davidg Exp $ */ +#include <machine/cpufunc.h> + #define K_RDWR 0x60 /* keyboard data & cmds (read/write) */ #define K_STATUS 0x64 /* keyboard status */ #define K_CMD 0x64 /* keybd ctlr command (write-only) */ |
