Compile kernel and bootblocks with -mmemcpy, to get rid of libgcc dependancy.

Also, honor default compilation options in stand/ whenever possible.

This requires an up-to-date compiler, but it's not exactly like many people
are going to be affected by this change...

9 files changed, 25 insertions, 25 deletions

diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index e643a60a9b5..0d18414abd7 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme88k,v 1.28 2003/08/30 21:15:59 miod Exp $
+#	$OpenBSD: Makefile.mvme88k,v 1.29 2003/10/01 20:39:38 miod Exp $
 #
 # Makefile for OpenBSD
 #
@@ -37,11 +37,11 @@ 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=	-mno-check-zero-division
+CMACHFLAGS=	-mno-check-zero-division -mmemcpy
 .if ${IDENT:M-DNO_PROPOLICE}
 CMACHFLAGS+=	-fno-stack-protector
 .endif
-COPTS?=		-O
+COPTS?=		-O1
 CFLAGS=		${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE ${CMACHFLAGS}
 LINKFLAGS=	-Ttext 0x10000 -e start
@@ -113,8 +113,7 @@ SYSTEM_OBJ=	locore.o \
 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 \
-		`${CC} -print-libgcc-file-name`
+		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
 SYSTEM_LD_TAIL=	@${SIZE} $@; chmod 755 $@;
 
 DEBUG?=
diff --git a/sys/arch/mvme88k/stand/Makefile.inc b/sys/arch/mvme88k/stand/Makefile.inc
index 8955102edea..1dc813fddaa 100644
--- a/sys/arch/mvme88k/stand/Makefile.inc
+++ b/sys/arch/mvme88k/stand/Makefile.inc
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.5 2002/12/02 09:00:25 miod Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2003/10/01 20:39:40 miod Exp $
 
 MDEC_DIR?=/usr/mdec
-CFLAGS+=	-fno-stack-protector
+CFLAGS+=	-fno-stack-protector -mmemcpy
 
 # Load addresses for first and second stage bootstraps 
 STAGE1_RELOC=0x009F0000
diff --git a/sys/arch/mvme88k/stand/bootsd/Makefile b/sys/arch/mvme88k/stand/bootsd/Makefile
index b28de920560..798e6fb424b 100644
--- a/sys/arch/mvme88k/stand/bootsd/Makefile
+++ b/sys/arch/mvme88k/stand/bootsd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.9 2003/08/20 19:36:57 miod Exp $
+#	$OpenBSD: Makefile,v 1.10 2003/10/01 20:39:41 miod Exp $
 
       
 S=	${.CURDIR}/../../../..
@@ -28,7 +28,7 @@ all: ${ALL}
 
 bootsd: ${OBJS} ${STAGE2} ${LIBS}
 	${LD} ${LDFLAGS} -o $@ \
-		${STAGE2} ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
+		${STAGE2} ${OBJS} ${LIBS}
 
 install:
 	install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
diff --git a/sys/arch/mvme88k/stand/bootst/Makefile b/sys/arch/mvme88k/stand/bootst/Makefile
index 638a1073743..6fc4d43b668 100644
--- a/sys/arch/mvme88k/stand/bootst/Makefile
+++ b/sys/arch/mvme88k/stand/bootst/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.9 2003/08/20 19:36:59 miod Exp $
+#	$OpenBSD: Makefile,v 1.10 2003/10/01 20:39:41 miod Exp $
 
 SIZE?=	size
 
@@ -30,7 +30,7 @@ all: ${ALL}
 
 bootst.bug:	${OBJS} ${SINGLE} ${LIBS}
 	${LD} ${LDFLAGS} ${SINGLE} -o $@ \
-	    ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
+	    ${OBJS} ${LIBS}
 	@${SIZE} bootst.bug
 
 bootst stboot: bootst.bug ${WRTVID}
diff --git a/sys/arch/mvme88k/stand/bootxx/Makefile b/sys/arch/mvme88k/stand/bootxx/Makefile
index 0393d9a7e00..a3a2b369bbb 100644
--- a/sys/arch/mvme88k/stand/bootxx/Makefile
+++ b/sys/arch/mvme88k/stand/bootxx/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.8 2003/08/20 19:36:59 miod Exp $
+#	$OpenBSD: Makefile,v 1.9 2003/10/01 20:39:41 miod Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS=-DSTAGE2_RELOC=${STAGE2_RELOC} 
@@ -26,7 +26,7 @@ all: ${ALL}
 
 bootxx: ${OBJS} ${STAGE1} ${LIBS}
 	${LD} -N -T ${STAGE1_RELOC} ${STAGE1} -o $@ \
-	    ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
+	    ${OBJS} ${LIBS}
 
 install:
 	install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
diff --git a/sys/arch/mvme88k/stand/bugcrt/Makefile b/sys/arch/mvme88k/stand/bugcrt/Makefile
index 013119fabea..9f436f909f7 100644
--- a/sys/arch/mvme88k/stand/bugcrt/Makefile
+++ b/sys/arch/mvme88k/stand/bugcrt/Makefile
@@ -1,18 +1,20 @@
-#	$OpenBSD: Makefile,v 1.8 2001/02/01 03:38:22 smurph Exp $
+#	$OpenBSD: Makefile,v 1.9 2003/10/01 20:39:41 miod Exp $
 #
-# DO NOT OPTMIZE bugcrt (i.e. no "-O2")
+# DO NOT OPTIMIZE bugcrt (i.e. no "-O2")
+# ...until it is fixed (-:
 #
 S=${.CURDIR}/../../../..
 
+#CFLAGS+=-I${.CURDIR}/../../include -I${.CURDIR}/../libbug -I${S}/lib/libsa
 CFLAGS=-I${.CURDIR}/../../include -I${.CURDIR}/../libbug -I${S}/lib/libsa \
-	-fomit-frame-pointer -save-temps
+    -fomit-frame-pointer
 STAGE1_CFLAGS=-DSTACK_ASM_OP="\".long ${STAGE1_RELOC}\"" -DSTAGE1
 STAGE2_CFLAGS=-DSTACK_ASM_OP="\".long ${STAGE2_RELOC}\""
 SINGLE_CFLAGS=-DSTACK_ASM_OP="\".long ${STAGE2_RELOC}\"" -DSTAGE1
 SRCS=crt.c
 OBJS=stage1crt.o stage2crt.o singlecrt.o
 
-CLEANFILES+=a.out ${OBJS} *.i *.s
+CLEANFILES+=a.out ${OBJS}
 
 all:	${OBJS}
 
diff --git a/sys/arch/mvme88k/stand/libbug/Makefile b/sys/arch/mvme88k/stand/libbug/Makefile
index b136c867bcd..a8860aecd6c 100644
--- a/sys/arch/mvme88k/stand/libbug/Makefile
+++ b/sys/arch/mvme88k/stand/libbug/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1999/09/27 19:30:00 smurph Exp $
+#	$OpenBSD: Makefile,v 1.6 2003/10/01 20:39:41 miod Exp $
 
 LIB=bug
 
@@ -8,7 +8,7 @@ NOPROFILE=
 S=${.CURDIR}/../../../..
 DIR_SA=$S/lib/libsa
 
-CFLAGS+=-O2 -I${.CURDIR}/../../include -I${DIR_SA}
+CFLAGS+=-I${.CURDIR}/../../include -I${DIR_SA}
 
 SRCS=	delay.c diskrd.c diskwr.c getbrdid.c inchr.c instat.c outln.c \
 	outstr.c putchar.c return.c rtc_rd.c
diff --git a/sys/arch/mvme88k/stand/libsa/Makefile b/sys/arch/mvme88k/stand/libsa/Makefile
index 70855eb49c4..51976db41c9 100644
--- a/sys/arch/mvme88k/stand/libsa/Makefile
+++ b/sys/arch/mvme88k/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2003/06/02 09:33:38 miod Exp $
+#	$OpenBSD: Makefile,v 1.5 2003/10/01 20:39:41 miod Exp $
 
 LIB=sa
 
@@ -37,8 +37,7 @@ SRCS= ${SRC_net} ${SRC_sa} ${SRC_mvme} ${SRC_here} ${SRC_kern}
 DEFS= -D__INTERNAL_LIBSA_CREAD 
 #-DNETIF_DEBUG
 INCL= -I${.CURDIR} -I${.CURDIR}/../libbug -I${S}/lib/libsa -I${S}
-COPTS= #-fno-defer-pop
-CFLAGS+= ${XCFLAGS} ${COPTS} ${DEFS} ${DBG} ${INCL} -O2
+CFLAGS+= ${XCFLAGS} ${COPTS} ${DEFS} ${DBG} ${INCL}
 
 .PATH:  ${DIR_SA} ${DIR_KERN} 
 
diff --git a/sys/arch/mvme88k/stand/netboot/Makefile b/sys/arch/mvme88k/stand/netboot/Makefile
index 4a524c5e5e4..e8d7481c6ef 100644
--- a/sys/arch/mvme88k/stand/netboot/Makefile
+++ b/sys/arch/mvme88k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2003/08/01 07:42:33 miod Exp $
+#	$OpenBSD: Makefile,v 1.11 2003/10/01 20:39:41 miod Exp $
 
 SIZE?=	size
 STRIP?= strip
@@ -8,7 +8,7 @@ DEFS= -DSUN_BOOTPARAMS
 #-DNETIF_DEBUG
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${S} -I${S}/lib/libsa
-CFLAGS=-O2 ${DEFS} ${INCPATH} ${COPTS}
+CFLAGS+=${DEFS} ${INCPATH} ${COPTS}
 CLEANFILES+=netboot netboot.bin
 
 .include "${S}/arch/mvme88k/stand/bugcrt/Makefile.inc"
@@ -28,7 +28,7 @@ all:	netboot.bin
 
 netboot: ${OBJS} ${SINGLE} ${LIBS}
 	${LD} ${LDFLAGS} -o $@ \
-		${SINGLE} ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
+		${SINGLE} ${OBJS} ${LIBS}
 #	@${SIZE} $@
 
 netboot.bin: netboot