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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a8083b75b..ab0e886c24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 16 16:07:29 2015  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* configure.in: pthread_getattr_np is broken on AIX.
+	  More specifically, the stack address and size returned are
+	  not correct.
+
 Wed Dec 16 16:04:27 2015  Eric Wong  <e@80x24.org>
 
 	* insns.def (opt_case_dispatch): check Float#=== redefinition
diff --git a/configure.in b/configure.in
index 343c04c5ac..28b5dc13eb 100644
--- a/configure.in
+++ b/configure.in
@@ -2473,11 +2473,12 @@ if test x"$enable_pthread" = xyes; then
 	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
     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
diff --git a/version.h b/version.h
index ef39787b8a..af70d83c76 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.8"
 #define RUBY_RELEASE_DATE "2015-12-16"
-#define RUBY_PATCHLEVEL 435
+#define RUBY_PATCHLEVEL 436
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 12