From a3ff721b3d056f863cbcd2e9e94cc89d6c82a6ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Sun, 2 Aug 2026 13:08:04 +0200
Subject: [PATCH 1/2] llvm: don't append OS version to triple for amdgcn-amdhsa

closes https://codeberg.org/ziglang/zig/issues/36355
---
 src/codegen/llvm.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig
index 9e9b32eeab4c25e5d01ecc9bd3fdd80c5703c704..ec2427ee0e913cf711f01601a53a77b23315da30 100644
--- a/src/codegen/llvm.zig
+++ b/src/codegen/llvm.zig
@@ -263,7 +263,7 @@ pub fn targetTriple(allocator: Allocator, target: *const std.Target) ![]const u8
         => {},
         .semver => |ver| if (target.os.tag == .wasi and ver.min.major == 0) {
             try llvm_triple.print("p{d}", .{ver.min.minor});
-        } else {
+        } else if (target.os.tag != .amdhsa) {
             try llvm_triple.print("{d}.{d}.{d}", .{
                 ver.min.major,
                 ver.min.minor,
-- 
2.54.0


From b8431819b27d91b8c1dd367a0ce28d8ed4ec2ea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Sun, 2 Aug 2026 13:08:50 +0200
Subject: [PATCH 2/2] compiler: allow dynamic linking for amdgcn

closes https://codeberg.org/ziglang/zig/issues/36343
---
 src/target.zig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/target.zig b/src/target.zig
index 00a7e498d95fba989875fb9c96aa93273c51ac58..c64fd988cf4de9c881a8e79041ea8f7b80b099d0 100644
--- a/src/target.zig
+++ b/src/target.zig
@@ -12,7 +12,6 @@ pub const default_stack_protector_buffer_size = 4;
 
 pub fn canDynamicLink(target: *const std.Target) bool {
     return switch (target.cpu.arch) {
-        .amdgcn,
         .bpfeb,
         .bpfel,
         .nvptx,
-- 
2.54.0