From 3b3833acf73aae7d5e84e9e9ae15c9c4f9d5b367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Thu, 21 May 2026 06:36:58 +0200
Subject: [PATCH] remove remnants of {m68k,powerpc,sparc64}-haiku support

These ports of Haiku have been nonfunctional/incomplete for years. We do not
generally treat such ports as "real" targets.

https://codeberg.org/ziglang/ziglang.org/commit/1efffd83ffd4078cea456c80ae806259207530ad
---
 lib/std/Target.zig            |  7 +------
 lib/std/debug/cpu_context.zig | 21 ---------------------
 test/llvm_targets.zig         |  4 ----
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/lib/std/Target.zig b/lib/std/Target.zig
index ca1562e3f7a632d9bce758839cbbc0711327c47e..7598ca2e1f584fe58bd79a157308ba179454f5e8 100644
--- a/lib/std/Target.zig
+++ b/lib/std/Target.zig
@@ -852,9 +852,7 @@ pub const Abi = enum {
                 else => .none,
             },
             .haiku => switch (arch) {
-                .arm,
-                .powerpc,
-                => .eabihf,
+                .arm => .eabihf,
                 else => .none,
             },
             .hurd => .gnu,
@@ -2461,10 +2459,7 @@ pub const DynamicLinker = struct {
             .haiku => switch (cpu.arch) {
                 .arm,
                 .aarch64,
-                .m68k,
-                .powerpc,
                 .riscv64,
-                .sparc64,
                 .x86,
                 .x86_64,
                 => init("/system/runtime_loader"),
diff --git a/lib/std/debug/cpu_context.zig b/lib/std/debug/cpu_context.zig
index 244765b9a7b9227285c97ac436c28aabb7eb3b2c..2c6355531b91abecf86f1b663220f7c406435b88 100644
--- a/lib/std/debug/cpu_context.zig
+++ b/lib/std/debug/cpu_context.zig
@@ -2600,25 +2600,6 @@ const signal_ucontext_t = switch (native_os) {
                 sp: u64,
                 pc: u64,
             },
-            // https://github.com/haiku/haiku/blob/47538c534fe0aadc626c09d121773fee8ea10d71/headers/posix/arch/m68k/signal.h
-            .m68k => extern struct {
-                pc: u32 align(8),
-                d: [8]u32,
-                a: [8]u32,
-            },
-            // https://github.com/haiku/haiku/blob/47538c534fe0aadc626c09d121773fee8ea10d71/headers/posix/arch/ppc/signal.h
-            .powerpc => extern struct {
-                pc: u32 align(8),
-                r: [13]u32, // Um, are you okay, Haiku?
-                _f: [14]f64,
-                _reserved: u32,
-                _fpscr: u32,
-                _ctr: u32,
-                _xer: u32,
-                _cr: u32,
-                _msr: u32,
-                lr: u32,
-            },
             // https://github.com/haiku/haiku/blob/47538c534fe0aadc626c09d121773fee8ea10d71/headers/posix/arch/riscv64/signal.h
             .riscv64 => extern struct {
                 ra_sp_gp_tp: [4]u64,
@@ -2629,8 +2610,6 @@ const signal_ucontext_t = switch (native_os) {
                 t3_6: [4]u64,
                 pc: u64,
             },
-            // https://github.com/haiku/haiku/blob/47538c534fe0aadc626c09d121773fee8ea10d71/headers/posix/arch/sparc64/signal.h
-            .sparc64 => @compileError("sparc64-haiku mcontext_t missing"),
             // https://github.com/haiku/haiku/blob/47538c534fe0aadc626c09d121773fee8ea10d71/headers/posix/arch/x86/signal.h
             .x86 => extern struct {
                 eip: u32,
diff --git a/test/llvm_targets.zig b/test/llvm_targets.zig
index c043e7f45b1eb08bbfcd5a8e96f6cbea5f6525a2..f3b3af4cc7a91be9183f3ffadf57c71fb7529a32 100644
--- a/test/llvm_targets.zig
+++ b/test/llvm_targets.zig
@@ -126,7 +126,6 @@ const targets = [_]std.Target.Query{
     // .{ .cpu_arch = .loongarch64, .os_tag = .uefi, .abi = .none },
 
     .{ .cpu_arch = .m68k, .os_tag = .freestanding, .abi = .none },
-    .{ .cpu_arch = .m68k, .os_tag = .haiku, .abi = .none },
     .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .gnu },
     .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .musl },
     .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .none },
@@ -186,8 +185,6 @@ const targets = [_]std.Target.Query{
 
     .{ .cpu_arch = .powerpc, .os_tag = .freestanding, .abi = .eabi },
     .{ .cpu_arch = .powerpc, .os_tag = .freestanding, .abi = .eabihf },
-    .{ .cpu_arch = .powerpc, .os_tag = .haiku, .abi = .eabi },
-    .{ .cpu_arch = .powerpc, .os_tag = .haiku, .abi = .eabihf },
     .{ .cpu_arch = .powerpc, .os_tag = .linux, .abi = .eabi },
     .{ .cpu_arch = .powerpc, .os_tag = .linux, .abi = .eabihf },
     .{ .cpu_arch = .powerpc, .os_tag = .linux, .abi = .musleabi },
@@ -252,7 +249,6 @@ const targets = [_]std.Target.Query{
     .{ .cpu_arch = .sparc, .os_tag = .rtems, .abi = .none },
 
     .{ .cpu_arch = .sparc64, .os_tag = .freestanding, .abi = .none },
-    .{ .cpu_arch = .sparc64, .os_tag = .haiku, .abi = .none },
     .{ .cpu_arch = .sparc64, .os_tag = .linux, .abi = .gnu },
     .{ .cpu_arch = .sparc64, .os_tag = .linux, .abi = .none },
     .{ .cpu_arch = .sparc64, .os_tag = .netbsd, .abi = .none },
-- 
2.54.0