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.
This commit is contained in:
parent
0614c8a6ad
commit
2684ea2b22
@ -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
|
||||
|
||||
|
@ -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 @@ FILES= boot.net ${RELOCS:S/^/boot./g}
|
||||
CLEANFILES:= vers.c ${FILES}
|
||||
LINKS= ${BINDIR}/boot.${RELOC_DEFAULT} ${BINDIR}/boot
|
||||
|
||||
CPPFLAGS+= -DBOOT_AOUT -DBOOT_ELF32
|
||||
|
||||
INCLUDE_LIBZ= yes
|
||||
SAMISCMAKEFLAGS= SA_USE_CREAD=yes
|
||||
|
||||
|
@ -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
|
||||
|
@ -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 @@ SRCS= srt0.s Locore.c boot.c ofdev.c alloc.c net.c netif_of.c vers.c
|
||||
CWARNFLAGS+= -Wno-main
|
||||
CFLAGS+= ${COPTS} ${CEXTRAFLAGS}
|
||||
CPPFLAGS+= -D_STANDALONE -DSUN4U
|
||||
CPPFLAGS+= -DBOOT_ELF32 -DBOOT_ELF64
|
||||
#CPPFLAGS+= -DNETIF_DEBUG
|
||||
|
||||
MKMAN= no
|
||||
|
Loading…
Reference in New Issue
Block a user