1 files changed, 7 insertions, 23 deletions
diff --git a/sys/arch/sparc64/stand/ofwboot/Makefile b/sys/arch/sparc64/stand/ofwboot/Makefile
index 28b26250e8d..28600b3765b 100644
--- a/sys/arch/sparc64/stand/ofwboot/Makefile
+++ b/sys/arch/sparc64/stand/ofwboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2001/09/06 19:12:34 jason Exp $
+#	$OpenBSD: Makefile,v 1.7 2003/06/10 02:42:58 brad Exp $
 #	$NetBSD: Makefile,v 1.2 2001/03/04 14:50:05 mrg Exp $
 
 CURDIR=	${.CURDIR}
@@ -16,19 +16,18 @@ SRCS=		srt0.s Locore.c boot.c ofdev.c alloc.c net.c netif_of.c vers.c
 .PATH:		${S}/arch/sparc64/sparc64
 
 CWARNFLAGS+=	-Wno-main
-CFLAGS+=	${COPTS} ${CEXTRAFLAGS}
+AFLAGS+=	-Wa,-Av9a
+AFLAGS+=	-x assembler-with-cpp -traditional-cpp -D_LOCORE -D__ELF__
+CFLAGS+=	${COPTS}
 CPPFLAGS+=	-D_STANDALONE -DSUN4U -nostdinc
 #CPPFLAGS+=	-DNETIF_DEBUG 
 
-MKMAN=		no
-STRIPFLAG=
 BINMODE=	444
-OBJCOPY?=	objcopy
 
 NEWVERSWHAT=	"OpenFirmware Boot"
 
 #
-# Elf64 defaults to 1MB
+# ELF64 defaults to 1MB
 #
 # We may get address conflicts with other bootloaders, say
 # Sun's ufsboot, so we'll pick a reasonably empty address.
@@ -45,7 +44,6 @@ CPPFLAGS+=	-DRELOC=0x${RELOC}
 #
 # XXXXX FIXME
 #
-CPPFLAGS+=	-DSPARC_BOOT_AOUT
 CPPFLAGS+=	-DSPARC_BOOT_ELF
 CPPFLAGS+=	-DSPARC_BOOT_UFS
 CPPFLAGS+=	-DSPARC_BOOT_NFS
@@ -64,25 +62,11 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 	    ${OBJS} -L${LIBSADIR} ${LIBSA} -L${LIBKERNDIR} ${LIBKERN} \
 	    -L${LIBZDIR} ${LIBZ}
 
-.include <bsd.prog.mk>
-
-.if ${MACHINE_ARCH} == "sparc64"
-AFLAGS+=		-Wa,-Av9a
-CEXTRAFLAGS?=		-D_LP64
-.else
-AFLAGS+=		-Wa,-Av8plusa
-.endif
-
-.if CROSS
-AFLAGS+=		-x assembler-with-cpp -traditional-cpp -D_LOCORE -D__ELF__
-CEXTRAFLAGS?=		-D_LP64
-.else
-AFLAGS+=		-x assembler-with-cpp -traditional-cpp -D_LOCORE -D__ELF__ ${CEXTRAFLAGS}
-.endif
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
 srt0.o: srt0.s
 	${NORMAL_S}
 
 # Explicit dependency for this.
 boot.o: boot.c elfXX_exec.c
+
+.include <bsd.prog.mk>