From f0cbb868e7484534e11c405187811f5cca057615 Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 9 Apr 2014 23:16:10 +0000 Subject: [PATCH] * signal.c (check_stack_overflow): Don't use ucontext_t if ucontext.h is not available. Fixes build on Android (x86). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ signal.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79761e3233..232c0a28ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 10 08:13:47 2014 Tanaka Akira + + * signal.c (check_stack_overflow): Don't use ucontext_t if ucontext.h + is not available. + Fixes build on Android (x86). + Wed Apr 9 23:22:44 2014 Tanaka Akira * gc.c (mark_current_machine_context): Call SET_STACK_END. diff --git a/signal.c b/signal.c index 0c173fa708..f06dbe4444 100644 --- a/signal.c +++ b/signal.c @@ -636,7 +636,7 @@ rb_get_next_signal(void) #if defined(USE_SIGALTSTACK) || defined(_WIN32) NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th)); -#if defined __linux__ && (defined __i386__ || defined __x86_64__) +#if defined(HAVE_UCONTEXT_H) && defined __linux__ && (defined __i386__ || defined __x86_64__) static void check_stack_overflow(const uintptr_t addr, const ucontext_t *ctx) { @@ -665,7 +665,7 @@ check_stack_overflow(const void *addr) #define CHECK_STACK_OVERFLOW() check_stack_overflow(0) #else #define FAULT_ADDRESS info->si_addr -#if defined __linux__ && (defined __i386__ || defined __x86_64__) +#if defined(HAVE_UCONTEXT_H) && defined __linux__ && (defined __i386__ || defined __x86_64__) # define CHECK_STACK_OVERFLOW() check_stack_overflow((uintptr_t)FAULT_ADDRESS, ctx) #else # define CHECK_STACK_OVERFLOW() check_stack_overflow(FAULT_ADDRESS)