summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNAKAMURA Usaku <usa@ruby-lang.org>2023-03-30 19:59:19 +0900
committerNAKAMURA Usaku <usa@ruby-lang.org>2023-03-30 19:59:19 +0900
commitb427e3570d16c7b68cfa0e5e05be84ba8e3eac36 (patch)
tree067444773dcbeeee0f0b3f5a21f67a1b60b0fd1f
parent69f0cafa5ef6ef9c86b374531e757e885198b390 (diff)
[Backport #19161] merge part of 96d1acfdf6c6b42f2029f44d5b5920961d6efa92
Check for TLS usability On all platforms using GCC, even other than darwin.
-rw-r--r--configure.ac8
-rw-r--r--version.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index d14788b0d5..28fdfefbbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,6 +348,14 @@ AS_IF([test "$GCC" = yes -a "$gcc_major" -lt 3 ], [
AC_MSG_ERROR([too old GCC])
])
+
+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_PROG_GNU_LD
RUBY_CPPOUTFILE
diff --git a/version.h b/version.h
index 4696e8366c..bcc562e006 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 213
+#define RUBY_PATCHLEVEL 214
#define RUBY_RELEASE_YEAR 2023
#define RUBY_RELEASE_MONTH 3