diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-13 08:59:54 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-13 08:59:54 +0000 |
| commit | 7dc4bbc1406202a48ef31e9fb97d542ece4d5519 (patch) | |
| tree | c394bbaeae508d7f974cda42a499b303d72429b3 | |
| parent | 21a40e94ac3404542c2bd83c388253ccf0fc96b0 (diff) | |
| download | ruby-7dc4bbc1406202a48ef31e9fb97d542ece4d5519.tar.gz | |
configure.in: rb_cv_mcontext_t_ptr
* configure.in (rb_cv_mcontext_t_ptr): abstract whether mcontext_t
is a pointer type.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | signal.c | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/configure.in b/configure.in index ce9939cdd9..5f7ae53153 100644 --- a/configure.in +++ b/configure.in @@ -2712,6 +2712,17 @@ if test x"$enable_pthread" = xyes; then fi fi if test x"$ac_cv_header_ucontext_h" = xyes; then + AC_CACHE_CHECK([if mcontext_t is a pointer], [rb_cv_mcontext_t_ptr], + [AC_TRY_COMPILE([@%:@include <ucontext.h> + mcontext_t test(mcontext_t mc) {return mc+1;} + ], + [test(0);], + [rb_cv_mcontext_t_ptr=yes], [rb_cv_mcontext_t_ptr=no])]) + if test x"$rb_cv_mcontext_t_ptr" = xyes; then + AC_DEFINE_UNQUOTED(DEFINE_MCONTEXT_PTR(mc, uc), mcontext_t mc = (uc)->uc_mcontext) + else + AC_DEFINE_UNQUOTED(DEFINE_MCONTEXT_PTR(mc, uc), mcontext_t *mc = &(uc)->uc_mcontext) + fi if test x"$rb_with_pthread" = xyes; then AC_CHECK_FUNCS(getcontext setcontext) fi @@ -742,15 +742,14 @@ NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th)); static void check_stack_overflow(const uintptr_t addr, const ucontext_t *ctx) { + const DEFINE_MCONTEXT_PTR(mctx, ctx); # if defined __linux__ - const mcontext_t *mctx = &ctx->uc_mcontext; # if defined REG_RSP const greg_t sp = mctx->gregs[REG_RSP]; # else const greg_t sp = mctx->gregs[REG_ESP]; # endif # elif defined __APPLE__ - const mcontext_t mctx = ctx->uc_mcontext; # if defined(__LP64__) const uintptr_t sp = mctx->__ss.__rsp; # else |