From 1c5c72543181ae7a5c069f42542737186307996f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Wed, 21 Oct 2026 09:16:08 +0200 Subject: [PATCH] remove mips64el-openbsd support OpenBSD 8.0 dropped this target. --- lib/std/Target.zig | 1 - lib/std/debug/SelfInfo/Elf.zig | 1 - lib/std/debug/cpu_context.zig | 2 +- lib/std/heap.zig | 4 ++-- lib/std/zig/target.zig | 1 - src/libs/openbsd.zig | 1 - test/llvm/matrix.zon | 1 - test/tests.zig | 9 --------- 8 files changed, 3 insertions(+), 17 deletions(-) diff --git a/lib/std/Target.zig b/lib/std/Target.zig index cc75e0ab49dd714197dd8cb197dc0b9b3049b5dd..ebe8b0af7d0f9b32fed2492069e9819e71aa1fd3 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -2907,7 +2907,6 @@ pub const DynamicLinker = struct { .hppa, .m88k, .mips64, - .mips64el, .powerpc, .powerpc64, .riscv64, diff --git a/lib/std/debug/SelfInfo/Elf.zig b/lib/std/debug/SelfInfo/Elf.zig index 93cee2810793e22208c86dd63b09b420f7f7f089..af6bf48aaa718c75eacb22abb4445ce1b1483a6a 100644 --- a/lib/std/debug/SelfInfo/Elf.zig +++ b/lib/std/debug/SelfInfo/Elf.zig @@ -189,7 +189,6 @@ pub const can_unwind: bool = s: { .arm, .m88k, .mips64, - .mips64el, .riscv64, .x86, .x86_64, diff --git a/lib/std/debug/cpu_context.zig b/lib/std/debug/cpu_context.zig index f5e5943848ce1fbb1177114583b5e603cce76c61..c90bc5a3bae86e361b3c3733b78b82f2357fb2fa 100644 --- a/lib/std/debug/cpu_context.zig +++ b/lib/std/debug/cpu_context.zig @@ -2534,7 +2534,7 @@ const signal_ucontext_t = switch (native_os) { }, }, // https://github.com/openbsd/src/blob/42468faed8369d07ae49ae02dd71ec34f59b66cd/sys/arch/mips64/include/signal.h - .mips64, .mips64el => extern struct { + .mips64 => extern struct { _cookie: i64, _mask: i64, mcontext: extern struct { diff --git a/lib/std/heap.zig b/lib/std/heap.zig index 7e56bcfb5c6b1551e34e29e39904eba2e1643db8..e297b7f9870d0821bc04689feecbe41d7b99a763 100644 --- a/lib/std/heap.zig +++ b/lib/std/heap.zig @@ -624,7 +624,7 @@ const page_size_min_default: ?usize = switch (builtin.os.tag) { .x86, .x86_64 => 4 << 10, .thumb, .thumbeb, .arm, .armeb, .aarch64, .aarch64_be => 4 << 10, .m88k => 4 << 10, - .mips64, .mips64el => 4 << 10, + .mips64 => 4 << 10, .powerpc, .powerpc64, .powerpc64le, .powerpcle => 4 << 10, .riscv64 => 4 << 10, .sh, .sheb => 4 << 10, @@ -788,7 +788,7 @@ const page_size_max_default: ?usize = switch (builtin.os.tag) { .x86, .x86_64 => 4 << 10, .thumb, .thumbeb, .arm, .armeb, .aarch64, .aarch64_be => 4 << 10, .m88k => 4 << 10, - .mips64, .mips64el => 16 << 10, + .mips64 => 16 << 10, .powerpc, .powerpc64, .powerpc64le, .powerpcle => 4 << 10, .riscv64 => 4 << 10, .sh, .sheb => 4 << 10, diff --git a/lib/std/zig/target.zig b/lib/std/zig/target.zig index 7dc176756ec65c3ec9b4737c40c1a2c8314aed66..ff82823c89278d7fd886625b551ffee1b7c4e3f4 100644 --- a/lib/std/zig/target.zig +++ b/lib/std/zig/target.zig @@ -77,7 +77,6 @@ pub const available_libcs = [_]ArchOsAbi{ .{ .arch = .mips64el, .os = .linux, .abi = .gnuabin32, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 }, .glibc_triple = "mips64el-linux-gnu-n32" }, .{ .arch = .mips64el, .os = .linux, .abi = .muslabi64, .os_ver = .{ .major = 2, .minor = 3, .patch = 48 } }, .{ .arch = .mips64el, .os = .linux, .abi = .muslabin32, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 } }, - .{ .arch = .mips64el, .os = .openbsd, .abi = .none, .os_ver = .{ .major = 4, .minor = 7, .patch = 0 } }, .{ .arch = .powerpc, .os = .linux, .abi = .musleabi, .os_ver = .{ .major = 1, .minor = 3, .patch = 45 } }, .{ .arch = .powerpc, .os = .linux, .abi = .musleabihf, .os_ver = .{ .major = 1, .minor = 3, .patch = 45 } }, .{ .arch = .powerpc, .os = .netbsd, .abi = .eabihf, .os_ver = .{ .major = 1, .minor = 4, .patch = 0 } }, diff --git a/src/libs/openbsd.zig b/src/libs/openbsd.zig index b16c0189f8a8fca0713f220c6dd41aaaadb2f940..be9f11f89790ff9cc5f87bfbea8b9ecbe7f8a531 100644 --- a/src/libs/openbsd.zig +++ b/src/libs/openbsd.zig @@ -90,7 +90,6 @@ pub fn buildCrtFile(comp: *Compilation, crt_file: CrtFile, prog_node: std.Progre try includePath(comp, arena, "generic-openbsd"), "-I", try csuPath(comp, arena, switch (target.cpu.arch) { - .mips64el => "mips64", .x86 => "i386", .x86_64 => "amd64", else => |t| @tagName(t), diff --git a/test/llvm/matrix.zon b/test/llvm/matrix.zon index 8dafd5efada10939b1ca29d4f9d16f166907b03c..f2aa87c2c841a7e1bae7a551a684a9c44641b2f5 100644 --- a/test/llvm/matrix.zon +++ b/test/llvm/matrix.zon @@ -173,7 +173,6 @@ .{ .cpu = .{ .mips64el = .{} }, .os = .{ .linux = .{} }, .abi = .{ .muslabi64 = .{} }, .cache_mode = .whole, .backend = .llvm, .linker = .lld, .pic = .pic }, .{ .cpu = .{ .mips64el = .{} }, .os = .{ .linux = .{} }, .abi = .{ .muslabin32 = .{} }, .cache_mode = .whole, .backend = .llvm, .linker = .lld, .pic = .pic }, .{ .cpu = .{ .mips64el = .{} }, .os = .{ .linux = .{} }, .abi = .{ .none = .{} }, .cache_mode = .whole, .backend = .llvm, .linker = .lld, .pic = .pic }, - .{ .cpu = .{ .mips64el = .{} }, .os = .{ .openbsd = .{} }, .abi = .{ .none = .{} }, .cache_mode = .whole, .backend = .llvm, .linker = .lld, .pic = .pic }, .{ .cpu = .{ .msp430 = .{} }, .os = .{ .freestanding = .{} }, .abi = .{ .none = .{} }, .cache_mode = .whole, .backend = .llvm, .linker = .lld, .pic = .pic }, diff --git a/test/tests.zig b/test/tests.zig index 3ed14aedd5f077e47896465829564134db178d7c..8a720c621bc7e9001e500400278a891ad0aa3c3a 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -1528,15 +1528,6 @@ const module_test_targets = blk: { .link_libc = true, }, - .{ - .target = .{ - .cpu_arch = .mips64el, - .os_tag = .openbsd, - .abi = .none, - }, - .link_libc = true, - }, - .{ .target = .{ .cpu_arch = .powerpc, -- 2.54.0