diff options
| author | Tom Cosgrove <tom@cvs.openbsd.org> | 2007-05-31 21:43:59 +0000 |
|---|---|---|
| committer | Tom Cosgrove <tom@cvs.openbsd.org> | 2007-05-31 21:43:59 +0000 |
| commit | e62c8e7851109d752171533c4b7db663449c5d10 (patch) | |
| tree | 176105c74fcba8ae11e4b29f558c1c1d9810b7a7 /sys/arch/i386 | |
| parent | 77d4358d9f1db6ccfdba590e81aec0384d81db82 (diff) | |
Forgot to commit the changes to this file with the rest of the ELF32+64
pieces. Since this is where the "boot both ELF32 and ELF64" behaviour
is turned on for i386, it is quite important.
Bump version numbers too.
Found by ckuethe@; thanks.
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/include/loadfile_machdep.h | 8 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/cdboot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/pxeboot/conf.c | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/sys/arch/i386/include/loadfile_machdep.h b/sys/arch/i386/include/loadfile_machdep.h index 4990ae48bbd..1562f02b7d2 100644 --- a/sys/arch/i386/include/loadfile_machdep.h +++ b/sys/arch/i386/include/loadfile_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: loadfile_machdep.h,v 1.3 2007/02/20 21:15:01 tom Exp $ */ +/* $OpenBSD: loadfile_machdep.h,v 1.4 2007/05/31 21:43:57 tom Exp $ */ /* $NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $ */ /*- @@ -38,6 +38,10 @@ */ #define BOOT_ELF +#define BOOT_ELF32 +#define BOOT_ELF64 + +/* Keep a default ELFSIZE */ #define ELFSIZE 32 #define LOAD_KERNEL (LOAD_ALL & ~LOAD_TEXTA) @@ -45,7 +49,7 @@ #define LOADADDR(a) ((((u_long)(a)) + offset)&0xfffffff) #define ALIGNENTRY(a) ((u_long)(a)) -#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c)) +#define READ(f, b, c) read((f), (void *)LOADADDR(b), (size_t)(c)) #define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c)) #define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c)) #define WARN(a) (void)(printf a, \ diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c index dd9eccdbf8a..c43dd385011 100644 --- a/sys/arch/i386/stand/boot/conf.c +++ b/sys/arch/i386/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.37 2007/05/30 01:25:43 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.38 2007/05/31 21:43:57 tom Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -42,7 +42,7 @@ #include <dev/cons.h> #include "debug.h" -const char version[] = "3.00"; +const char version[] = "3.01"; int debug = 1; diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c index 56b5b5c788e..3e3bc297769 100644 --- a/sys/arch/i386/stand/cdboot/conf.c +++ b/sys/arch/i386/stand/cdboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.9 2007/05/30 01:25:43 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.10 2007/05/31 21:43:57 tom Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -43,7 +43,7 @@ #include <dev/cons.h> #include "debug.h" -const char version[] = "2.00"; +const char version[] = "2.01"; int debug = 1; #undef _TEST diff --git a/sys/arch/i386/stand/pxeboot/conf.c b/sys/arch/i386/stand/pxeboot/conf.c index d707b25930d..7222c6ad6f6 100644 --- a/sys/arch/i386/stand/pxeboot/conf.c +++ b/sys/arch/i386/stand/pxeboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.13 2007/05/30 01:25:43 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.14 2007/05/31 21:43:58 tom Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -45,7 +45,7 @@ #include "pxeboot.h" #include "pxe_net.h" -const char version[] = "2.00"; +const char version[] = "2.01"; int debug = 1; #undef _TEST |