From owner-svn-src-projects@FreeBSD.ORG  Sun Jul  5 07:00:51 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 AF3CE106564A;
	Sun,  5 Jul 2009 07:00:51 +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 9E9A18FC13;
	Sun,  5 Jul 2009 07:00:51 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6570p69040213;
	Sun, 5 Jul 2009 07:00:51 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6570pAp040211;
	Sun, 5 Jul 2009 07:00:51 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200907050700.n6570pAp040211@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 5 Jul 2009 07:00:51 +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: r195356 - projects/mips/sys/mips/include
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: Sun, 05 Jul 2009 07:00:52 -0000

Author: imp
Date: Sun Jul  5 07:00:51 2009
New Revision: 195356
URL: http://svn.freebsd.org/changeset/base/195356

Log:
  Define __ELF_WORD_SIZE appropriately for n64.  Note for N32 I believe
  this is correct.  While registers are 64-bit, n32 is a 32-bit ABI and
  lives in a 32-bit world (with explicit 64-bit registers, however).
  Change an 8, which was 4 + 4 or sizeof(int) + SZREG to be a simple '4
  + SZREG' to reflect the actual offset of the structure in question.

Modified:
  projects/mips/sys/mips/include/elf.h

Modified: projects/mips/sys/mips/include/elf.h
==============================================================================
--- projects/mips/sys/mips/include/elf.h	Sun Jul  5 06:56:51 2009	(r195355)
+++ projects/mips/sys/mips/include/elf.h	Sun Jul  5 07:00:51 2009	(r195356)
@@ -41,8 +41,12 @@
 /* Information taken from MIPS ABI supplemental */
 
 #ifndef __ELF_WORD_SIZE
+#if defined(__mips_n64)
+#define	__ELF_WORD_SIZE 64	/* Used by <sys/elf_generic.h> */
+#else
 #define	__ELF_WORD_SIZE 32	/* Used by <sys/elf_generic.h> */
 #endif
+#endif
 #include <sys/elf32.h>	/* Definitions common to all 32 bit architectures. */
 #include <sys/elf64.h>	/* Definitions common to all 64 bit architectures. */
 #include <sys/elf_generic.h>