diff options
| author | Pascal Stumpf <pascal@cvs.openbsd.org> | 2012-09-25 09:01:04 +0000 |
|---|---|---|
| committer | Pascal Stumpf <pascal@cvs.openbsd.org> | 2012-09-25 09:01:04 +0000 |
| commit | c60458c393b55d9504705533498b27f875701860 (patch) | |
| tree | 5115d5b6aae47a50100423669a4044fe68d47d46 /sys/arch/amd64/stand/cdboot | |
| parent | 364f9c056d58d6405fd541d95b067d8af7b7ed8b (diff) | |
Reduce the diff between amd64/stand and i386/stand, requested by deraadt@.
These create essentially the same bootblocks, so the build system should not be
diverging too much, or at least easily diffable.
There is still a lot of work to be done here, but this is the low-hanging fruit.
ok jsing@
Diffstat (limited to 'sys/arch/amd64/stand/cdboot')
| -rw-r--r-- | sys/arch/amd64/stand/cdboot/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/amd64/stand/cdboot/Makefile b/sys/arch/amd64/stand/cdboot/Makefile index 44cdd798b15..3b9857cd3e2 100644 --- a/sys/arch/amd64/stand/cdboot/Makefile +++ b/sys/arch/amd64/stand/cdboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2012/08/29 17:45:00 pascal Exp $ +# $OpenBSD: Makefile,v 1.14 2012/09/25 09:01:03 pascal Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -12,8 +12,8 @@ PROG= cdboot SRCS= srt0.S boot.c conf.c LD?= ld SIZE?= size -LDFLAGS+=-melf_i386 -nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -noinhibit-exec -LDFLAGS+=-nopie -L/usr/libdata +LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -noinhibit-exec -nopie +LDFLAGS+=-melf_i386 -L/usr/libdata INSTALL_STRIP= .PATH: ${SADIR}/libsa @@ -59,9 +59,11 @@ NOPROG= .include <bsd.prog.mk> CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS} +CPPFLAGS+=-DLINKADDR=${LINKADDR} CPPFLAGS+=-DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP -DDYNAMIC_CRC_TABLE -CPPFLAGS+=-DLINKADDR=${LINKADDR} -I${S}/stand/boot -CFLAGS+=-m32 ${SACFLAGS} -D__INTERNAL_LIBSA_CREAD +CPPFLAGS+=-I${S}/stand/boot +CFLAGS+=-m32 +CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD CFLAGS+=-DOSREV=\"${OSREV}\" -DMACHINE=\"${MACHINE}\" CFLAGS+=-DKERNEL=\"/${OSREV}/${MACHINE}/bsd.rd\" CFLAGS+=-fno-pie |