diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-10 07:36:33 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-10 07:36:33 +0000 |
| commit | 1752d29e9c0930cc48fb46cf0907dd4fefd2a309 (patch) | |
| tree | fb5e1887d3a77f881cf8cc088ded1fedec07197e /sys/arch/mvme68k/stand/bootst | |
| parent | 1714e6d4bfb567efae90f7337074a300005d155a (diff) | |
Really pass -fno-stack-protector in CFLAGS as intended, and define the
load addresses in one single place; from mvme88k
Diffstat (limited to 'sys/arch/mvme68k/stand/bootst')
| -rw-r--r-- | sys/arch/mvme68k/stand/bootst/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/mvme68k/stand/bootst/Makefile b/sys/arch/mvme68k/stand/bootst/Makefile index 62d7c1bceb4..3167ba77f01 100644 --- a/sys/arch/mvme68k/stand/bootst/Makefile +++ b/sys/arch/mvme68k/stand/bootst/Makefile @@ -1,14 +1,13 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $OpenBSD: Makefile,v 1.11 2005/08/03 00:16:01 millert Exp $ +# $OpenBSD: Makefile,v 1.12 2006/01/10 07:36:32 miod Exp $ -RELOC=0x6F0000 SIZE?= size S= ${.CURDIR}/../../../.. DEFS= INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \ -I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa -CFLAGS= -O2 ${INCPATH} ${DEFS} ${COPTS} +CFLAGS+=-O2 ${INCPATH} ${DEFS} ${COPTS} CLEANFILES+=stboot bootst bootst.bug .include "${S}/arch/mvme68k/stand/wrtvid/Makefile.inc" @@ -29,7 +28,7 @@ ALL= ${BOOTS} all: ${ALL} bootst.bug: ${OBJS} ${BUGCRT} ${LIBS} - ${LD} -s -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} \ + ${LD} -s -N -T ${STAGE2_RELOC} ${BUGCRT} ${OBJS} ${LIBS} \ `cc -print-libgcc-file-name` -o $@ @${SIZE} bootst.bug |