summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/conf/Makefile.alpha8
-rw-r--r--sys/arch/amiga/conf/Makefile.amiga10
-rw-r--r--sys/arch/hp300/conf/Makefile.hp30011
-rw-r--r--sys/arch/i386/conf/Makefile.i38613
-rw-r--r--sys/arch/mac68k/conf/Makefile.mac68k12
-rw-r--r--sys/arch/macppc/conf/Makefile.macppc8
-rw-r--r--sys/arch/mvme68k/conf/Makefile.mvme68k8
-rw-r--r--sys/arch/mvme88k/conf/Makefile.mvme88k4
-rw-r--r--sys/arch/sparc/conf/Makefile.sparc6
-rw-r--r--sys/arch/sparc64/conf/Makefile.sparc644
-rw-r--r--sys/arch/sun3/conf/Makefile.sun34
11 files changed, 45 insertions, 43 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index 0ce37716945..18e4514d843 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.alpha,v 1.22 2001/09/14 14:50:33 art Exp $
+# $OpenBSD: Makefile.alpha,v 1.23 2001/12/24 23:12:12 miod Exp $
# $NetBSD: Makefile.alpha,v 1.27 1996/12/01 06:12:25 jonathan Exp $
# Makefile for OpenBSD
@@ -18,12 +18,13 @@
.include <bsd.own.mk>
+AS?= as
CC?= cc
+CPP?= cpp
LD?= ld
MKDEP?= mkdep
-STRIP?= strip
-COPTS?= -O2
SIZE?= size
+STRIP?= strip
# source tree is located via $S relative to the compilation directory
.ifndef S
@@ -38,6 +39,7 @@ CDIAGFLAGS?= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main
CMACHFLAGS= -mno-fp-regs
+COPTS?= -O2
CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS}
AFLAGS= -traditional -D_LOCORE
LINKFLAGS= -N -Ttext fffffc0000230000 -e __start -G 4
diff --git a/sys/arch/amiga/conf/Makefile.amiga b/sys/arch/amiga/conf/Makefile.amiga
index 4a42ff8993f..00c276ae59a 100644
--- a/sys/arch/amiga/conf/Makefile.amiga
+++ b/sys/arch/amiga/conf/Makefile.amiga
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.amiga,v 1.29 2001/12/14 08:51:17 miod Exp $
+# $OpenBSD: Makefile.amiga,v 1.30 2001/12/24 23:12:14 miod Exp $
# $NetBSD: Makefile.amiga,v 1.60 1997/07/23 10:19:42 is Exp $
# Makefile for OpenBSD
@@ -24,12 +24,13 @@
.include <bsd.own.mk>
+AS?= as
CC?= cc
+CPP?= cpp
LD?= ld
MKDEP?= mkdep
+SIZE?= size
STRIP?= strip
-TOUCH?= touch -f -c
-COPTS?= -O2
# source tree is located via $S relative to the compilation directory
.ifndef S
@@ -51,6 +52,7 @@ CMACHFLAGS= -m68060 -Wa,-m68030
.endif
CMACHFLAGS+= -msoft-float
+COPTS?= -O2
CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS}
AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE
LINKFLAGS= -n -Ttext 0 -e start
@@ -112,7 +114,7 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL= @size $@; chmod 755 $@
+SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index cc79484bbed..21e6a1efcc5 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hp300,v 1.25 2001/12/14 08:51:19 miod Exp $
+# $OpenBSD: Makefile.hp300,v 1.26 2001/12/24 23:12:14 miod Exp $
# $NetBSD: Makefile.hp300,v 1.54 1997/04/01 23:16:41 scottr Exp $
# Makefile for OpenBSD
@@ -24,12 +24,13 @@
.include <bsd.own.mk>
+AS?= as
CC?= cc
+CPP?= cpp
LD?= ld
MKDEP?= mkdep
+SIZE?= size
STRIP?= strip
-TOUCH?= touch -f -c
-COPTS?= -O2
# source tree is located via $S relative to the compilation directory
.ifndef S
@@ -44,7 +45,7 @@ CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main
CMACHFLAGS= -msoft-float
-
+COPTS?= -O2
CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS}
AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE
LINKFLAGS= -n -Ttext 0 -e start
@@ -134,7 +135,7 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL= @size $@; chmod 755 $@
+SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index faeab7e18f0..216f24275ee 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.i386,v 1.27 2001/07/15 13:10:48 assar Exp $
+# $OpenBSD: Makefile.i386,v 1.28 2001/12/24 23:12:14 miod Exp $
# $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $
# Makefile for OpenBSD
@@ -26,11 +26,11 @@
AS?= as
CC?= cc
-MKDEP?= mkdep
CPP?= cpp
LD?= ld
+MKDEP?= mkdep
+SIZE?= size
STRIP?= strip
-TOUCH?= touch
# source tree is located via $S relative to the compilation directory
.ifndef S
@@ -40,7 +40,6 @@ I386= $S/arch/i386
INCLUDES= -nostdinc -I. -I$S/arch -I$S
CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -Di386
-
CDIAGFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main
@@ -50,11 +49,11 @@ CMACHFLAGS= -march=i486
CMACHFLAGS=
.endif
-CFLAGS= ${DEBUG} -O2 ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS}
+COPTS?= -O2
+CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS}
AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE
LINKFLAGS= -z -Ttext E0100000 -e start
STRIPFLAGS= -d
-TOUCHFLAGS= -f -c
HOSTCC= ${CC}
HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
@@ -109,7 +108,7 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= rm -f $@
SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL= @size $@; chmod 755 $@
+SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index f4a213d22e5..f7e404d7e57 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mac68k,v 1.23 2001/12/14 08:51:21 miod Exp $
+# $OpenBSD: Makefile.mac68k,v 1.24 2001/12/24 23:12:14 miod Exp $
# $NetBSD: Makefile.mac68k,v 1.53 1997/04/15 06:11:38 scottr Exp $
# Makefile for OpenBSD
@@ -24,12 +24,12 @@
.include <bsd.own.mk>
+AS?= as
CC?= cc
+CPP?= cpp
LD?= ld
MKDEP?= mkdep
-STRIP?= strip -d
-TOUCH?= touch -f -c
-COPTS?= -O2
+STRIP?= strip
# source tree is located via $S relative to the compilation directory
.ifndef S
@@ -44,7 +44,7 @@ CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main
CMACHFLAGS= -msoft-float
-
+COPTS?= -O2
CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS}
AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE
LINKFLAGS= -n -Ttext 0 -e start
@@ -106,7 +106,7 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL= @size $@; chmod 755 $@
+SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 002ff9ffd4e..200e3419b8a 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.macppc,v 1.2 2001/11/13 14:31:52 drahn Exp $
+# $OpenBSD: Makefile.macppc,v 1.3 2001/12/24 23:12:14 miod Exp $
#
# Makefile for OpenBSD PowerPC
#
@@ -44,8 +44,10 @@ CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL \
-Dmacppc
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main
-CFLAGS= ${DEBUG} ${CWARNFLAGS} -O2 -msoft-float
-#CFLAGS= ${DEBUG} ${CWARNFLAGS} -O2 -msoft-float -Wa,-maltivec
+CMACHFLAGS= -msoft-float
+#CMACHFLAGS= -msoft-float -Wa,-maltivec
+COPTS?= -O2
+CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS}
AFLAGS= -D_LOCORE
LINKFLAGS= -N -Ttext 100074 -e start
STRIPFLAGS= -d
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index 0656fe0fed1..0a27e6f6865 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mvme68k,v 1.13 2001/12/14 08:51:21 miod Exp $
+# $OpenBSD: Makefile.mvme68k,v 1.14 2001/12/24 23:12:14 miod Exp $
# This makefile is constructed from a machine description:
# config machineid
@@ -25,8 +25,9 @@ AS?= as
CC?= cc
CPP?= cpp
LD?= ld
+MKDEP?= mkdep
+SIZE?= size
STRIP?= strip
-COPTS?= -O2
# source tree is located via $S relative to the compilation directory
.ifndef S
@@ -47,6 +48,7 @@ CMACHFLAGS= -m68060 -Wa,-m68030
.endif
CMACHFLAGS+= -msoft-float
+COPTS?= -O2
CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS}
AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE
LINKFLAGS= -Ttext 0x10000 -z -e start
@@ -103,7 +105,7 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL= @size $@; chmod 755 $@
+SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index f806977a357..484c046b90b 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mvme88k,v 1.17 2001/12/22 18:22:38 smurph Exp $
+# $OpenBSD: Makefile.mvme88k,v 1.18 2001/12/24 23:12:14 miod Exp $
#
# Makefile for OpenBSD
#
@@ -30,7 +30,6 @@ LD?= ld
MKDEP?= mkdep
SIZE?= size
STRIP?= strip
-TOUCH?= touch
# source tree is located via $S relative to the compilation directory
.ifndef S
@@ -48,7 +47,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS}
AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE ${CMACHFLAGS}
LINKFLAGS= -Ttext 0x10000 -e start
STRIPFLAGS= -d
-TOUCHFLAGS= -f -c
HOSTCC?= ${CC}
HOSTED_CPPFLAGS?=${CPPFLAGS:S/^-nostdinc$//}
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index dc07739933c..5e9545e3759 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sparc,v 1.19 2001/07/15 13:10:50 assar Exp $
+# $OpenBSD: Makefile.sparc,v 1.20 2001/12/24 23:12:14 miod Exp $
# $NetBSD: Makefile.sparc,v 1.32.4.1 1996/06/12 20:26:32 pk Exp $
# Makefile for OpenBSD
@@ -30,7 +30,6 @@ CPP?= cpp
LD?= ld
MKDEP?= mkdep
STRIP?= strip
-TOUCH?= touch
# source tree is located via $S relative to the compilation directory
.ifndef S
@@ -56,7 +55,6 @@ CFLAGS+= -mno-fpu
AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE
LINKFLAGS= -N -p -Ttext F8004000 -e start
STRIPFLAGS= -d
-TOUCHFLAGS= -f -c
HOSTCC= ${CC}
HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
@@ -111,7 +109,7 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL= @size $@; chmod 755 $@
+SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 3cbe379aa1c..2f2e1f0381a 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -8,7 +8,6 @@ CPP?= cpp
LD?= ld
MKDEP?= mkdep
STRIP?= strip
-TOUCH?= touch
# source tree is located via $S relative to the compilation directory
.ifndef S
@@ -28,7 +27,6 @@ CFLAGS= ${DEBUG} -O2 ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS}
AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE -Wa,-Av9a
LINKFLAGS= -n -Ttext 01000000 -Tdata 01800000 -e start
STRIPFLAGS= -d
-TOUCHFLAGS= -f -c
HOSTCC= ${CC}
HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
@@ -83,7 +81,7 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL= @size $@; chmod 755 $@
+SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
diff --git a/sys/arch/sun3/conf/Makefile.sun3 b/sys/arch/sun3/conf/Makefile.sun3
index d0ce9da6e0f..3125891b152 100644
--- a/sys/arch/sun3/conf/Makefile.sun3
+++ b/sys/arch/sun3/conf/Makefile.sun3
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sun3,v 1.28 2001/12/14 08:51:21 miod Exp $
+# $OpenBSD: Makefile.sun3,v 1.29 2001/12/24 23:12:14 miod Exp $
# $NetBSD: Makefile.sun3,v 1.51 1996/09/09 21:07:08 mycroft Exp $
# Makefile for OpenBSD
@@ -93,7 +93,7 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL= @size $@; chmod 755 $@
+SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"