diff --git a/lib/std/debug/SelfInfo/Elf.zig b/lib/std/debug/SelfInfo/Elf.zig
index f8df905fd99c265b8cf9f80c316e1f3663577b2d..50274e5f7e7cf708caace875179ed7595771f492 100644
--- a/lib/std/debug/SelfInfo/Elf.zig
+++ b/lib/std/debug/SelfInfo/Elf.zig
@@ -108,15 +108,19 @@ pub const can_unwind: bool = s: {
         // Not supported yet: arm
         .haiku => &.{
             .aarch64,
-            .m68k,
             .riscv64,
             .x86,
             .x86_64,
         },
-        // Not supported yet: arm/armeb/thumb/thumbeb, xtensa/xtensaeb
+        .illumos => &.{
+            .x86,
+            .x86_64,
+        },
+        // Not supported yet: arm/armeb/thumb/thumbeb, hppa, hppa64, microblaze/microblazeel, xtensa/xtensaeb
         .linux => &.{
             .aarch64,
             .aarch64_be,
+            .alpha,
             .arc,
             .csky,
             .loongarch32,
@@ -146,19 +150,23 @@ pub const can_unwind: bool = s: {
         .freebsd => &.{
             .aarch64,
             .riscv64,
+            .x86,
             .x86_64,
         },
-        // Not supported yet: arm/armeb, mips64/mips64el
+        // Not supported yet: arm/armeb, hppa, mips64/mips64el, sh/sheb
         .netbsd => &.{
             .aarch64,
             .aarch64_be,
+            .alpha,
             .m68k,
             .mips,
             .mipsel,
+            .riscv32,
+            .riscv64,
             .x86,
             .x86_64,
         },
-        // Not supported yet: arm
+        // Not supported yet: arm, hppa, sh
         .openbsd => &.{
             .aarch64,
             .m88k,
@@ -169,11 +177,6 @@ pub const can_unwind: bool = s: {
             .x86_64,
         },
 
-        .illumos => &.{
-            .x86,
-            .x86_64,
-        },
-
         else => unreachable,
     };
     for (archs) |a| {