* 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
komatatsu · Jan 3, 2013 · 6837b80 · 6837b80
1 parent 73bd4c3
commit 6837b80
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jan  3 14:32:47 2013  Yuki Yugui Sonoda  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* ext/zlib/zlib.c (Zlib::GzipReader): Fix typo by zed_0xff

diff --git 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
@@ -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;