diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-09 15:26:29 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-09 15:26:29 +0000 |
commit | 80f81024c3efa153620de8d0857da0820a09572b (patch) | |
tree | b0c02a425dbc2ebfa900f2ace293f5eff5a34ba0 | |
parent | 319a3fa7d1f6e2ee88a23575ee94427115024330 (diff) |
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_2@53007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.in | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Thu Dec 10 00:23:07 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. + Thu Dec 10 00:19:18 2015 NAKAMURA Usaku <usa@ruby-lang.org> * common.mk (update-gems): use BASERUBY instead of RUNRUBY. diff --git a/configure.in b/configure.in index c6a1019229..87e9a06c7d 100644 --- a/configure.in +++ b/configure.in @@ -2674,11 +2674,12 @@ if test x"$enable_pthread" = xyes; then 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 @@ -1,6 +1,6 @@ #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 |