svn commit: r411416 - head/lang/pypy/files

[David Naylor]

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