PERFORCE change 28259 for review

[Peter Wemm]

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

Change 28259 by peter at peter_overcee on 2003/04/05 14:21:48

	support multiple elf types

Affected files ...

.. //depot/projects/hammer/sys/boot/common/bootstrap.h#2 edit
.. //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#5 edit

Differences ...

==== //depot/projects/hammer/sys/boot/common/bootstrap.h#2 (text+ko) ====

@@ -234,7 +234,9 @@
 int		aout_loadfile(char *filename, vm_offset_t dest, struct preloaded_file **result);
 vm_offset_t	aout_findsym(char *name, struct preloaded_file *fp);
 
-int	elf_loadfile(char *filename, vm_offset_t dest, struct preloaded_file **result);
+#ifdef __elfN
+int	__elfN(loadfile)(char *filename, vm_offset_t dest, struct preloaded_file **result);
+#endif
 
 /*
  * Support for commands 

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

@@ -38,9 +38,9 @@
 #include "libi386.h"
 #include "btxv86.h"
 
-static int	elf_exec(struct preloaded_file *amp);
+static int	elf32_exec(struct preloaded_file *amp);
 
-struct file_format i386_elf = { elf_loadfile, elf_exec };
+struct file_format i386_elf = { elf32_loadfile, elf32_exec };
 
 /*
  * There is an a.out kernel and one or more a.out modules loaded.  
@@ -48,7 +48,7 @@
  * preparations as are required, and do so.
  */
 static int
-elf_exec(struct preloaded_file *fp)
+elf32_exec(struct preloaded_file *fp)
 {
     struct file_metadata	*md;
     Elf_Ehdr 			*ehdr;