diff options
-rw-r--r-- | sys/arch/alpha/stand/Makefile.inc | 3 | ||||
-rw-r--r-- | sys/arch/amd64/stand/Makefile.inc | 4 | ||||
-rw-r--r-- | sys/arch/hp300/stand/Makefile.inc | 3 | ||||
-rw-r--r-- | sys/arch/hppa/stand/Makefile.inc | 4 | ||||
-rw-r--r-- | sys/arch/hppa64/stand/Makefile.inc | 4 | ||||
-rw-r--r-- | sys/arch/i386/stand/Makefile.inc | 4 | ||||
-rw-r--r-- | sys/arch/macppc/stand/Makefile.inc | 4 | ||||
-rw-r--r-- | sys/arch/mvme68k/stand/Makefile.inc | 4 | ||||
-rw-r--r-- | sys/arch/mvme88k/stand/Makefile.inc | 4 | ||||
-rw-r--r-- | sys/arch/mvmeppc/stand/Makefile.inc | 4 | ||||
-rw-r--r-- | sys/arch/sgi/stand/Makefile.inc | 3 | ||||
-rw-r--r-- | sys/arch/sparc/stand/Makefile.inc | 3 | ||||
-rw-r--r-- | sys/arch/sparc/stand/libsa/Makefile | 4 | ||||
-rw-r--r-- | sys/arch/sparc64/stand/Makefile.inc | 3 |
14 files changed, 23 insertions, 28 deletions
diff --git a/sys/arch/alpha/stand/Makefile.inc b/sys/arch/alpha/stand/Makefile.inc index 5c1e5d62d1a..39bcbf06eab 100644 --- a/sys/arch/alpha/stand/Makefile.inc +++ b/sys/arch/alpha/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.8 2004/07/13 21:03:36 marc Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2005/12/30 02:03:48 millert Exp $ # $NetBSD: Makefile.inc,v 1.8 1997/04/06 08:39:38 cgd Exp $ .include <bsd.own.mk> # for ELF_TOOLCHAIN definition @@ -17,7 +17,6 @@ CPPFLAGS+= -DPRIMARY_LOAD_ADDRESS="0x${PRIMARY_LOAD_ADDRESS}" CPPFLAGS+= -DSECONDARY_LOAD_ADDRESS="0x${SECONDARY_LOAD_ADDRESS}" CPPFLAGS+= -D_STANDALONE -CPPFLAGS+= -Derrno=errno XCPPFLAGS+= -DHEAP_LIMIT="0x${HEAP_LIMIT}" diff --git a/sys/arch/amd64/stand/Makefile.inc b/sys/arch/amd64/stand/Makefile.inc index 58a514b8efa..7ef3710014d 100644 --- a/sys/arch/amd64/stand/Makefile.inc +++ b/sys/arch/amd64/stand/Makefile.inc @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.3 2004/07/24 17:39:27 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2005/12/30 02:03:48 millert Exp $ CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror CFLAGS+= -fno-stack-protector -CPPFLAGS+=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR} -Derrno=errno +CPPFLAGS+=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR} SACFLAGS=-D_STANDALONE DEBUGLIBS=no DEBUGFLAGS= diff --git a/sys/arch/hp300/stand/Makefile.inc b/sys/arch/hp300/stand/Makefile.inc index 6c759c80fd2..3a6a2677cb8 100644 --- a/sys/arch/hp300/stand/Makefile.inc +++ b/sys/arch/hp300/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2004/07/13 21:03:37 marc Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2005/12/30 02:03:48 millert Exp $ # $NetBSD: Makefile.inc,v 1.7 1997/05/12 07:43:18 thorpej Exp $ BINDIR= /usr/mdec @@ -13,7 +13,6 @@ CPPFLAGS+= -DHIL_KEYBOARD -DUK_KEYBOARD CPPFLAGS+= -DDOMAIN_KEYBOARD CPPFLAGS+= -DSTANDALONE -Dhp300 CPPFLAGS+= -DCOMPAT_UFS -DNO_LSEEK -CPPFLAGS+= -Derrno=errno # Limit the alloc() heap to below the msgbuf and ROM scratch pages. CPPFLAGS+= -DHEAP_LIMIT="0xffffdfff" diff --git a/sys/arch/hppa/stand/Makefile.inc b/sys/arch/hppa/stand/Makefile.inc index 10c2f2c83a0..2ff005d2bf4 100644 --- a/sys/arch/hppa/stand/Makefile.inc +++ b/sys/arch/hppa/stand/Makefile.inc @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile.inc,v 1.13 2004/07/13 21:03:37 marc Exp $ +# $OpenBSD: Makefile.inc,v 1.14 2005/12/30 02:03:49 millert Exp $ CFLAGS=${DEBUG} -Os -Wall -Werror -CPPFLAGS+=-I${S} -I. -I${.CURDIR} -Derrno=errno +CPPFLAGS+=-I${S} -I. -I${.CURDIR} SACFLAGS=-nostdinc -fno-builtin -D_STANDALONE -I${STANDIR}/libsa SACFLAGS+=-mdisable-fpregs -mfast-indirect-calls -mpa-risc-1-1 SACFLAGS+=-fno-stack-protector diff --git a/sys/arch/hppa64/stand/Makefile.inc b/sys/arch/hppa64/stand/Makefile.inc index 2f7a45dcf73..1f5276217aa 100644 --- a/sys/arch/hppa64/stand/Makefile.inc +++ b/sys/arch/hppa64/stand/Makefile.inc @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile.inc,v 1.1 2005/04/01 10:40:48 mickey Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2005/12/30 02:03:48 millert Exp $ CFLAGS=${DEBUG} -Os -Wall -Werror -CPPFLAGS+=-I${S} -I. -I${.CURDIR} -Derrno=errno +CPPFLAGS+=-I${S} -I. -I${.CURDIR} SACFLAGS=-nostdinc -fno-builtin -D_STANDALONE -I${STANDIR}/libsa SACFLAGS+=-mdisable-fpregs -fno-stack-protector #DEBUGFLAGS=-DDEBUG diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc index 7eb3339aa4e..acba2b834f6 100644 --- a/sys/arch/i386/stand/Makefile.inc +++ b/sys/arch/i386/stand/Makefile.inc @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.37 2005/07/30 14:32:46 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.38 2005/12/30 02:03:49 millert Exp $ CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror CFLAGS+= -fno-stack-protector -CPPFLAGS+=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR} -Derrno=errno +CPPFLAGS+=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR} SACFLAGS=-D_STANDALONE DEBUGLIBS=no DEBUGFLAGS= diff --git a/sys/arch/macppc/stand/Makefile.inc b/sys/arch/macppc/stand/Makefile.inc index c86222a3d62..4dafdde6a21 100644 --- a/sys/arch/macppc/stand/Makefile.inc +++ b/sys/arch/macppc/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.6 2005/05/14 16:40:27 drahn Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2005/12/30 02:03:49 millert Exp $ # $NetBSD: Makefile.inc,v 1.1 1996/09/30 16:34:59 ws Exp $ .if !defined(__stand_makefile_inc) @@ -20,7 +20,7 @@ ENTRY?= _start INCLUDES+= -I. -I$(.OBJDIR) -I$(.CURDIR)/.. -I$(S)/arch -I$(S) INCLUDES+= -I$(S)/lib/libsa -DEFS+= -DSTANDALONE -Derrno=errno +DEFS+= -DSTANDALONE CFLAGS+= $(INCLUDES) $(DEFS) $(EXTRACFLAGS) CFLAGS+= -fno-stack-protector CFLAGS+= -fno-builtin-vprintf -fno-builtin-printf -fno-builtin-putchar diff --git a/sys/arch/mvme68k/stand/Makefile.inc b/sys/arch/mvme68k/stand/Makefile.inc index 928347116a9..74e40359210 100644 --- a/sys/arch/mvme68k/stand/Makefile.inc +++ b/sys/arch/mvme68k/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2004/07/13 21:03:38 marc Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2005/12/30 02:03:49 millert Exp $ MDEC_DIR?=/usr/mdec -CFLAGS+= -fno-stack-protector -Derrno=errno +CFLAGS+= -fno-stack-protector diff --git a/sys/arch/mvme88k/stand/Makefile.inc b/sys/arch/mvme88k/stand/Makefile.inc index 8626cbe8a08..93a7e80ed0a 100644 --- a/sys/arch/mvme88k/stand/Makefile.inc +++ b/sys/arch/mvme88k/stand/Makefile.inc @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile.inc,v 1.8 2004/07/13 21:03:38 marc Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2005/12/30 02:03:49 millert Exp $ MDEC_DIR?=/usr/mdec -CFLAGS+= -fno-stack-protector -mmemcpy -Derrno=errno +CFLAGS+= -fno-stack-protector -mmemcpy # Load addresses for first and second stage bootstraps STAGE1_RELOC=0x009F0000 diff --git a/sys/arch/mvmeppc/stand/Makefile.inc b/sys/arch/mvmeppc/stand/Makefile.inc index b805d2d7e22..ba2ac445e17 100644 --- a/sys/arch/mvmeppc/stand/Makefile.inc +++ b/sys/arch/mvmeppc/stand/Makefile.inc @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile.inc,v 1.4 2004/11/15 14:03:19 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2005/12/30 02:03:49 millert Exp $ MDEC_DIR?=/usr/mdec -CFLAGS+= -fno-stack-protector -Derrno=errno +CFLAGS+= -fno-stack-protector CFLAGS+= -fno-builtin-vprintf -fno-builtin-printf -fno-builtin-putchar # Load addresses for first and second stage bootstraps diff --git a/sys/arch/sgi/stand/Makefile.inc b/sys/arch/sgi/stand/Makefile.inc index 38eb7e03508..ea09808bab5 100644 --- a/sys/arch/sgi/stand/Makefile.inc +++ b/sys/arch/sgi/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.2 2004/09/16 18:54:48 pefo Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2005/12/30 02:03:49 millert Exp $ # $NetBSD: Makefile.inc,v 1.7 2000/08/20 14:57:16 mrg Exp $ .ifndef __INCLUDED_STAND_MAKEFILE_INC @@ -13,7 +13,6 @@ STANDALONE?= -D_STANDALONE .if ${MACHINE} == "sgi" CPPFLAGS+= ${STANDALONE} CPPFLAGS+= -I. -CPPFLAGS+= -Derrno=errno CFLAGS+= -fno-stack-protector CFLAGS+= -fno-builtin-vprintf -fno-builtin-printf -fno-builtin-putchar diff --git a/sys/arch/sparc/stand/Makefile.inc b/sys/arch/sparc/stand/Makefile.inc index da717ed50b9..fb22cad1653 100644 --- a/sys/arch/sparc/stand/Makefile.inc +++ b/sys/arch/sparc/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.12 2004/07/13 21:03:38 marc Exp $ +# $OpenBSD: Makefile.inc,v 1.13 2005/12/30 02:03:49 millert Exp $ # $NetBSD: Makefile.inc,v 1.5 1996/02/01 22:33:01 mycroft Exp $ BINDIR= /usr/mdec @@ -15,7 +15,6 @@ RELOC2!= perl -e 'printf "0x%x", ${RELOC_TEST} + 0x40000' CFLAGS+= -fno-stack-protector DEFS= -DSTANDALONE -DRELOC=${RELOC} -DSUN4 -DSUN4C -DSUN_BOOTPARAMS -DEFS+= -Derrno=errno ### Figure out what to use for libkern LIBKERNDIR= ${.CURDIR}/../libkern diff --git a/sys/arch/sparc/stand/libsa/Makefile b/sys/arch/sparc/stand/libsa/Makefile index cc9a3519bd3..88714bf37de 100644 --- a/sys/arch/sparc/stand/libsa/Makefile +++ b/sys/arch/sparc/stand/libsa/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2004/07/13 21:03:39 marc Exp $ +# $OpenBSD: Makefile,v 1.4 2005/12/30 02:03:49 millert Exp $ LIB= sa .PATH: ${.CURDIR}/../../../../lib/libsa -CFLAGS= -O2 -D__INTERNAL_LIBSA_CREAD -Derrno=errno \ +CFLAGS= -O2 -D__INTERNAL_LIBSA_CREAD \ -I${.CURDIR} -I${.CURDIR}/../include -I${.CURDIR}/../.. \ -I${.CURDIR}/../../.. -I${.CURDIR}/../../../.. \ -I${.CURDIR}/../../../../lib/libsa diff --git a/sys/arch/sparc64/stand/Makefile.inc b/sys/arch/sparc64/stand/Makefile.inc index 707faad4c54..f07da843800 100644 --- a/sys/arch/sparc64/stand/Makefile.inc +++ b/sys/arch/sparc64/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2004/07/13 21:03:38 marc Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2005/12/30 02:03:49 millert Exp $ # $NetBSD: Makefile.inc,v 1.7 2000/08/20 14:57:16 mrg Exp $ .ifndef __INCLUDED_STAND_MAKEFILE_INC @@ -14,7 +14,6 @@ STANDALONE?= -D_STANDALONE .if ${MACHINE} == "sparc64" CPPFLAGS+= ${STANDALONE} -DSUN4U CPPFLAGS+= -I. -CPPFLAGS+= -Derrno=errno CFLAGS+= -fno-stack-protector CFLAGS+= -msoft-float |