diff options
Diffstat (limited to 'sys/arch/i386/stand')
| -rw-r--r-- | sys/arch/i386/stand/boot/conf.c | 5 | ||||
| -rw-r--r-- | sys/arch/i386/stand/cdboot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/elf32.c | 32 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/elf64.c | 32 | ||||
| -rw-r--r-- | sys/arch/i386/stand/pxeboot/conf.c | 5 |
6 files changed, 72 insertions, 10 deletions
diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c index 0539fc234f0..dd9eccdbf8a 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.36 2007/04/27 10:08:34 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.37 2007/05/30 01:25:43 tom Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -24,7 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include <sys/types.h> @@ -43,7 +42,7 @@ #include <dev/cons.h> #include "debug.h" -const char version[] = "2.14"; +const char version[] = "3.00"; int debug = 1; diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c index 241fdec2fdc..56b5b5c788e 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.8 2007/04/27 10:08:34 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.9 2007/05/30 01:25:43 tom Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -43,7 +43,7 @@ #include <dev/cons.h> #include "debug.h" -const char version[] = "1.07"; +const char version[] = "2.00"; int debug = 1; #undef _TEST diff --git a/sys/arch/i386/stand/libsa/Makefile b/sys/arch/i386/stand/libsa/Makefile index e43cf52d7cf..edff079b1f6 100644 --- a/sys/arch/i386/stand/libsa/Makefile +++ b/sys/arch/i386/stand/libsa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.46 2006/09/18 21:14:15 mpf Exp $ +# $OpenBSD: Makefile,v 1.47 2007/05/30 01:25:43 tom Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -8,7 +8,7 @@ S=${.CURDIR}/../../../.. SADIR=${.CURDIR}/.. # i386 stuff (so, it will possibly load in the same 64k) -SRCS+= machdep.c dev_i386.c exec_i386.c cmd_i386.c loadfile.c +SRCS+= machdep.c dev_i386.c exec_i386.c cmd_i386.c loadfile.c elf32.c elf64.c .if defined(DEBUGFLAGS) && !empty(DEBUGFLAGS:M-D_TEST) SRCS+= unixdev.c unixsys.S nullfs.c memprobe.c diff --git a/sys/arch/i386/stand/libsa/elf32.c b/sys/arch/i386/stand/libsa/elf32.c new file mode 100644 index 00000000000..f943067411c --- /dev/null +++ b/sys/arch/i386/stand/libsa/elf32.c @@ -0,0 +1,32 @@ +/* $OpenBSD: elf32.c,v 1.1 2007/05/30 01:25:43 tom Exp $ */ + +/* + * Copyright (c) 2007 Tom Cosgrove <tom@openbsd.org> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <lib/libkern/libkern.h> +#include <lib/libsa/stand.h> + +#include <sys/param.h> +#include <sys/exec.h> + +#include "../../../../lib/libsa/loadfile.h" + +#undef ELFSIZE +#define ELFSIZE 32 + +#include <sys/exec_elf.h> + +#include "../../../../lib/libsa/loadfile_elf.c" diff --git a/sys/arch/i386/stand/libsa/elf64.c b/sys/arch/i386/stand/libsa/elf64.c new file mode 100644 index 00000000000..d7d11c843c4 --- /dev/null +++ b/sys/arch/i386/stand/libsa/elf64.c @@ -0,0 +1,32 @@ +/* $OpenBSD: elf64.c,v 1.1 2007/05/30 01:25:43 tom Exp $ */ + +/* + * Copyright (c) 2007 Tom Cosgrove <tom@openbsd.org> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <lib/libkern/libkern.h> +#include <lib/libsa/stand.h> + +#include <sys/param.h> +#include <sys/exec.h> + +#include "../../../../lib/libsa/loadfile.h" + +#undef ELFSIZE +#define ELFSIZE 64 + +#include <sys/exec_elf.h> + +#include "../../../../lib/libsa/loadfile_elf.c" diff --git a/sys/arch/i386/stand/pxeboot/conf.c b/sys/arch/i386/stand/pxeboot/conf.c index c194d8b16b3..d707b25930d 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.12 2007/04/27 10:08:34 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.13 2007/05/30 01:25:43 tom Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -25,7 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include <sys/types.h> @@ -46,7 +45,7 @@ #include "pxeboot.h" #include "pxe_net.h" -const char version[] = "1.12"; +const char version[] = "2.00"; int debug = 1; #undef _TEST |