Merge branch 'master-3.1' into dist/3.1/focal

Author: sorah

ChangeLog

@@ -1408,7 +1408,7 @@ no-test-bundled-gems-prepare: no-test-bundled-gems-precheck
 yes-test-bundled-gems-prepare: yes-test-bundled-gems-precheck
 	$(ACTIONS_GROUP)
 	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
-		--install-dir .bundle --conservative "bundler" "minitest:~> 5" "test-unit" "rake" "hoe" "yard" "pry" "packnga" "rexml" "json-schema" "test-unit-rr"
+		--install-dir .bundle --conservative "bundler" "minitest:~> 5" "test-unit" "rake" "hoe:~> 3.26" "yard" "pry" "packnga" "rexml" "json-schema" "test-unit-rr"
 	$(ACTIONS_ENDGROUP)
 
 PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare

common.mk

@@ -12659,7 +12659,7 @@ ibf_dump_memsize(const void *ptr)
 static const rb_data_type_t ibf_dump_type = {
     "ibf_dump",
     {ibf_dump_mark, ibf_dump_free, ibf_dump_memsize,},
-    0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static void

compile.c

@@ -29366,6 +29366,40 @@ else $as_nop
 	printf "%s\n" "#define STACK_GROW_DIRECTION $stack_dir" >>confdefs.h
 
 
+fi
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if thread-local storage is supported" >&5
+printf %s "checking if thread-local storage is supported... " >&6; }
+if test ${rb_cv_tls_supported+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int __thread conftest;
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  rb_cv_tls_supported=yes
+else $as_nop
+  rb_cv_tls_supported=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $rb_cv_tls_supported" >&5
+    colorize_result "$rb_cv_tls_supported" ; }
+    if test x"$rb_cv_tls_supported" != xyes
+then :
+  printf "%s\n" "#define RB_THREAD_LOCAL_SPECIFIER_IS_UNSUPPORTED 1" >>confdefs.h
+
 fi
 
 else $as_nop

configure

@@ -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)

configure.ac

@@ -1,3 +1,9 @@
+ruby3.1 (3.1.4-0nkmi1~dist) unstable; urgency=medium
+
+  * Ruby 3.1.4
+
+ -- Sorah Fukumori <[email protected]>  Fri, 31 Mar 2023 10:54:56 +0900
+
 ruby3.1 (3.1.3-0nkmi1~dist) unstable; urgency=medium
 
   * Ruby 3.1.3

debian/changelog

@@ -1756,7 +1756,6 @@ libruby-3.1.so.3.1 libruby3.1 #MINVER#
  ruby_hexdigits@Base 3.1.0
  ruby_incpush@Base 3.1.0
  ruby_init@Base 3.1.0
- ruby_init_ext@Base 3.1.0
  ruby_init_loadpath@Base 3.1.0
  ruby_init_setproctitle@Base 3.1.0
  ruby_init_stack@Base 3.1.0

debian/libruby3.1.symbols

@@ -12,10 +12,10 @@ Updated by John Paul Adrian Glaubitz <[email protected]> on
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index fcae66f..3f454e5 100644
+index 0bc6a7a..d1bbd17 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2550,6 +2550,9 @@ AS_CASE([$coroutine_type], [yes|''], [
+@@ -2557,6 +2557,9 @@ AS_CASE([$coroutine_type], [yes|''], [
          [arm64-darwin*], [
              coroutine_type=arm64
          ],

debian/patches/Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch

@@ -7,7 +7,7 @@ Subject: Honor the tool prefix against pkg-config
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 3f454e5..9d1b527 100644
+index d1bbd17..b414cf3 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -496,11 +496,14 @@ AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"]