[src/trunk]: src/sys/arch/sparc Don't declare which exec formats to support i...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aa43006984a9
branches:  trunk
changeset: 518713:aa43006984a9
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Dec 04 18:54:34 2001 +0000

description:
Don't declare which exec formats to support in loadfile_machdep.h.
Instead, give each user of loadfile() control over which exec formats
it wants to support.

diffstat:

 sys/arch/sparc/include/loadfile_machdep.h |   9 +--------
 sys/arch/sparc/stand/boot/Makefile        |   4 +++-
 sys/arch/sparc/stand/installboot/Makefile |  12 +++---------
 sys/arch/sparc/stand/ofwboot/Makefile     |   3 ++-
 4 files changed, 9 insertions(+), 19 deletions(-)

diffs (83 lines):

diff -r a91cbd398486 -r aa43006984a9 sys/arch/sparc/include/loadfile_machdep.h
--- a/sys/arch/sparc/include/loadfile_machdep.h Tue Dec 04 18:54:11 2001 +0000
+++ b/sys/arch/sparc/include/loadfile_machdep.h Tue Dec 04 18:54:34 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.4 2001/10/31 17:20:49 thorpej Exp $      */
+/*     $NetBSD: loadfile_machdep.h,v 1.5 2001/12/04 18:54:34 thorpej Exp $      */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,13 +36,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define BOOT_AOUT
-#ifdef __sparc_v9__
-#define        BOOT_ELF64
-#else
-#define        BOOT_ELF32
-#endif
-
 #define LOAD_KERNEL    LOAD_ALL
 #define COUNT_KERNEL   COUNT_ALL
 
diff -r a91cbd398486 -r aa43006984a9 sys/arch/sparc/stand/boot/Makefile
--- a/sys/arch/sparc/stand/boot/Makefile        Tue Dec 04 18:54:11 2001 +0000
+++ b/sys/arch/sparc/stand/boot/Makefile        Tue Dec 04 18:54:34 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.26 2001/09/22 03:34:20 tv Exp $
+#      $NetBSD: Makefile,v 1.27 2001/12/04 18:54:34 thorpej Exp $
 
 STRIPFLAG=
 PROGSOURCE=    boot.c net.c netif_sun.c conf.c openfirm.c bootinfo.c \
@@ -8,6 +8,8 @@
 CLEANFILES:=   vers.c ${FILES}
 LINKS=         ${BINDIR}/boot.${RELOC_DEFAULT} ${BINDIR}/boot
 
+CPPFLAGS+=     -DBOOT_AOUT -DBOOT_ELF32
+
 INCLUDE_LIBZ=  yes
 SAMISCMAKEFLAGS= SA_USE_CREAD=yes
 
diff -r a91cbd398486 -r aa43006984a9 sys/arch/sparc/stand/installboot/Makefile
--- a/sys/arch/sparc/stand/installboot/Makefile Tue Dec 04 18:54:11 2001 +0000
+++ b/sys/arch/sparc/stand/installboot/Makefile Tue Dec 04 18:54:34 2001 +0000
@@ -1,18 +1,12 @@
-#      $NetBSD: Makefile,v 1.20 2001/12/04 11:31:10 jmc Exp $
+#      $NetBSD: Makefile,v 1.21 2001/12/04 18:54:34 thorpej Exp $
 
 .include <bsd.own.mk>
 
 WARNS?=1
 PROG=  installboot
-SRCS=  installboot.c byteorder.c loadfile.c loadfile_aout.c 
+SRCS=  installboot.c byteorder.c loadfile.c loadfile_aout.c loadfile_elf32.c
 
-.if ${MACHINE_ARCH} == "sparc"
-SRCS+= loadfile_elf32.c
-.endif
-
-.if ${MACHINE_ARCH} == "sparc64"
-SRCS+= loadfile_elf64.c
-.endif
+CPPFLAGS+=-DBOOT_AOUT -DBOOT_ELF32
 
 MKMAN= no
 CFLAGS+=-g
diff -r a91cbd398486 -r aa43006984a9 sys/arch/sparc/stand/ofwboot/Makefile
--- a/sys/arch/sparc/stand/ofwboot/Makefile     Tue Dec 04 18:54:11 2001 +0000
+++ b/sys/arch/sparc/stand/ofwboot/Makefile     Tue Dec 04 18:54:34 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2001/09/22 03:34:20 tv Exp $
+#      $NetBSD: Makefile,v 1.4 2001/12/04 18:54:35 thorpej Exp $
 
 CURDIR=        ${.CURDIR}
 S=     ${CURDIR}/../../../..
@@ -16,6 +16,7 @@
 CWARNFLAGS+=   -Wno-main
 CFLAGS+=       ${COPTS} ${CEXTRAFLAGS}
 CPPFLAGS+=     -D_STANDALONE -DSUN4U
+CPPFLAGS+=     -DBOOT_ELF32 -DBOOT_ELF64
 #CPPFLAGS+=    -DNETIF_DEBUG 
 
 MKMAN=         no