diff --git a/lib/compiler/aro/aro/Target.zig b/lib/compiler/aro/aro/Target.zig index c1e42cece2c4e4f557ca1b9265cc7429fdc9ca7d..18743e1c66d0bae7d273be4b8f8a8f70422ead3c 100644 --- a/lib/compiler/aro/aro/Target.zig +++ b/lib/compiler/aro/aro/Target.zig @@ -1302,7 +1302,6 @@ pub fn toLLVMTriple(target: *const Target, buf: []u8) []const u8 { .freestanding => "unknown", .fuchsia => "fuchsia", .haiku => "haiku", - .hermit => "hermit", .hurd => "hurd", .illumos => "illumos", .ios, .maccatalyst => "ios", diff --git a/lib/std/Build/Configuration.zig b/lib/std/Build/Configuration.zig index 53bd11500b0d70d4448bd461cfcd924fec6482a2..fe2dd424471b4f7524c169d18f423a5cd0fb1add 100644 --- a/lib/std/Build/Configuration.zig +++ b/lib/std/Build/Configuration.zig @@ -2381,7 +2381,6 @@ pub const TargetQuery = struct { other, contiki, fuchsia, - hermit, managarm, haiku, hurd, diff --git a/lib/std/Target.zig b/lib/std/Target.zig index 9900737e847c002383d8e4dd546b0a23066ebd5f..cd9c8e3260535f929d08f724be7b48c517db9936 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -21,7 +21,6 @@ pub const Os = struct { contiki, fuchsia, - hermit, managarm, haiku, @@ -180,7 +179,6 @@ pub const Os = struct { .contiki, .fuchsia, - .hermit, .rtems, @@ -431,12 +429,6 @@ pub const Os = struct { .max = .{ .major = 30, .minor = 0, .patch = 0 }, }, }, - .hermit => .{ - .semver = .{ - .min = .{ .major = 0, .minor = 8, .patch = 0 }, - .max = .{ .major = 0, .minor = 13, .patch = 2 }, - }, - }, .hurd => .{ .hurd = .{ @@ -955,7 +947,6 @@ pub const Abi = enum { .ashetos => .eabi, .contiki, - .hermit, .illumos, .managarm, .plan9, @@ -2344,7 +2335,6 @@ pub fn requiresLibC(target: *const Target) bool { .mesa3d, .contiki, .amdpal, - .hermit, .hurd, .wasi, .uefi, @@ -2495,7 +2485,6 @@ pub const DynamicLinker = struct { .other, .contiki, - .hermit, .managarm, // Needs to be double-checked. .plan9, @@ -2929,7 +2918,6 @@ pub const DynamicLinker = struct { .other, .contiki, - .hermit, .plan9, .rtems, @@ -3318,7 +3306,6 @@ pub fn cTypeBitSize(target: *const Target, c_type: CType) ?u16 { }, .fuchsia, - .hermit, .haiku, .hurd, diff --git a/lib/std/c.zig b/lib/std/c.zig index 24ca60ab2c3c4ad4022bc82a5d2c40ed4056c15d..9fa2831981cee84b0acb45af891e5897f396d329 100644 --- a/lib/std/c.zig +++ b/lib/std/c.zig @@ -8024,9 +8024,6 @@ pub const pthread_mutex_t = switch (native_os) { .freebsd, .dragonfly, .openbsd => extern struct { inner: ?*anyopaque = null, }, - .hermit => extern struct { - ptr: usize = maxInt(usize), - }, .netbsd => extern struct { magic: u32 = 0x33330003, errorcheck: padded_pthread_spin_t = 0, @@ -8080,9 +8077,6 @@ pub const pthread_cond_t = switch (native_os) { .freebsd, .dragonfly, .openbsd => extern struct { inner: ?*anyopaque = null, }, - .hermit => extern struct { - ptr: usize = maxInt(usize), - }, .netbsd => extern struct { magic: u32 = 0x55550005, lock: pthread_spin_t = 0, @@ -8138,9 +8132,6 @@ pub const pthread_rwlock_t = switch (native_os) { .freebsd, .dragonfly, .openbsd => extern struct { ptr: ?*anyopaque = null, }, - .hermit => extern struct { - ptr: usize = maxInt(usize), - }, .netbsd => extern struct { magic: c_uint = 0x99990009, interlock: switch (builtin.cpu.arch) { diff --git a/lib/std/zig/llvm/Builder.zig b/lib/std/zig/llvm/Builder.zig index 25f2950ab1cb634eda06a56445edec4a917dcb7a..7ba94f5e9eff4da4c665e1c31848d1302f8dbf83 100644 --- a/lib/std/zig/llvm/Builder.zig +++ b/lib/std/zig/llvm/Builder.zig @@ -269,7 +269,6 @@ pub fn tripleForTarget(allocator: Allocator, target: *const std.Target) ![]const .ps5 => "ps5", .mesa3d => "mesa3d", .amdpal => "amdpal", - .hermit => "hermit", .hurd => "hurd", .wasi => "wasi", .emscripten => "emscripten", diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 035f40ebe214771d1a5aa669578a8da1b4a98f72..828f707582aa3753709e623e1662641fd505358b 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -1547,7 +1547,6 @@ pub fn writeElfHeader(self: *Elf) !void { .msp430 => .STANDALONE, else => switch (target.os.tag) { .freebsd, .ps4 => .FREEBSD, - .hermit => .STANDALONE, .illumos => .SOLARIS, .openbsd => .OPENBSD, else => .NONE, diff --git a/test/llvm_targets.zig b/test/llvm_targets.zig index 692ce5cff86919075253725900fbf192838f13dc..60d84c3dee78afaa168966c7a4de03fb98a66305 100644 --- a/test/llvm_targets.zig +++ b/test/llvm_targets.zig @@ -7,7 +7,6 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .aarch64, .os_tag = .freestanding, .abi = .none }, .{ .cpu_arch = .aarch64, .os_tag = .fuchsia, .abi = .none }, .{ .cpu_arch = .aarch64, .os_tag = .haiku, .abi = .none }, - .{ .cpu_arch = .aarch64, .os_tag = .hermit, .abi = .none }, .{ .cpu_arch = .aarch64, .os_tag = .hurd, .abi = .gnu }, .{ .cpu_arch = .aarch64, .os_tag = .ios, .abi = .none }, .{ .cpu_arch = .aarch64, .os_tag = .ios, .abi = .simulator }, @@ -230,7 +229,6 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .riscv64, .os_tag = .freestanding, .abi = .none }, .{ .cpu_arch = .riscv64, .os_tag = .fuchsia, .abi = .none }, .{ .cpu_arch = .riscv64, .os_tag = .haiku, .abi = .none }, - .{ .cpu_arch = .riscv64, .os_tag = .hermit, .abi = .none }, .{ .cpu_arch = .riscv64, .os_tag = .hurd, .abi = .gnu }, .{ .cpu_arch = .riscv64, .os_tag = .linux, .abi = .android }, .{ .cpu_arch = .riscv64, .os_tag = .linux, .abi = .gnu }, @@ -326,7 +324,6 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .x86_64, .os_tag = .dragonfly, .abi = .none }, .{ .cpu_arch = .x86_64, .os_tag = .driverkit, .abi = .none }, .{ .cpu_arch = .x86_64, .os_tag = .haiku, .abi = .none }, - .{ .cpu_arch = .x86_64, .os_tag = .hermit, .abi = .none }, .{ .cpu_arch = .x86_64, .os_tag = .hurd, .abi = .gnu }, .{ .cpu_arch = .x86_64, .os_tag = .illumos, .abi = .none }, .{ .cpu_arch = .x86_64, .os_tag = .linux, .abi = .android },