From owner-p4-projects@FreeBSD.ORG  Sat Apr  5 14:22:02 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9C15537B404; Sat,  5 Apr 2003 14:22:01 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3D7D337B401
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 14:22:01 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DAB9E43F75
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 14:22:00 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h35MM00U030468
	for <perforce@freebsd.org>; Sat, 5 Apr 2003 14:22:00 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35MM0pQ030465
	for perforce@freebsd.org; Sat, 5 Apr 2003 14:22:00 -0800 (PST)
Date: Sat, 5 Apr 2003 14:22:00 -0800 (PST)
Message-Id: <200304052222.h35MM0pQ030465@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28259 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Apr 2003 22:22:02 -0000

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

Change 28259 by peter@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;