From owner-svn-src-projects@FreeBSD.ORG  Wed Sep  9 03:57:10 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B41E71065670;
	Wed,  9 Sep 2009 03:57:10 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A29C78FC0A;
	Wed,  9 Sep 2009 03:57:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n893vAef071785;
	Wed, 9 Sep 2009 03:57:10 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n893vAWu071783;
	Wed, 9 Sep 2009 03:57:10 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200909090357.n893vAWu071783@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 9 Sep 2009 03:57:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197014 - projects/mips/sys/mips/mips
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Sep 2009 03:57:10 -0000

Author: imp
Date: Wed Sep  9 03:57:10 2009
New Revision: 197014
URL: http://svn.freebsd.org/changeset/base/197014

Log:
  Ugly hack to get this to compile.  I'm sure there's a better way...

Modified:
  projects/mips/sys/mips/mips/elf_trampoline.c

Modified: projects/mips/sys/mips/mips/elf_trampoline.c
==============================================================================
--- projects/mips/sys/mips/mips/elf_trampoline.c	Wed Sep  9 03:54:55 2009	(r197013)
+++ projects/mips/sys/mips/mips/elf_trampoline.c	Wed Sep  9 03:57:10 2009	(r197014)
@@ -27,7 +27,11 @@ __FBSDID("$FreeBSD$");
 #include <machine/asm.h>
 #include <sys/param.h>
 
+#ifdef __mips_n64
+#include <sys/elf64.h>
+#else
 #include <sys/elf32.h>
+#endif
 #include <sys/inflate.h>
 #include <machine/elf.h>
 #include <machine/cpufunc.h>
@@ -89,12 +93,21 @@ bzero(void *addr, size_t count)
 void *
 load_kernel(void * kstart)
 {
+#ifdef __mips_n64
+	Elf64_Ehdr *eh;
+	Elf64_Phdr phdr[64] /* XXX */;
+#else
 	Elf32_Ehdr *eh;
 	Elf32_Phdr phdr[64] /* XXX */;
+#endif
 	int i;
 	void *entry_point;
 	
+#ifdef __mips_n64
+	eh = (Elf64_Ehdr *)kstart;
+#else
 	eh = (Elf32_Ehdr *)kstart;
+#endif
 	entry_point = (void*)eh->e_entry;
 	memcpy(phdr, (void *)(kstart + eh->e_phoff ),
 	    eh->e_phnum * sizeof(phdr[0]));