4 files changed, 9 insertions, 2 deletions
diff --git a/std/debug/index.zig b/std/debug/index.zig
index 73c6ea7b56..93d6a60a03 100644
--- a/std/debug/index.zig
+++ b/std/debug/index.zig
@@ -1135,7 +1135,7 @@ pub const DebugInfo = switch (builtin.os) {
             return self.ofiles.allocator;
         }
     },
-    builtin.Os.windows => struct {
+    builtin.Os.uefi, builtin.Os.windows => struct {
         pdb: pdb.Pdb,
         coff: *coff.Coff,
         sect_contribs: []pdb.SectionContribEntry,
diff --git a/std/os/index.zig b/std/os/index.zig
index b19679c969..ce65667157 100644
--- a/std/os/index.zig
+++ b/std/os/index.zig
@@ -18,6 +18,7 @@ test "std.os" {
     _ = @import("test.zig");
     _ = @import("time.zig");
     _ = @import("windows/index.zig");
+    _ = @import("uefi/index.zig");
     _ = @import("get_app_data_dir.zig");
 }
 
@@ -26,6 +27,8 @@ pub const darwin = @import("darwin.zig");
 pub const linux = @import("linux/index.zig");
 pub const freebsd = @import("freebsd/index.zig");
 pub const zen = @import("zen.zig");
+pub const uefi = @import("uefi/index.zig");
+
 pub const posix = switch (builtin.os) {
     Os.linux => linux,
     Os.macosx, Os.ios => darwin,
@@ -33,6 +36,7 @@ pub const posix = switch (builtin.os) {
     Os.zen => zen,
     else => @compileError("Unsupported OS"),
 };
+
 pub const net = @import("net.zig");
 
 pub const ChildProcess = @import("child_process.zig").ChildProcess;
@@ -187,6 +191,9 @@ pub fn abort() noreturn {
             }
             windows.ExitProcess(3);
         },
+        Os.uefi => {
+            while (true) {}
+        },
         else => @compileError("Unsupported OS"),
     }
 }
diff --git a/std/os/uefi/index.zig b/std/os/uefi/index.zig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/std/os/uefi/index.zig
diff --git a/std/special/panic.zig b/std/special/panic.zig
index ca1caea73c..fe1e020604 100644
--- a/std/special/panic.zig
+++ b/std/special/panic.zig
@@ -10,7 +10,7 @@ pub fn panic(msg: []const u8, error_return_trace: ?*builtin.StackTrace) noreturn
     @setCold(true);
     switch (builtin.os) {
         // TODO: fix panic in zen.
-        builtin.Os.freestanding, builtin.Os.zen => {
+        builtin.Os.freestanding, builtin.Os.zen, builtin.Os.uefi => {
             while (true) {}
         },
         else => {