aboutsummaryrefslogtreecommitdiff
path: root/sys/boot
diff options
context:
space:
mode:
authorYoshihiro Takahashi <nyan@FreeBSD.org>2002-02-03 11:37:20 +0000
committerYoshihiro Takahashi <nyan@FreeBSD.org>2002-02-03 11:37:20 +0000
commitd1d3c54c4aa97794e1d61b5d5dfc050e912877a9 (patch)
treea3bcb55e39550f7b4d88265ab3c39db24f22c10c /sys/boot
parent1e7b3a76d60c8a58e28561b459d596ad42653b18 (diff)
Notes
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/pc98/Makefile2
-rw-r--r--sys/boot/pc98/kgzldr/Makefile4
-rw-r--r--sys/boot/pc98/kgzldr/crt.s4
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/boot/pc98/Makefile b/sys/boot/pc98/Makefile
index b86e09fe94ad..d63cb4c2e0a4 100644
--- a/sys/boot/pc98/Makefile
+++ b/sys/boot/pc98/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-SUBDIR= btx boot0 boot0.5 boot2 libpc98 loader
+SUBDIR= btx boot0 boot0.5 boot2 kgzldr libpc98 loader
.include <bsd.subdir.mk>
diff --git a/sys/boot/pc98/kgzldr/Makefile b/sys/boot/pc98/kgzldr/Makefile
index 89104980ba68..d89e6b439f1a 100644
--- a/sys/boot/pc98/kgzldr/Makefile
+++ b/sys/boot/pc98/kgzldr/Makefile
@@ -20,7 +20,7 @@ STRIP=
AFLAGS+=--defsym PC98=1
M4?= m4
-M4FLAGS=-DOBJFORMAT=${OBJFORMAT}
+M4FLAGS=
BOOT_COMCONSOLE_PORT?= 0x238
M4FLAGS+=-DSIOPRT=${BOOT_COMCONSOLE_PORT}
@@ -31,7 +31,7 @@ kgzldr.o: ${OBJS}
${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS}
.s.o:
- (cd ${.CURDIR}; ${M4} ${M4FLAGS} ../../i386/kgzldr/kgzldr.m4 ${.IMPSRC}) |\
+ (cd ${.CURDIR}; ${M4} ${M4FLAGS} ${.IMPSRC}) |\
${AS} ${AFLAGS} -o ${.TARGET}
.include <bsd.prog.mk>
diff --git a/sys/boot/pc98/kgzldr/crt.s b/sys/boot/pc98/kgzldr/crt.s
index 466ec297cbfd..fed9ba906bdf 100644
--- a/sys/boot/pc98/kgzldr/crt.s
+++ b/sys/boot/pc98/kgzldr/crt.s
@@ -46,11 +46,11 @@
.set BDA_POS,0x450 # Cursor position
.endif
- .globl _(crt_putchr)
+ .globl crt_putchr
# void crt_putchr(int c)
-_(crt_putchr): movb 0x4(%esp,1),%al # Get character
+crt_putchr: movb 0x4(%esp,1),%al # Get character
pusha # Save
xorl %ecx,%ecx # Zero for loops
movb $SCR_MAT,%ah # Mode/attribute