From owner-svn-src-user@FreeBSD.ORG  Sun May  5 17:46:06 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C44098EC;
 Sun,  5 May 2013 17:46:06 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B733D6D3;
 Sun,  5 May 2013 17:46:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r45Hk6pC080966;
 Sun, 5 May 2013 17:46:06 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r45Hk64W080963;
 Sun, 5 May 2013 17:46:06 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201305051746.r45Hk64W080963@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sun, 5 May 2013 17:46:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r250282 - user/dchagin/lemul/sys/compat/linux
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 May 2013 17:46:06 -0000

Author: dchagin
Date: Sun May  5 17:46:05 2013
New Revision: 250282
URL: http://svnweb.freebsd.org/changeset/base/250282

Log:
  Get ready to commit x86_64 Linux emulation.
  Add 64 bit support to the vdso.

Modified:
  user/dchagin/lemul/sys/compat/linux/linux_vdso.c
  user/dchagin/lemul/sys/compat/linux/linux_vdso.h

Modified: user/dchagin/lemul/sys/compat/linux/linux_vdso.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_vdso.c	Sun May  5 17:41:58 2013	(r250281)
+++ user/dchagin/lemul/sys/compat/linux/linux_vdso.c	Sun May  5 17:46:05 2013	(r250282)
@@ -29,7 +29,11 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
 
+#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32))
 #define	__ELF_WORD_SIZE	32
+#else
+#define	__ELF_WORD_SIZE	64
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -136,7 +140,7 @@ __elfN(linux_vdso_fixup)(struct sysentve
 }
 
 void
-__elfN(linux_vdso_reloc)(struct sysentvec *sv, int vdso_adjust)
+__elfN(linux_vdso_reloc)(struct sysentvec *sv, long vdso_adjust)
 {
 	struct linux_vdso_sym *lsym;
 	Elf_Ehdr *ehdr;

Modified: user/dchagin/lemul/sys/compat/linux/linux_vdso.h
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_vdso.h	Sun May  5 17:41:58 2013	(r250281)
+++ user/dchagin/lemul/sys/compat/linux/linux_vdso.h	Sun May  5 17:46:05 2013	(r250282)
@@ -41,7 +41,7 @@ struct linux_vdso_sym {
 vm_object_t __elfN(linux_shared_page_init)(char **);
 void	__elfN(linux_shared_page_fini)(vm_object_t);
 void	__elfN(linux_vdso_fixup)(struct sysentvec *);
-void	__elfN(linux_vdso_reloc)(struct sysentvec *, int);
+void	__elfN(linux_vdso_reloc)(struct sysentvec *, long);
 void	__elfN(linux_vdso_sym_init)(struct linux_vdso_sym *);
 
 #define	LINUX_VDSO_SYM_INTPTR(name)				\