-
Notifications
You must be signed in to change notification settings - Fork 272
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Chef 15947/ruby 3.1.6 patch/muthuja (#1941)
* add ruby 3.1.6 patch for rhel and suse platforms Signed-off-by: muthuja <[email protected]> * add ruby 3.1.6 patch for rhel and suse platforms Signed-off-by: muthuja <[email protected]> update sha id for msys2 devkit ruby Signed-off-by: muthuja <[email protected]> update sha id for msys2 devkit ruby Signed-off-by: muthuja <[email protected]> --------- Signed-off-by: muthuja <[email protected]>
- Loading branch information
Showing
4 changed files
with
39 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
diff --git i/configure.ac w/configure.ac | ||
index fcae66f775e..c933ed8b91f 100644 | ||
--- i/configure.ac | ||
+++ w/configure.ac | ||
@@ -363,6 +363,13 @@ AS_IF([test "$GCC" = yes], [ | ||
icc_version=`echo =__ICC | $CC -E -xc - | sed '/^=/!d;s///;/^__ICC/d'` | ||
test -n "$icc_version" || icc_version=0 | ||
# RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"]) | ||
+ | ||
+ 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)]) | ||
], [ | ||
linker_flag= | ||
]) | ||
diff --git i/thread_pthread.h w/thread_pthread.h | ||
index 2ac354046c0..7d4df3e2785 100644 | ||
--- i/thread_pthread.h | ||
+++ w/thread_pthread.h | ||
@@ -72,7 +72,7 @@ typedef struct rb_global_vm_lock_struct { | ||
|
||
#if __STDC_VERSION__ >= 201112 | ||
#define RB_THREAD_LOCAL_SPECIFIER _Thread_local | ||
-#elif defined(__GNUC__) | ||
+#elif defined(__GNUC__) && !defined(RB_THREAD_LOCAL_SPECIFIER_IS_UNSUPPORTED) | ||
/* note that ICC (linux) and Clang are covered by __GNUC__ */ | ||
#define RB_THREAD_LOCAL_SPECIFIER __thread | ||
#else |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters