From owner-p4-projects@FreeBSD.ORG  Sat Apr  5 14:27:09 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2DAD237B404; Sat,  5 Apr 2003 14:27:09 -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 C1AC637B401
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 14:27:08 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6A02043F85
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 14:27:08 -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 h35MR80U030869
	for <perforce@freebsd.org>; Sat, 5 Apr 2003 14:27:08 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35MR76c030866
	for perforce@freebsd.org; Sat, 5 Apr 2003 14:27:07 -0800 (PST)
Date: Sat, 5 Apr 2003 14:27:07 -0800 (PST)
Message-Id: <200304052227.h35MR76c030866@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 28261 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:27:10 -0000

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

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