diff options
Diffstat (limited to 'sys')
31 files changed, 65 insertions, 42 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 47f2425d94e..930fa5d9e18 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.25 2002/08/09 20:24:41 miod Exp $ +# $OpenBSD: Makefile.alpha,v 1.26 2002/12/02 09:00:21 miod Exp $ # $NetBSD: Makefile.alpha,v 1.27 1996/12/01 06:12:25 jonathan Exp $ # Makefile for OpenBSD @@ -38,7 +38,7 @@ CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dalpha CDIAGFLAGS?= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main -CMACHFLAGS= -mno-fp-regs +CMACHFLAGS= -mno-fp-regs -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -traditional -D_LOCORE diff --git a/sys/arch/alpha/stand/Makefile.inc b/sys/arch/alpha/stand/Makefile.inc index 1264f2a431d..d71f2ca141c 100644 --- a/sys/arch/alpha/stand/Makefile.inc +++ b/sys/arch/alpha/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.6 2001/02/03 03:22:47 art Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2002/12/02 09:00:22 miod Exp $ # $NetBSD: Makefile.inc,v 1.8 1997/04/06 08:39:38 cgd Exp $ .include <bsd.own.mk> # for ELF_TOOLCHAIN definition @@ -20,3 +20,4 @@ CPPFLAGS+= -D_STANDALONE XCPPFLAGS+= -DHEAP_LIMIT="0x${HEAP_LIMIT}" +CFLAGS+= -fno-stack-protector diff --git a/sys/arch/amiga/conf/Makefile.amiga b/sys/arch/amiga/conf/Makefile.amiga index fc3b2875945..2043585b546 100644 --- a/sys/arch/amiga/conf/Makefile.amiga +++ b/sys/arch/amiga/conf/Makefile.amiga @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amiga,v 1.32 2002/08/09 20:24:43 miod Exp $ +# $OpenBSD: Makefile.amiga,v 1.33 2002/12/02 09:00:22 miod Exp $ # $NetBSD: Makefile.amiga,v 1.60 1997/07/23 10:19:42 is Exp $ # Makefile for OpenBSD @@ -50,7 +50,7 @@ CMACHFLAGS= -m68020 .else CMACHFLAGS= -m68060 -Wa,-m68030 .endif -CMACHFLAGS+= -msoft-float +CMACHFLAGS+= -msoft-float -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS} ${PIPE} diff --git a/sys/arch/amiga/stand/binpatch/Makefile b/sys/arch/amiga/stand/binpatch/Makefile index 71c609261ba..7377c0aa588 100644 --- a/sys/arch/amiga/stand/binpatch/Makefile +++ b/sys/arch/amiga/stand/binpatch/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.5 2000/02/12 15:29:05 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/12/02 09:00:22 miod Exp $ # $NetBSD: Makefile,v 1.6 1996/09/27 03:23:12 chopps Exp $ .if ${MACHINE} == "amiga" PROG=binpatch BINDIR=/sbin LDFLAGS+=-static +CFLAGS+= -fno-stack-protector .else NOPROG=Yes .endif diff --git a/sys/arch/amiga/stand/boot/Makefile b/sys/arch/amiga/stand/boot/Makefile index f101ec86bad..16e33064893 100644 --- a/sys/arch/amiga/stand/boot/Makefile +++ b/sys/arch/amiga/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2000/02/12 15:29:06 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2002/12/02 09:00:22 miod Exp $ NOPROG= installboot MAN=installboot.8 @@ -39,6 +39,7 @@ INCPATH= -I${.CURDIR} -I${.CURDIR}/../.. -I${S} -I${S}/lib/libsa COPTIM= -O -fomit-frame-pointer -fno-function-cse -Wa,-l -m68060 \ -Wa,-m68030 CFLAGS= ${COPTIM} ${INCPATH} ${DEFS} +CFLAGS+= -fno-stack-protector COPTS+= -Wall -Wstrict-prototypes BOOTBLOCKS= xxboot # XXX fdboot is too large at the moment. diff --git a/sys/arch/amiga/stand/loadbsd/Makefile b/sys/arch/amiga/stand/loadbsd/Makefile index bf93cb95b8c..e81d493d99b 100644 --- a/sys/arch/amiga/stand/loadbsd/Makefile +++ b/sys/arch/amiga/stand/loadbsd/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 1999/09/09 21:25:13 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2002/12/02 09:00:22 miod Exp $ CC = gcc CFLAGS = -m68030 -Wall -O3 -fomit-frame-pointer -D__progname=program_name -msmall-code -resident +CFLAGS+= -fno-stack-protector OBJS1 = loadbsd.o poolmem.o getopt.o sleep.o vers.o openlibs_stub.o OBJS2 = loadbsd.o poolmem.o vers_ixemul.o openlibs_ixemul.o diff --git a/sys/arch/amiga/stand/loadkmap/Makefile b/sys/arch/amiga/stand/loadkmap/Makefile index daf487ccae0..3a6858b3454 100644 --- a/sys/arch/amiga/stand/loadkmap/Makefile +++ b/sys/arch/amiga/stand/loadkmap/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.8 2000/02/13 13:15:23 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2002/12/02 09:00:22 miod Exp $ # $NetBSD: Makefile,v 1.5 1996/09/27 03:23:13 chopps Exp $ .if ${MACHINE}=="amiga" PROG=loadkmap BINDIR=/usr/sbin SUBDIR=din es fr sw us +CFLAGS+= -fno-stack-protector .else NOPROG=Yes .endif diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300 index 5cbe14603fe..e4aff570362 100644 --- a/sys/arch/hp300/conf/Makefile.hp300 +++ b/sys/arch/hp300/conf/Makefile.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hp300,v 1.28 2002/08/09 20:24:43 miod Exp $ +# $OpenBSD: Makefile.hp300,v 1.29 2002/12/02 09:00:22 miod Exp $ # $NetBSD: Makefile.hp300,v 1.54 1997/04/01 23:16:41 scottr Exp $ # Makefile for OpenBSD @@ -44,7 +44,7 @@ CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \ -Dmc68020 -Dhp300 CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main -CMACHFLAGS= -msoft-float +CMACHFLAGS= -msoft-float -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS} ${PIPE} AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE diff --git a/sys/arch/hp300/stand/Makefile.inc b/sys/arch/hp300/stand/Makefile.inc index b1b016609d6..524af1b2d99 100644 --- a/sys/arch/hp300/stand/Makefile.inc +++ b/sys/arch/hp300/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 1999/08/16 09:43:07 downsj Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2002/12/02 09:00:23 miod Exp $ # $NetBSD: Makefile.inc,v 1.7 1997/05/12 07:43:18 thorpej Exp $ BINDIR= /usr/mdec @@ -6,6 +6,8 @@ BINDIR= /usr/mdec # RELOC=FFF00000 allows for boot prog up to FF000 (1044480) bytes long RELOC= FFF00000 +CFLAGS+= -fno-stack-protector + CPPFLAGS+= -DDCACONSOLE -DAPCICONSOLE -DITECONSOLE -DDCMCONSOLE CPPFLAGS+= -DHIL_KEYBOARD -DUK_KEYBOARD CPPFLAGS+= -DDOMAIN_KEYBOARD diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa index f15c89fb047..7f3a469df63 100644 --- a/sys/arch/hppa/conf/Makefile.hppa +++ b/sys/arch/hppa/conf/Makefile.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa,v 1.16 2002/08/09 20:24:43 miod Exp $ +# $OpenBSD: Makefile.hppa,v 1.17 2002/12/02 09:00:23 miod Exp $ # Makefile for OpenBSD # @@ -42,7 +42,8 @@ CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \ -Dhppa CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wno-uninitialized \ -Wno-format -Wno-main -CMACHFLAGS= -mfast-indirect-calls -mportable-runtime -mno-space-regs +CMACHFLAGS= -mfast-indirect-calls -mportable-runtime -mno-space-regs \ + -fno-stack-protector COPTS?= -Os CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS} ${PIPE} AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE diff --git a/sys/arch/hppa/stand/Makefile.inc b/sys/arch/hppa/stand/Makefile.inc index 93652e1ea78..5893f128ea9 100644 --- a/sys/arch/hppa/stand/Makefile.inc +++ b/sys/arch/hppa/stand/Makefile.inc @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile.inc,v 1.8 2002/03/15 21:22:50 mickey Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2002/12/02 09:00:23 miod Exp $ CFLAGS=${DEBUG} -Os -Wall -Werror +CFLAGS+= -fno-stack-protector CPPFLAGS+=-I${S} -I. -I${.CURDIR} SACFLAGS=-nostdinc -fno-builtin -D_STANDALONE -I${SADIR}/libsa SACFLAGS+=-mdisable-fpregs -mfast-indirect-calls -mpa-risc-1-0 diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 23f19662ce8..f1791a9e38d 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.31 2002/08/09 20:24:43 miod Exp $ +# $OpenBSD: Makefile.i386,v 1.32 2002/12/02 09:00:23 miod Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -48,6 +48,7 @@ CMACHFLAGS= -march=i486 .else CMACHFLAGS= .endif +CMACHFLAGS+= -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc index adebaa94ec6..7b6147b3e42 100644 --- a/sys/arch/i386/stand/Makefile.inc +++ b/sys/arch/i386/stand/Makefile.inc @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile.inc,v 1.29 2000/10/09 20:25:10 mickey Exp $ +# $OpenBSD: Makefile.inc,v 1.30 2002/12/02 09:00:23 miod Exp $ CFLAGS=${DEBUG} -Os -Wall -Werror +CFLAGS+= -fno-stack-protector CPPFLAGS+=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR} SACFLAGS=-D_STANDALONE DEBUGLIBS=no diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k index 7911e0935e0..a44dada32e3 100644 --- a/sys/arch/mac68k/conf/Makefile.mac68k +++ b/sys/arch/mac68k/conf/Makefile.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mac68k,v 1.27 2002/08/09 20:24:43 miod Exp $ +# $OpenBSD: Makefile.mac68k,v 1.28 2002/12/02 09:00:24 miod Exp $ # $NetBSD: Makefile.mac68k,v 1.53 1997/04/15 06:11:38 scottr Exp $ # Makefile for OpenBSD @@ -44,7 +44,7 @@ CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \ -Dmc68020 -Dmac68k CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main -CMACHFLAGS= -msoft-float +CMACHFLAGS= -msoft-float -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS} ${PIPE} AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc index a10be37b0f5..2ccb0bf9075 100644 --- a/sys/arch/macppc/conf/Makefile.macppc +++ b/sys/arch/macppc/conf/Makefile.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.macppc,v 1.8 2002/08/09 20:24:43 miod Exp $ +# $OpenBSD: Makefile.macppc,v 1.9 2002/12/02 09:00:24 miod Exp $ # # Makefile for OpenBSD PowerPC # @@ -44,7 +44,7 @@ CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL \ -Dmacppc CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main -CMACHFLAGS= -msoft-float -Wa,-m7400 +CMACHFLAGS= -msoft-float -Wa,-m7400 -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE diff --git a/sys/arch/macppc/stand/Makefile.inc b/sys/arch/macppc/stand/Makefile.inc index 00a156e277b..df2635a710d 100644 --- a/sys/arch/macppc/stand/Makefile.inc +++ b/sys/arch/macppc/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.2 2001/10/03 17:10:06 drahn Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2002/12/02 09:00:24 miod Exp $ # $NetBSD: Makefile.inc,v 1.1 1996/09/30 16:34:59 ws Exp $ .if !defined(__stand_makefile_inc) @@ -22,6 +22,7 @@ INCLUDES+= -I. -I$(.OBJDIR) -I$(.CURDIR)/.. -I$(S)/arch -I$(S) INCLUDES+= -I$(S)/lib/libsa DEFS+= -DSTANDALONE -DFIREPOWERBUGS CFLAGS+= $(INCLUDES) $(DEFS) $(EXTRACFLAGS) +CFLAGS+= -fno-stack-protector LDFLAGS?= -X -N -Ttext $(RELOC) -e $(ENTRY) cleandir: diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k index 0baa9ba4309..26dd4ab3205 100644 --- a/sys/arch/mvme68k/conf/Makefile.mvme68k +++ b/sys/arch/mvme68k/conf/Makefile.mvme68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme68k,v 1.17 2002/08/09 20:24:43 miod Exp $ +# $OpenBSD: Makefile.mvme68k,v 1.18 2002/12/02 09:00:24 miod Exp $ # This makefile is constructed from a machine description: # config machineid @@ -47,7 +47,7 @@ CMACHFLAGS= -m68020 .else CMACHFLAGS= -m68060 -Wa,-m68030 .endif -CMACHFLAGS+= -msoft-float +CMACHFLAGS+= -msoft-float -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS} ${PIPE} diff --git a/sys/arch/mvme68k/stand/Makefile.inc b/sys/arch/mvme68k/stand/Makefile.inc index a3f02f3f7c9..e622ccccb11 100644 --- a/sys/arch/mvme68k/stand/Makefile.inc +++ b/sys/arch/mvme68k/stand/Makefile.inc @@ -1,3 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2000/03/03 00:54:52 todd Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2002/12/02 09:00:24 miod Exp $ MDEC_DIR?=/usr/mdec +CFLAGS+= -fno-stack-protector diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k index f3926027d93..ceb32a9e28c 100644 --- a/sys/arch/mvme88k/conf/Makefile.mvme88k +++ b/sys/arch/mvme88k/conf/Makefile.mvme88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme88k,v 1.21 2002/08/09 20:24:43 miod Exp $ +# $OpenBSD: Makefile.mvme88k,v 1.22 2002/12/02 09:00:24 miod Exp $ # # Makefile for OpenBSD # @@ -41,7 +41,7 @@ INCLUDES= -nostdinc -I. -I$S/arch -I$S CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dmvme88k -Dm88k CWARNFLAGS= -Wall -Werror -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main -Wstrict-prototypes -CMACHFLAGS= +CMACHFLAGS= -fno-stack-protector COPTS?= -O CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE ${CMACHFLAGS} diff --git a/sys/arch/mvme88k/stand/Makefile.inc b/sys/arch/mvme88k/stand/Makefile.inc index 5a0216193f1..8955102edea 100644 --- a/sys/arch/mvme88k/stand/Makefile.inc +++ b/sys/arch/mvme88k/stand/Makefile.inc @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile.inc,v 1.4 2001/03/27 21:13:51 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2002/12/02 09:00:25 miod Exp $ MDEC_DIR?=/usr/mdec +CFLAGS+= -fno-stack-protector # Load addresses for first and second stage bootstraps STAGE1_RELOC=0x009F0000 diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc index e215c41ee48..0e217bf98b1 100644 --- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc +++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvmeppc,v 1.9 2002/08/09 20:24:43 miod Exp $ +# $OpenBSD: Makefile.mvmeppc,v 1.10 2002/12/02 09:00:25 miod Exp $ # # Makefile for OpenBSD PowerPC # @@ -44,7 +44,7 @@ CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL \ -Dpowerpc -D__mvmeppc__ CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main -CMACHFLAGS= -msoft-float -Wa,-m7400 +CMACHFLAGS= -msoft-float -Wa,-m7400 -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE diff --git a/sys/arch/mvmeppc/stand/Makefile.inc b/sys/arch/mvmeppc/stand/Makefile.inc index 5404d746abb..e14f6de44eb 100644 --- a/sys/arch/mvmeppc/stand/Makefile.inc +++ b/sys/arch/mvmeppc/stand/Makefile.inc @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile.inc,v 1.1 2001/06/26 21:57:58 smurph Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2002/12/02 09:00:25 miod Exp $ MDEC_DIR?=/usr/mdec +CFLAGS+= -fno-stack-protector # Load addresses for first and second stage bootstraps STAGE1_RELOC=4000 diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc index 7aaad1f1522..60f2fa9160d 100644 --- a/sys/arch/sparc/conf/Makefile.sparc +++ b/sys/arch/sparc/conf/Makefile.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc,v 1.26 2002/09/23 01:43:14 art Exp $ +# $OpenBSD: Makefile.sparc,v 1.27 2002/12/02 09:00:25 miod Exp $ # $NetBSD: Makefile.sparc,v 1.32.4.1 1996/06/12 20:26:32 pk Exp $ # Makefile for OpenBSD @@ -49,6 +49,7 @@ CMACHFLAGS= -mcpu=supersparc .else CMACHFLAGS= .endif +CMACHFLAGS+= -fno-stack-protector CFLAGS= ${DEBUG} -O2 ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} # add `-mno-fpu' to work around gcc (last noticed in v2.7.2) bug diff --git a/sys/arch/sparc/stand/Makefile.inc b/sys/arch/sparc/stand/Makefile.inc index b261d414d95..1c1d5e4417d 100644 --- a/sys/arch/sparc/stand/Makefile.inc +++ b/sys/arch/sparc/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.10 2000/07/18 01:28:48 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2002/12/02 09:00:25 miod Exp $ # $NetBSD: Makefile.inc,v 1.5 1996/02/01 22:33:01 mycroft Exp $ BINDIR= /usr/mdec @@ -12,6 +12,8 @@ RELOC_SUN4M= 0x440000 RELOC?= ${RELOC_TEST} RELOC2!= perl -e 'printf "0x%x", ${RELOC_TEST} + 0x40000' +CFLAGS+= -fno-stack-protector + DEFS= -DSTANDALONE -DRELOC=${RELOC} -DSUN4 -DSUN4C -DSUN_BOOTPARAMS ### Figure out what to use for libkern diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64 index b20c4628ed4..bdb41113bfb 100644 --- a/sys/arch/sparc64/conf/Makefile.sparc64 +++ b/sys/arch/sparc64/conf/Makefile.sparc64 @@ -22,7 +22,7 @@ CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL CDIAGFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main -CMACHFLAGS= -Wa,-Av9a, -mno-fpu +CMACHFLAGS= -Wa,-Av9a, -mno-fpu -fno-stack-protector CFLAGS= ${DEBUG} -O2 ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE -Wa,-Av9a diff --git a/sys/arch/sparc64/stand/Makefile.inc b/sys/arch/sparc64/stand/Makefile.inc index 2b8f6616321..ecb8d086a2d 100644 --- a/sys/arch/sparc64/stand/Makefile.inc +++ b/sys/arch/sparc64/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.2 2001/08/20 19:55:33 jason Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2002/12/02 09:00:25 miod Exp $ # $NetBSD: Makefile.inc,v 1.7 2000/08/20 14:57:16 mrg Exp $ .ifndef __INCLUDED_STAND_MAKEFILE_INC @@ -13,6 +13,7 @@ BINDIR= /usr/mdec CPPFLAGS+= -D_STANDALONE -DSUN4U CPPFLAGS+= -I. +CFLAGS+= -fno-stack-protector CFLAGS+= -msoft-float .endif diff --git a/sys/arch/sun3/conf/Makefile.sun3 b/sys/arch/sun3/conf/Makefile.sun3 index dff3e30ec28..c3410ec93c7 100644 --- a/sys/arch/sun3/conf/Makefile.sun3 +++ b/sys/arch/sun3/conf/Makefile.sun3 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sun3,v 1.32 2002/08/09 20:24:43 miod Exp $ +# $OpenBSD: Makefile.sun3,v 1.33 2002/12/02 09:00:26 miod Exp $ # $NetBSD: Makefile.sun3,v 1.51 1996/09/09 21:07:08 mycroft Exp $ # Makefile for OpenBSD @@ -44,7 +44,7 @@ CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \ -Dmc68020 -Dsun3 CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main -CMACHFLAGS= -m68020 -msoft-float +CMACHFLAGS= -m68020 -msoft-float -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS} ${PIPE} AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE ${CMACHFLAGS} diff --git a/sys/arch/sun3/stand/Makefile.inc b/sys/arch/sun3/stand/Makefile.inc index 55a5079c590..719bd9aeb0c 100644 --- a/sys/arch/sun3/stand/Makefile.inc +++ b/sys/arch/sun3/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2001/07/04 08:33:43 niklas Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2002/12/02 09:00:26 miod Exp $ # $NetBSD: Makefile.inc,v 1.6 1995/11/17 23:23:44 gwr Exp $ .if defined(SA_PROG) @@ -10,6 +10,7 @@ S= ${.CURDIR}/../../../.. RELOC?= 240000 DEFS?= -DSTANDALONE INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S} +CFLAGS+=-fno-stack-protector COPTS?= -msoft-float ${DEFS} ${DBG} ${INCL} LIBSA?= ../libsa diff --git a/sys/arch/vax/boot/Makefile.inc b/sys/arch/vax/boot/Makefile.inc index bbe032e06d2..068de9c7b4d 100644 --- a/sys/arch/vax/boot/Makefile.inc +++ b/sys/arch/vax/boot/Makefile.inc @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.3 2002/06/11 09:36:23 hugh Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2002/12/02 09:00:26 miod Exp $ # $NetBSD: Makefile.inc,v 1.6 2002/02/24 01:04:23 matt Exp $ RELOC=0x39F000 .PATH: ${.CURDIR}/../../vax ${.CURDIR}/../common +CFLAGS+= -fno-stack-protector CPPFLAGS+=-I. -I${.CURDIR}/../../../../ -I${.CURDIR}/../../ -I${.CURDIR}/../common -I${.CURDIR}/../../include CPPFLAGS+=-DRELOC=${RELOC} diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax index 56bdc81a8ef..452c8a84407 100644 --- a/sys/arch/vax/conf/Makefile.vax +++ b/sys/arch/vax/conf/Makefile.vax @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.vax,v 1.19 2002/08/09 20:24:43 miod Exp $ +# $OpenBSD: Makefile.vax,v 1.20 2002/12/02 09:00:26 miod Exp $ # $NetBSD: Makefile.vax,v 1.49 1999/07/26 05:20:49 cgd Exp $ # Makefile for OpenBSD/vax @@ -78,7 +78,8 @@ INCLUDES= -I. -I$S/arch -I$S -nostdinc CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \ -D_VAX_INLINE_ CWARNFLAGS?= -Werror -Wall -Wno-main -Wno-format -Wno-uninitialized -CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${PIPE} +CMACHFLAGS= -fno-stack-protector +CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS} ${PIPE} AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE LINKFLAGS= -N -Ttext 80000000 -e start STRIPFLAGS= -d diff --git a/sys/arch/vax/stand/Makefile.inc b/sys/arch/vax/stand/Makefile.inc index bbe032e06d2..068de9c7b4d 100644 --- a/sys/arch/vax/stand/Makefile.inc +++ b/sys/arch/vax/stand/Makefile.inc @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.3 2002/06/11 09:36:23 hugh Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2002/12/02 09:00:26 miod Exp $ # $NetBSD: Makefile.inc,v 1.6 2002/02/24 01:04:23 matt Exp $ RELOC=0x39F000 .PATH: ${.CURDIR}/../../vax ${.CURDIR}/../common +CFLAGS+= -fno-stack-protector CPPFLAGS+=-I. -I${.CURDIR}/../../../../ -I${.CURDIR}/../../ -I${.CURDIR}/../common -I${.CURDIR}/../../include CPPFLAGS+=-DRELOC=${RELOC} |