From 0fef975dce037aca4fd1e95a5fdffa910b48fa8d Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Fri, 2 Oct 2026 19:11:35 +0900
Subject: [PATCH] Remove Solaris 9 and earlier support

Extended Support for Solaris 9 ended in 2014. Solaris 10 and later have setenv and unsetenv, and libumem is always available, so the version specific fallbacks are no longer needed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 hash.c                    | 52 +--------------------------------------
 tool/lib/memory_status.rb |  2 +-
 2 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/hash.c b/hash.c
index 9245e1b6f61..24ac8837725 100644
--- a/hash.c
+++ b/hash.c
@@ -5738,16 +5738,6 @@ env_fetch_values(int argc, VALUE *argv, VALUE ehash)
 }
 
 #if defined(_WIN32) || (defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
-#elif defined __sun
-static int
-in_origenv(const char *str)
-{
-    char **env;
-    for (env = origenviron; *env; ++env) {
-        if (*env == str) return 1;
-    }
-    return 0;
-}
 #else
 static int
 envix(const char *nam)
@@ -5767,8 +5757,7 @@ envix(const char *nam)
 }
 #endif
 
-#if defined(_WIN32) || \
-  (defined(__sun) && !(defined(HAVE_SETENV) && defined(HAVE_UNSETENV)))
+#if defined(_WIN32)
 
 NORETURN(static void invalid_envname(const char *name));
 
@@ -5849,45 +5838,6 @@ ruby_setenv(const char *name, const char *value)
 
         if (ret) rb_sys_fail_sprintf("unsetenv(%s)", name);
     }
-#elif defined __sun
-    /* Solaris 9 (or earlier) does not have setenv(3C) and unsetenv(3C). */
-    /* The below code was tested on Solaris 10 by:
-         % ./configure ac_cv_func_setenv=no ac_cv_func_unsetenv=no
-    */
-    size_t len, mem_size;
-    char **env_ptr, *str, *mem_ptr;
-
-    check_envname(name);
-    len = strlen(name);
-    if (value) {
-        mem_size = len + strlen(value) + 2;
-        mem_ptr = malloc(mem_size);
-        if (mem_ptr == NULL)
-            rb_sys_fail_sprintf("malloc(%"PRIuSIZE")", mem_size);
-        snprintf(mem_ptr, mem_size, "%s=%s", name, value);
-    }
-
-    ENV_LOCKING() {
-        for (env_ptr = GET_ENVIRON(environ); (str = *env_ptr) != 0; ++env_ptr) {
-            if (!strncmp(str, name, len) && str[len] == '=') {
-                if (!in_origenv(str)) free(str);
-                while ((env_ptr[0] = env_ptr[1]) != 0) env_ptr++;
-                break;
-            }
-        }
-    }
-
-    if (value) {
-        int ret;
-        ENV_LOCKING() {
-            ret = putenv(mem_ptr);
-        }
-
-        if (ret) {
-            free(mem_ptr);
-            rb_sys_fail_sprintf("putenv(%s)", name);
-        }
-    }
 #else  /* WIN32 */
     size_t len;
     int i;
diff --git a/tool/lib/memory_status.rb b/tool/lib/memory_status.rb
index 429e5f6a1d3..28c866a61cf 100644
--- a/tool/lib/memory_status.rb
+++ b/tool/lib/memory_status.rb
@@ -146,7 +146,7 @@ if defined?(Memory::Status)
   # malloc library is needed to detect memory leaks.
   #
   case RUBY_PLATFORM
-  when /solaris2\.(?:9|[1-9][0-9])/i # Solaris 9, 10, 11,...
+  when /solaris/i
     bits = [nil].pack('p').size == 8 ? 64 : 32
     if ENV['LD_PRELOAD'].to_s.empty? &&
         ENV["LD_PRELOAD_#{bits}"].to_s.empty? &&