diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig
index 99761b146ddcb02e19861c9eb8092f981d014c1c..0311f458b07feace4ab469e4234fd7abec78a079 100644
--- a/lib/std/builtin.zig
+++ b/lib/std/builtin.zig
@@ -806,7 +806,7 @@ pub fn default_panic(msg: []const u8, error_return_trace: ?*StackTrace, ret_addr
             // Didn't have boot_services, just fallback to whatever.
             std.os.abort();
         },
-        .cuda => std.os.abort(),
+        .cuda, .amdhsa => std.os.abort(),
         else => {
             const first_trace_addr = ret_addr orelse @returnAddress();
             std.debug.panicImpl(error_return_trace, first_trace_addr, msg);
diff --git a/lib/std/os.zig b/lib/std/os.zig
index 2c49bd9f499f27a4410438cc2b90db947e6d4923..f170eec3671ed9441e1ba450a2cc7e0c5745041f 100644
--- a/lib/std/os.zig
+++ b/lib/std/os.zig
@@ -613,7 +613,7 @@ pub fn abort() noreturn {
         exit(127); // Pid 1 might not be signalled in some containers.
     }
     switch (builtin.os.tag) {
-        .uefi, .wasi, .cuda => @trap(),
+        .uefi, .wasi, .cuda, .amdhsa => @trap(),
         else => system.abort(),
     }
 }