From bc04b38f72ba1f261fbb3e881e6ae65c4bc77797 Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 21 Mar 2023 16:08:47 +0900 Subject: merge revision(s) 96d1acfdf6c6b42f2029f44d5b5920961d6efa92: [Backport #19161] [Bug #19161] Check for TLS usability On all platforms using GCC, even other than darwin. --- configure.ac | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) --- configure.ac | 7 +++++++ version.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fcae66f775..0bc6a7ae0e 100644 --- a/configure.ac +++ b/configure.ac @@ -2530,6 +2530,13 @@ AS_IF([test "${universal_binary-no}" = yes ], [ ], [ AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $stack_dir) ]) + + AC_CACHE_CHECK([if thread-local storage is supported], [rb_cv_tls_supported], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[int __thread conftest;]])], + [rb_cv_tls_supported=yes], + [rb_cv_tls_supported=no])]) + AS_IF([test x"$rb_cv_tls_supported" != xyes], + [AC_DEFINE(RB_THREAD_LOCAL_SPECIFIER_IS_UNSUPPORTED)]) ], [ RUBY_STACK_GROW_DIRECTION($target_cpu, dir) AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $dir) diff --git a/version.h b/version.h index f657512899..cf6344bdac 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 4 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 207 +#define RUBY_PATCHLEVEL 208 #define RUBY_RELEASE_YEAR 2023 #define RUBY_RELEASE_MONTH 3 -- cgit v1.2.1