diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2002-07-31 18:36:13 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2002-07-31 18:36:13 +0000 |
| commit | 63c360582a1b3bb16450f6da974f9a7e768bd67a (patch) | |
| tree | f28d60a3b215c26cd68793c8715167477adf8fb3 /sys/arch | |
| parent | 35d44fa019edc1e38b4d1ee1ccaa990327664521 (diff) | |
Temporarily comment ELF support in the bootblocks, until this port is
really ELF; necessary for this to compile after the recent <sys/exec_elf.h>
changes. ok deraadt@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/vax/boot/xxboot/bootxx.c | 8 | ||||
| -rw-r--r-- | sys/arch/vax/stand/xxboot/bootxx.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/sys/arch/vax/boot/xxboot/bootxx.c b/sys/arch/vax/boot/xxboot/bootxx.c index 9ad7d725e1d..7cfc9906548 100644 --- a/sys/arch/vax/boot/xxboot/bootxx.c +++ b/sys/arch/vax/boot/xxboot/bootxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootxx.c,v 1.6 2002/06/11 13:10:03 hugh Exp $ */ +/* $OpenBSD: bootxx.c,v 1.7 2002/07/31 18:36:12 miod Exp $ */ /* $NetBSD: bootxx.c,v 1.16 2002/03/29 05:45:08 matt Exp $ */ /*- @@ -40,7 +40,9 @@ #include "sys/reboot.h" #include "sys/disklabel.h" #include "sys/exec.h" +#ifdef notyet #include "sys/exec_elf.h" +#endif #include "lib/libsa/stand.h" #include "lib/libsa/ufs.h" @@ -99,7 +101,9 @@ Xmain() { union { struct exec aout; +#ifdef notyet Elf32_Ehdr elf; +#endif } hdr; int io; u_long entry; @@ -149,6 +153,7 @@ Xmain() read(io, (void *) entry, hdr.aout.a_text + hdr.aout.a_data); memset((void *) (entry + hdr.aout.a_text + hdr.aout.a_data), 0, hdr.aout.a_bss); +#ifdef notyet } else if (memcmp(hdr.elf.e_ident, ELFMAG, SELFMAG) == 0) { Elf32_Phdr ph; size_t off = sizeof(hdr.elf); @@ -176,6 +181,7 @@ Xmain() read(io, (void *) ph.p_paddr, ph.p_filesz); memset((void *) (ph.p_paddr + ph.p_filesz), 0, ph.p_memsz - ph.p_filesz); +#endif } else { goto die; } diff --git a/sys/arch/vax/stand/xxboot/bootxx.c b/sys/arch/vax/stand/xxboot/bootxx.c index 9ad7d725e1d..7cfc9906548 100644 --- a/sys/arch/vax/stand/xxboot/bootxx.c +++ b/sys/arch/vax/stand/xxboot/bootxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootxx.c,v 1.6 2002/06/11 13:10:03 hugh Exp $ */ +/* $OpenBSD: bootxx.c,v 1.7 2002/07/31 18:36:12 miod Exp $ */ /* $NetBSD: bootxx.c,v 1.16 2002/03/29 05:45:08 matt Exp $ */ /*- @@ -40,7 +40,9 @@ #include "sys/reboot.h" #include "sys/disklabel.h" #include "sys/exec.h" +#ifdef notyet #include "sys/exec_elf.h" +#endif #include "lib/libsa/stand.h" #include "lib/libsa/ufs.h" @@ -99,7 +101,9 @@ Xmain() { union { struct exec aout; +#ifdef notyet Elf32_Ehdr elf; +#endif } hdr; int io; u_long entry; @@ -149,6 +153,7 @@ Xmain() read(io, (void *) entry, hdr.aout.a_text + hdr.aout.a_data); memset((void *) (entry + hdr.aout.a_text + hdr.aout.a_data), 0, hdr.aout.a_bss); +#ifdef notyet } else if (memcmp(hdr.elf.e_ident, ELFMAG, SELFMAG) == 0) { Elf32_Phdr ph; size_t off = sizeof(hdr.elf); @@ -176,6 +181,7 @@ Xmain() read(io, (void *) ph.p_paddr, ph.p_filesz); memset((void *) (ph.p_paddr + ph.p_filesz), 0, ph.p_memsz - ph.p_filesz); +#endif } else { goto die; } |