d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: add ${LDDESTDIR} to linking of boot code so ${DESTDIR}/usr/lib

Browse Source 
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.
This commit is contained in:
Steven Wallace 1994-09-18 07:39:55 +00:00
parent b5173cbeea
commit dfc5d1d4eb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=2851
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/i386/boot/Makefile
View File

@ -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

4
sys/i386/boot/biosboot/Makefile
View File

@ -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

4
sys/i386/boot/biosboot/io.c
View File

@ -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) */

4
sys/i386/boot/io.c
View File

@ -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) */