PERFORCE change 28261 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=28261

Change 28261 by peter at peter_overcee on 2003/04/05 14:26:26

	add elf64 and connect it

Affected files ...

.. //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#2 edit
.. //depot/projects/hammer/sys/boot/i386/loader/conf.c#4 edit

Differences ...

==== //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#2 (text+ko) ====

@@ -26,6 +26,7 @@
  * $FreeBSD: src/sys/boot/i386/libi386/elf_freebsd.c,v 1.11 2003/04/04 16:35:15 phk Exp $
  */
 
+#define __ELF_WORD_SIZE 64
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/linker.h>
@@ -38,9 +39,9 @@
 #include "libi386.h"
 #include "btxv86.h"
 
-static int	elf32_exec(struct preloaded_file *amp);
+static int	elf64_exec(struct preloaded_file *amp);
 
-struct file_format i386_elf = { elf32_loadfile, elf32_exec };
+struct file_format x86_64_elf = { elf64_loadfile, elf64_exec };
 
 /*
  * There is an a.out kernel and one or more a.out modules loaded.  
@@ -48,7 +49,7 @@
  * preparations as are required, and do so.
  */
 static int
-elf32_exec(struct preloaded_file *fp)
+elf64_exec(struct preloaded_file *fp)
 {
     struct file_metadata	*md;
     Elf_Ehdr 			*ehdr;

==== //depot/projects/hammer/sys/boot/i386/loader/conf.c#4 (text+ko) ====

@@ -82,9 +82,11 @@
  * rather than reading the file go first.
  */
 extern struct file_format	i386_elf;
+extern struct file_format	x86_64_elf;
 
 struct file_format *file_formats[] = {
     &i386_elf,
+    &x86_64_elf,
     NULL
 };