summaryrefslogtreecommitdiff
path: root/sys/arch/hppa
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2002-12-02 09:00:27 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2002-12-02 09:00:27 +0000
commit22703df0df76accb65607f28070a9771b5bb42de (patch)
tree2f2aa0ebf948ee4580b10bb0a41b7f258b40d0e8 /sys/arch/hppa
parent560fab27442ac85618b1720e90581c295ae1ea83 (diff)
Import propolice (http://www.trl.ibm.com/projects/security/ssp), a stack
attack protection scheme, into gcc. This protection is enabled by default. It can be turned off by using the -fno-stack-protector flag. Code by Hiroaki Etoh (etoh at jp dot ibm dot com); work on openbsd-specific integration by fgsch@, deraadt@ and myself; tests by fgsch@, naddy@ and myself; beer drinking by myself. Please note that system upgrades with this new code will require a new libc and ld.so to be build and installed before the propolice-enabled compiler can be installed.
Diffstat (limited to 'sys/arch/hppa')
-rw-r--r--sys/arch/hppa/conf/Makefile.hppa5
-rw-r--r--sys/arch/hppa/stand/Makefile.inc3
2 files changed, 5 insertions, 3 deletions
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