diff options
| author | jhb <jhb@FreeBSD.org> | 2000-05-23 12:18:49 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-05-23 12:18:49 +0000 |
| commit | 5053ee0d6cc0d8390a4e29ba7b7de827c6cce053 (patch) | |
| tree | d278a658df406d492fef8fecec7e6e2544fb3827 /sys/boot/i386/gptboot | |
| parent | f223e71d8fb7d790ab6bd06f4381f12e2e7711d1 (diff) | |
| download | FreeBSD-src-5053ee0d6cc0d8390a4e29ba7b7de827c6cce053.zip FreeBSD-src-5053ee0d6cc0d8390a4e29ba7b7de827c6cce053.tar.gz | |
Clean up all of the 16-bit assembly code in the x86 bootstrap to work
with the new binutils. Now that we have a decent assembler, all the old
m4 macros are no longer needed. Instead, straight assembly can be used
since as(1) now understands 16-bit addressing, branches, etc. Also,
several bugs have been fixed in as(1), allowing boot0.s to be further
cleaned up.
Diffstat (limited to 'sys/boot/i386/gptboot')
| -rw-r--r-- | sys/boot/i386/gptboot/Makefile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile index 5f523bb..0ccf65d 100644 --- a/sys/boot/i386/gptboot/Makefile +++ b/sys/boot/i386/gptboot/Makefile @@ -9,8 +9,6 @@ CLEANFILES+= boot1 boot1.out boot1.o \ boot2.ldr boot2.bin boot2.ld boot2.out boot2.o \ sio.o -M4?= m4 - # A value of 0x80 enables LBA support. B1FLAGS= 0 @@ -45,9 +43,8 @@ boot1: boot1.out boot1.out: boot1.o ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o -boot1.o: boot1.m4 boot1.s - (cd ${.CURDIR}; ${M4} -DFLAGS=${B1FLAGS} boot1.m4 boot1.s) | \ - ${AS} ${AFLAGS} -o ${.TARGET} +boot1.o: boot1.s + ${AS} ${AFLAGS} --defsym FLAGS=${B1FLAGS} ${.IMPSRC} -o ${.TARGET} boot2: boot2.ldr boot2.bin ${BTX}/btx/btx btxld -v -E ${ORG2} -f bin -b ${BTX}/btx/btx -l boot2.ldr \ @@ -67,10 +64,10 @@ boot2.out: boot2.o sio.o ${BTX}/lib/crt0.o boot2.o sio.o sio.o: sio.s - (cd ${.CURDIR}; ${M4} -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ - -DSIOFMT=${B2SIOFMT} \ - -DSIOSPD=${BOOT_COMCONSOLE_SPEED} sio.s) | \ - ${AS} ${AFLAGS} -o ${.TARGET} + ${AS} ${AFLAGS} --defsym SIOPRT=${BOOT_COMCONSOLE_PORT} \ + --defsym SIOFMT=${B2SIOFMT} \ + --defsym SIOSPD=${BOOT_COMCONSOLE_SPEED} \ + ${.IMPSRC} -o ${.TARGET} install: ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
