From owner-svn-ports-all@freebsd.org  Sat Mar 19 17:14:11 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4BD5BAD6181;
 Sat, 19 Mar 2016 17:14:11 +0000 (UTC) (envelope-from dbn@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1DDFDFE8;
 Sat, 19 Mar 2016 17:14:11 +0000 (UTC) (envelope-from dbn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2JHEAAR056108;
 Sat, 19 Mar 2016 17:14:10 GMT (envelope-from dbn@FreeBSD.org)
Received: (from dbn@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2JHEAvY056107;
 Sat, 19 Mar 2016 17:14:10 GMT (envelope-from dbn@FreeBSD.org)
Message-Id: <201603191714.u2JHEAvY056107@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dbn set sender to dbn@FreeBSD.org
 using -f
From: David Naylor <dbn@FreeBSD.org>
Date: Sat, 19 Mar 2016 17:14:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r411416 - head/lang/pypy/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Mar 2016 17:14:11 -0000

Author: dbn
Date: Sat Mar 19 17:14:10 2016
New Revision: 411416
URL: https://svnweb.freebsd.org/changeset/ports/411416

Log:
  lang/pypy: unbreak build on amd64.
  
  The previous fix broke the build on amd64.  Restore the correct
  behaviour for both platforms.

Modified:
  head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_vmprof__config.h

Modified: head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_vmprof__config.h
==============================================================================
--- head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_vmprof__config.h	Sat Mar 19 17:11:58 2016	(r411415)
+++ head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_vmprof__config.h	Sat Mar 19 17:14:10 2016	(r411416)
@@ -1,10 +1,15 @@
 --- rpython/rlib/rvmprof/src/vmprof_config.h.orig	2016-03-19 14:27:46 UTC
 +++ rpython/rlib/rvmprof/src/vmprof_config.h
-@@ -1,6 +1,6 @@
+@@ -1,5 +1,11 @@
  #define HAVE_SYS_UCONTEXT_H
- #if defined(__FreeBSD__) || defined(__APPLE__)
--#define PC_FROM_UCONTEXT uc_mcontext.mc_rip
+-#if defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(__FreeBSD__)
++#if defined(__i386__)
 +#define PC_FROM_UCONTEXT uc_mcontext.mc_eip
++#else
++#define PC_FROM_UCONTEXT uc_mcontext.mc_rip
++#endif
++#elif defined(__APPLE__)
+ #define PC_FROM_UCONTEXT uc_mcontext.mc_rip
  #else
  #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
- #endif