adding environ global to extern static operations.

rust-lang · May 12, 2024 · 7083a45 · 7083a45
1 parent 96c28e9
commit 7083a45
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/shims/extern_static.rs b/src/shims/extern_static.rs
@@ -76,6 +76,10 @@ impl<'mir, 'tcx> MiriMachine<'mir, 'tcx> {
                 Self::null_ptr_extern_statics(this, &["bsd_signal"])?;
                 Self::weak_symbol_extern_statics(this, &["signal"])?;
             }
+            "solaris" | "illumos" => {
+                let environ = this.machine.env_vars.unix().environ();
+                Self::add_extern_static(this, "environ", environ);
+            }
             "windows" => {
                 // "_tls_used"
                 // This is some obscure hack that is part of the Windows TLS story. It's a `u8`.

diff --git a/tests/fail/environ-gets-deallocated.rs b/tests/fail/environ-gets-deallocated.rs
@@ -1,6 +1,6 @@
 //@ignore-target-windows: Windows does not have a global environ list that the program can access directly
 
-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "solaris", target_os = "illumos"))]
 fn get_environ() -> *const *const u8 {
     extern "C" {
         static mut environ: *const *const u8;