nagachika	2015-12-10 00:26:29 +0900 (Thu, 10 Dec 2015)

  New Revision: 53007

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53007

  Log:
    merge revision(s) 52199: [Backport #11792]
    
    * configure.in: pthread_getattr_np is broken on AIX.
      More specifically, the stack address and size returned are
      not correct.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/configure.in
    branches/ruby_2_2/version.h
Index: ruby_2_2/configure.in
===================================================================
--- ruby_2_2/configure.in	(revision 53006)
+++ ruby_2_2/configure.in	(revision 53007)
@@ -2674,11 +2674,12 @@ if test x"$enable_pthread" = xyes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_2/configure.in#L2674
 	AC_DEFINE(NON_SCALAR_THREAD_ID)
     fi
     AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \
-	pthread_getattr_np pthread_attr_get_np pthread_attr_getstack\
+	pthread_attr_get_np pthread_attr_getstack\
 	pthread_get_stackaddr_np pthread_get_stacksize_np \
 	thr_stksegment pthread_stackseg_np pthread_getthrds_np \
 	pthread_cond_init pthread_condattr_setclock pthread_condattr_init \
 	pthread_sigmask pthread_setname_np)
+    AS_CASE(["$target_os"],[aix*],[ac_cv_func_pthread_getattr_np=no],[AC_CHECK_FUNCS(pthread_getattr_np)])
     if test "${host_os}" = "nacl"; then
       ac_cv_func_pthread_attr_init=no
     else
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 53006)
+++ ruby_2_2/ChangeLog	(revision 53007)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu Dec 10 00:23:07 2015  Rei Odaira  <Rei.Odaira@g...>
+
+	* configure.in: pthread_getattr_np is broken on AIX.
+	  More specifically, the stack address and size returned are
+	  not correct.
+
 Thu Dec 10 00:19:18 2015  NAKAMURA Usaku  <usa@r...>
 
 	* common.mk (update-gems): use BASERUBY instead of RUNRUBY.
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 53006)
+++ ruby_2_2/version.h	(revision 53007)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
 #define RUBY_RELEASE_DATE "2015-12-10"
-#define RUBY_PATCHLEVEL 225
+#define RUBY_PATCHLEVEL 226
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 12

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r52199


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/