summaryrefslogtreecommitdiff
path: root/sys/arch/i386/stand/boot/Makefile
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1997-08-13 04:03:31 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1997-08-13 04:03:31 +0000
commit8f1e2faf3b28ce1146c187c22314e213eabafc2e (patch)
tree6d75e7a50687e28224d41f0771a626512338f7bc /sys/arch/i386/stand/boot/Makefile
parentdc838e4b20aca8fda46e1433689baea44e2e37dc (diff)
split off START into LINKADDR and LOADADDR (we will need reloctable boot)
BOOTREL as a linear address, not segment one more heap (;
Diffstat (limited to 'sys/arch/i386/stand/boot/Makefile')
-rw-r--r--sys/arch/i386/stand/boot/Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index c236bdbae8e..b38e8e7adc1 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 1997/08/02 22:23:07 mickey Exp $
+# $OpenBSD: Makefile,v 1.10 1997/08/13 04:03:29 mickey Exp $
PROG= boot
SRCS= srt0.S boot.c cmd.c kentry.c conf.c
#AFLAGS+=-Wa,-R
# AFLAGS+=-Wa,-a
LD=ld
-LDFLAGS+=-nostdlib -Ttext $(START) -z -x -Bstatic
+LDFLAGS+=-nostdlib -Ttext $(LINKADDR) -z -x -Bstatic
INSTALL_STRIP=
MAN= boot.8
S =${.CURDIR}/../../../..
@@ -21,13 +21,19 @@ machine-links:
@ln -fs ${.CURDIR}/../.. i386
@ln -fs ${.CURDIR}/../../include machine
+kentry.o: kentry.c
+ @echo ${COMPILE.c} ${.IMPSRC}
+ @${COMPILE.c} -S -o tmp.s ${.IMPSRC}
+ @sed 's/ret/lret/g' tmp.s | ${AS} -f -o $@
+ @rm tmp.s
+
${PROG}: $(OBJS) $(DPADD)
$(LD) $(LDFLAGS) -o $(PROG) $(OBJS) $(LDADD)
@size $(PROG)
.include <bsd.prog.mk>
-CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC)
+CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS}
CFLAGS+=$(SACFLAGS)
.ifdef NO_NET
CPPFLAGS+=-DNO_NET