diff options
| author | David Naylor <dbn@FreeBSD.org> | 2016-03-19 17:14:10 +0000 |
|---|---|---|
| committer | David Naylor <dbn@FreeBSD.org> | 2016-03-19 17:14:10 +0000 |
| commit | 18e1b88a4df858d0424ae5dd026fdafb4f166334 (patch) | |
| tree | 0c56f34a650f503b5eaec7e0facfee7f4c53c68c /lang | |
| parent | 5079067642cdaa8d4fa504ad697c33d0e0c117da (diff) | |
lang/pypy: unbreak build on amd64.
The previous fix broke the build on amd64. Restore the correct
behaviour for both platforms.
Notes
Notes:
svn path=/head/; revision=411416
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/pypy/files/patch-rpython_rlib_rvmprof_src_vmprof__config.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lang/pypy/files/patch-rpython_rlib_rvmprof_src_vmprof__config.h b/lang/pypy/files/patch-rpython_rlib_rvmprof_src_vmprof__config.h index 811a1568ffec..a7d3bfdc6d85 100644 --- a/lang/pypy/files/patch-rpython_rlib_rvmprof_src_vmprof__config.h +++ b/lang/pypy/files/patch-rpython_rlib_rvmprof_src_vmprof__config.h @@ -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 |