diff options
| author | ru <ru@FreeBSD.org> | 2004-02-17 07:13:04 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2004-02-17 07:13:04 +0000 |
| commit | 7309f777b627aa98766d76409b9783bf70760450 (patch) | |
| tree | 14fd98df97e16ff1854775baa9e2e6ebe97da6f6 /sys/boot/i386/boot2/Makefile | |
| parent | 2bf5bfe61f1a381fb0d880b238786e3d2d34c63d (diff) | |
| download | FreeBSD-src-7309f777b627aa98766d76409b9783bf70760450.zip FreeBSD-src-7309f777b627aa98766d76409b9783bf70760450.tar.gz | |
Re-add sio.S, and properly deal with assembler files.
Repocopied by: joe
Diffstat (limited to 'sys/boot/i386/boot2/Makefile')
| -rw-r--r-- | sys/boot/i386/boot2/Makefile | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index 273d20a..ed3f9c2 100644 --- a/sys/boot/i386/boot2/Makefile +++ b/sys/boot/i386/boot2/Makefile @@ -20,16 +20,15 @@ BOOT2_UFS?= UFS1_AND_UFS2 #BOOT2_UFS?= UFS2_ONLY #BOOT2_UFS?= UFS1_ONLY -AFLAGS+=--defsym FLAGS=${B1FLAGS} \ - --defsym SIOPRT=${BOOT_COMCONSOLE_PORT} \ - --defsym SIOFMT=${B2SIOFMT} \ - --defsym SIOSPD=${BOOT_COMCONSOLE_SPEED} - CFLAGS= -Os \ -fno-guess-branch-probability -fomit-frame-pointer\ -mno-align-long-strings \ -mrtd \ -D${BOOT2_UFS} \ + -DFLAGS=${B1FLAGS} \ + -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ + -DSIOFMT=${B2SIOFMT} \ + -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ -I${.CURDIR}/../../common \ -I${.CURDIR}/../btx/lib -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ @@ -54,10 +53,6 @@ boot1: boot1.out boot1.out: boot1.o ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o -boot1.o: boot1.s - ${CPP} ${CFLAGS} ${.CURDIR}/boot1.s | \ - ${AS} ${AFLAGS} -o ${.TARGET} - CLEANFILES+= boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \ boot2.s boot2.s.tmp boot2.h sio.o |
