From 6837b808cd248a0a85b0953a30e945541769d3df Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 3 Jan 2013 05:46:29 +0000 Subject: * configure.in (OBJCOPY): Fixes build error for NativeClient. Avoid disabling OBJCOPY for NativeClient. * thread_pthread.c (rb_reserved_fd_p): USE_SLEEPY_TIMER_THREAD is always defined. Fixes compilation error for NativeClient. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ configure.in | 2 +- thread_pthread.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb453cac29..4c0baeea86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Jan 3 14:32:47 2013 Yuki Yugui Sonoda + + * configure.in (OBJCOPY): Fixes build error for NativeClient. + Avoid disabling OBJCOPY for NativeClient. + + * thread_pthread.c (rb_reserved_fd_p): USE_SLEEPY_TIMER_THREAD is + always defined. Fixes compilation error for NativeClient. + Wed Jan 02 03:09:00 2012 Zachary Scott * ext/zlib/zlib.c (Zlib::GzipReader): Fix typo by zed_0xff diff --git a/configure.in b/configure.in index 0511d49aa8..af0e564fcd 100644 --- a/configure.in +++ b/configure.in @@ -698,7 +698,7 @@ if test "$GCC" = yes; then else RUBY_TRY_LDFLAGS([-Wl,-unexported_symbol,_Init_*], [visibility_option=ld], [visibility_option=no]) fi - test "$visibility_option" = no || OBJCOPY=: + test "$visibility_option" = no -o "$host_os" = nacl || OBJCOPY=: fi if test "$GCC" = yes; then diff --git a/thread_pthread.c b/thread_pthread.c index 32904adbc5..d35092a70a 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1445,7 +1445,7 @@ ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr) int rb_reserved_fd_p(int fd) { -#ifdef USE_SLEEPY_TIMER_THREAD +#if USE_SLEEPY_TIMER_THREAD if (fd == timer_thread_pipe[0] || fd == timer_thread_pipe[1]) { return 1; -- cgit v1.2.3