diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-03 05:46:29 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-03 05:46:29 +0000 |
| commit | 6837b808cd248a0a85b0953a30e945541769d3df (patch) | |
| tree | 363c01d711c83931b2d733b69dedddb032a9cc24 | |
| parent | 73bd4c3ff6220250219e10eb44ef1c4742991e5d (diff) | |
| download | ruby-6837b808cd248a0a85b0953a30e945541769d3df.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | thread_pthread.c | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Thu Jan 3 14:32:47 2013 Yuki Yugui Sonoda <yugui@yugui.jp> + + * 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 <zachary@zacharyscott.net> * 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; |