1 files changed, 6 insertions, 22 deletions
diff --git a/lib/std/debug.zig b/lib/std/debug.zig
index 7e2ec05092..f2c3a5606b 100644
--- a/lib/std/debug.zig
+++ b/lib/std/debug.zig
@@ -61,28 +61,12 @@ pub const cpu_context = @import("debug/cpu_context.zig");
 /// ```
 pub const SelfInfo = if (@hasDecl(root, "debug") and @hasDecl(root.debug, "SelfInfo"))
     root.debug.SelfInfo
-else switch (native_os) {
-    .linux,
-    .netbsd,
-    .freebsd,
-    .dragonfly,
-    .openbsd,
-    .solaris,
-    .illumos,
-    => @import("debug/SelfInfo/Elf.zig"),
-
-    .macos,
-    .ios,
-    .watchos,
-    .tvos,
-    .visionos,
-    => @import("debug/SelfInfo/Darwin.zig"),
-
-    .uefi,
-    .windows,
-    => @import("debug/SelfInfo/Windows.zig"),
-
-    else => void,
+else switch (std.Target.ObjectFormat.default(native_os, native_arch)) {
+    .coff => @import("debug/SelfInfo/Windows.zig"),
+    .elf => @import("debug/SelfInfo/Elf.zig"),
+    .macho => @import("debug/SelfInfo/Darwin.zig"),
+    .goff, .plan9, .spirv, .wasm, .xcoff => void,
+    .c, .hex, .raw => unreachable,
 };
 
 pub const SelfInfoError = error{