[pypy-commit] pypy release-5.x: Make vmprof build on OpenBSD.

[vext01]

Author: Edd Barrett <vext01 at gmail.com>
Branch: release-5.x
Changeset: r85151:f4e9427ad4bf
Date: 2016-06-09 16:55 +0100
http://bitbucket.org/pypy/pypy/changeset/f4e9427ad4bf/

Log:	Make vmprof build on OpenBSD. (grafted from
	b30d44ba76f7eb2ed8ba19ba4500c62a89704f1f)

diff --git a/rpython/rlib/rvmprof/src/vmprof_config.h b/rpython/rlib/rvmprof/src/vmprof_config.h
--- a/rpython/rlib/rvmprof/src/vmprof_config.h
+++ b/rpython/rlib/rvmprof/src/vmprof_config.h
@@ -1,10 +1,14 @@
+#if !defined(__OpenBSD__)
 #define HAVE_SYS_UCONTEXT_H
+#endif
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
   #ifdef __i386__
     #define PC_FROM_UCONTEXT uc_mcontext.mc_eip
   #else
     #define PC_FROM_UCONTEXT uc_mcontext.mc_rip
   #endif
+#elif defined(__OpenBSD__)
+#define PC_FROM_UCONTEXT sc_rip
 #elif defined( __APPLE__)
   #if ((ULONG_MAX) == (UINT_MAX))
     #define PC_FROM_UCONTEXT uc_mcontext->__ss.__eip
diff --git a/rpython/rlib/rvmprof/src/vmprof_getpc.h b/rpython/rlib/rvmprof/src/vmprof_getpc.h
--- a/rpython/rlib/rvmprof/src/vmprof_getpc.h
+++ b/rpython/rlib/rvmprof/src/vmprof_getpc.h
@@ -65,6 +65,8 @@
 #elif defined(HAVE_CYGWIN_SIGNAL_H)
 #include <cygwin/signal.h>
 typedef ucontext ucontext_t;
+#elif defined(__OpenBSD__)
+#include <signal.h>
 #endif