- shift some variables

- fix a problem caused by the fact that in gcc3, gcc -Ufoo -Dfoo in this
order causes "foo" to be defined (different in gcc2)
make logic from espie; tested on gcc2 by brad

2 files changed, 7 insertions, 4 deletions

diff --git a/sys/arch/sparc64/stand/Makefile.inc b/sys/arch/sparc64/stand/Makefile.inc
index ecb8d086a2d..e31772ea8c8 100644
--- a/sys/arch/sparc64/stand/Makefile.inc
+++ b/sys/arch/sparc64/stand/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.3 2002/12/02 09:00:25 miod Exp $
+#	$OpenBSD: Makefile.inc,v 1.4 2004/01/10 09:35:42 pvalchev Exp $
 #	$NetBSD: Makefile.inc,v 1.7 2000/08/20 14:57:16 mrg Exp $
 
 .ifndef __INCLUDED_STAND_MAKEFILE_INC
@@ -9,12 +9,15 @@ AFLAGS+= -Wa,-Av9a
 
 BINDIR=		/usr/mdec
 
+STANDALONE?=	-D_STANDALONE
+
 .if ${MACHINE} == "sparc64"
-CPPFLAGS+=	-D_STANDALONE -DSUN4U
+CPPFLAGS+=	${STANDALONE} -DSUN4U
 CPPFLAGS+=	-I.
 
 CFLAGS+=	-fno-stack-protector
 CFLAGS+=	-msoft-float
+CFLAGS+=	-fno-builtin-vprintf -fno-builtin-printf -fno-builtin-putchar
 .endif
 
 
diff --git a/sys/arch/sparc64/stand/installboot/Makefile b/sys/arch/sparc64/stand/installboot/Makefile
index 328f76a9404..5d7f15e52c1 100644
--- a/sys/arch/sparc64/stand/installboot/Makefile
+++ b/sys/arch/sparc64/stand/installboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2003/07/19 00:03:52 david Exp $
+#	$OpenBSD: Makefile,v 1.6 2004/01/10 09:35:42 pvalchev Exp $
 #	$NetBSD: Makefile,v 1.13 2000/08/16 08:24:01 mrg Exp $
 
 .include <bsd.own.mk>
@@ -29,6 +29,6 @@ LDSTATIC?=	-static
 CLEANFILES+= machine sparc
 .endif
 
-CFLAGS+= -U_STANDALONE
+STANDALONE=
 
 .include <bsd.prog.mk>