[pull] master from ruby:master

common.mk

@@ -46,7 +46,7 @@ RUN_OPTS      = --disable-gems
 
 GIT_IN_SRC    = $(GIT) -C $(srcdir)
 GIT_LOG       = $(GIT_IN_SRC) log --no-show-signature
-GIT_LOG_FORMAT = $(GIT_LOG) --pretty=format:
+GIT_LOG_FORMAT = $(GIT_LOG) "--pretty=format:"
 
 # GITPULLOPTIONS = --no-tags
 

lib/bundler/definition.rb

@@ -1114,7 +1114,7 @@ def preload_git_sources
     end
 
     def find_source_requirements
-      if Gem.ruby_version >= "3.3"
+      if Gem.ruby_version >= Gem::Version.new("3.3")
         # Ruby 3.2 has a bug that incorrectly triggers a circular dependency warning. This version will continue to
         # fetch git repositories one by one.
         preload_git_sources

lib/rubygems/version.rb

@@ -345,7 +345,7 @@ def approximate_recommendation
   def <=>(other)
     if String === other
       unless Gem::Deprecate.skip
-        warn "comparing version objects with strings is deprecated and will be removed"
+        warn "comparing version objects with strings is deprecated and will be removed", uplevel: 1
       end
       return unless self.class.correct?(other)
       return self <=> self.class.new(other)

ruby_atomic.h

@@ -43,6 +43,8 @@ rbimpl_atomic_u64_load_relaxed(const volatile rbimpl_atomic_uint64_t *value)
     uint64_t val = *value;
     return atomic_cas_64(value, val, val);
 #else
+    // TODO: stdatomic
+
     return *value;
 #endif
 }
@@ -58,6 +60,8 @@ rbimpl_atomic_u64_set_relaxed(volatile rbimpl_atomic_uint64_t *address, uint64_t
 #elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
     atomic_swap_64(address, value);
 #else
+    // TODO: stdatomic
+
     *address = value;
 #endif
 }
@@ -72,9 +76,9 @@ rbimpl_atomic_u64_fetch_add(volatile rbimpl_atomic_uint64_t *ptr, uint64_t val)
     return InterlockedExchangeAdd64((volatile LONG64 *)ptr, val);
 #elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
     return atomic_add_64_nv(ptr, val) - val;
-#elif defined(HAVE_STDATOMIC_H)
-    return atomic_fetch_add_explicit((_Atomic uint64_t *)ptr, val, memory_order_seq_cst);
 #else
+    // TODO: stdatomic
+
     // Fallback using mutex for platforms without 64-bit atomics
     static rb_native_mutex_t lock = RB_NATIVE_MUTEX_INITIALIZER;
     rb_native_mutex_lock(&lock);

template/Makefile.in

@@ -748,4 +748,4 @@ yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST)
 no-test-syntax-suggest:
 
 yesterday:
-	$(GIT_IN_SRC) reset --hard `$(GIT_LOG_FORMAT):%H -1 --before=00:00+0900`
+	$(GIT_IN_SRC) reset --hard `TZ=UTC-9 $(GIT_LOG_FORMAT):%H -1 --before=00:00`

test/rubygems/test_gem_version.rb

@@ -160,13 +160,11 @@ def test_spaceship
       [-1, "1.9.3.1"],
       [nil, "whatever"],
     ].each do |cmp, string_ver|
-      expected = "comparing version objects with strings is deprecated and will be removed\n"
-
       actual_stdout, actual_stderr = capture_output do
         assert_equal(cmp, v("1.9.3") <=> string_ver)
       end
       assert_empty actual_stdout
-      assert_equal expected, actual_stderr
+      assert_match(/comparing version objects with strings is deprecated and will be removed/, actual_stderr)
     end
   end
 

win32/Makefile.sub

@@ -1391,6 +1391,7 @@ rubyspec-capiext: $(RUBYSPEC_CAPIEXT_EXTS)
 exts: rubyspec-capiext
 
 yesterday:
+	(set TZ=UTC-9) && \
 	for /f "usebackq" %H in \
-	    (`$(GIT_LOG_FORMAT):%H -1 "--before=00:00+0900"`) do \
+	    (`$(GIT_LOG_FORMAT):%H -1 "--before=00:00"`) do \
 	    $(GIT_IN_SRC) reset --hard %%H