diff --git a/lib/std/os.zig b/lib/std/os.zig index c06c1dedf53b549ee966f77365f978f38cc26904..66a5522ac1d21c8cdc6d2cda2d02064482dcac1c 100644 --- a/lib/std/os.zig +++ b/lib/std/os.zig @@ -31,7 +31,6 @@ pub const linux = @import("os/linux.zig"); pub const uefi = @import("os/uefi.zig"); pub const wasi = @import("os/wasi.zig"); pub const windows = @import("os/windows.zig"); -pub const zen = @import("os/zen.zig"); comptime { assert(@import("std") == std); // std lib tests require --override-lib-dir @@ -45,7 +44,6 @@ test "" { _ = uefi; _ = wasi; _ = windows; - _ = zen; _ = @import("os/test.zig"); } @@ -59,7 +57,6 @@ pub const system = if (builtin.link_libc) std.c else switch (builtin.os) { .dragonfly => dragonfly, .wasi => wasi, .windows => windows, - .zen => zen, else => struct {}, }; diff --git a/lib/std/target.zig b/lib/std/target.zig index 685533f67ef6004701e344bcad7baa4c99eb30e6..cdabf7448d8dc22f35ed2d0e379759fa80bbab70 100644 --- a/lib/std/target.zig +++ b/lib/std/target.zig @@ -45,7 +45,6 @@ pub const Target = union(enum) { hurd, wasi, emscripten, - zen, uefi, }; @@ -432,7 +431,6 @@ pub const Target = union(enum) { .mesa3d, .contiki, .amdpal, - .zen, .hermit, => return .eabi, .openbsd, diff --git a/src-self-hosted/c_int.zig b/src-self-hosted/c_int.zig index 00c521a1672dca9ff32e3afa08cbf798acfa42ab..b68137bbd4e39284a17c064ee2d07a50f3de1194 100644 --- a/src-self-hosted/c_int.zig +++ b/src-self-hosted/c_int.zig @@ -105,7 +105,6 @@ pub const CInt = struct { .macosx, .freebsd, .openbsd, - .zen, => switch (cint.id) { .Short, .UShort, diff --git a/src-self-hosted/link.zig b/src-self-hosted/link.zig index 68e16020c952ab9b8fd29d11a61625c757981520..339acfd3ef98f91ae6ff724eae14dd850ee2efd9 100644 --- a/src-self-hosted/link.zig +++ b/src-self-hosted/link.zig @@ -304,13 +304,6 @@ fn constructLinkerArgsElf(ctx: *Context) !void { if (ctx.comp.target != Target.Native) { try ctx.args.append("--allow-shlib-undefined"); } - - if (ctx.comp.target.getOs() == .zen) { - try ctx.args.append("-e"); - try ctx.args.append("_start"); - - try ctx.args.append("--image-base=0x10000000"); - } } fn addPathJoin(ctx: *Context, dirname: []const u8, basename: []const u8) !void { diff --git a/src/link.cpp b/src/link.cpp index c115ffe2fdcec6639cf7a0068a3fc81d4c2289c3..530a0c27c45ddce4d58d1f820316ef283a2bd8c8 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -1831,12 +1831,6 @@ static void construct_linker_job_elf(LinkJob *lj) { if (!g->zig_target->is_native) { lj->args.append("--allow-shlib-undefined"); } - - if (g->zig_target->os == OsZen) { - lj->args.append("-e"); - lj->args.append("_start"); - lj->args.append("--image-base=0x10000000"); - } } static void construct_linker_job_wasm(LinkJob *lj) { diff --git a/src/target.cpp b/src/target.cpp index 538f836f2424d46cd8f4de635809d80713394610..8705cfd29c495b691d6eb1ca9ddf45d18599357e 100644 --- a/src/target.cpp +++ b/src/target.cpp @@ -179,7 +179,6 @@ static const Os os_list[] = { OsHurd, OsWASI, OsEmscripten, - OsZen, OsUefi, }; @@ -269,7 +268,6 @@ Os target_os_enum(size_t index) { ZigLLVM_OSType get_llvm_os_type(Os os_type) { switch (os_type) { case OsFreestanding: - case OsZen: return ZigLLVM_UnknownOS; case OsAnanas: return ZigLLVM_Ananas; @@ -425,8 +423,6 @@ const char *target_os_name(Os os_type) { switch (os_type) { case OsFreestanding: return "freestanding"; - case OsZen: - return "zen"; case OsUefi: return "uefi"; case OsAnanas: @@ -1047,7 +1043,6 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) { } case OsLinux: case OsMacOSX: - case OsZen: case OsFreeBSD: case OsNetBSD: case OsDragonFly: @@ -1404,7 +1399,6 @@ const char *target_dynamic_linker(const ZigTarget *target) { case OsMesa3D: case OsContiki: case OsAMDPAL: - case OsZen: case OsHermitCore: case OsHurd: case OsWASI: @@ -1655,7 +1649,6 @@ ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) { case OsMesa3D: case OsContiki: case OsAMDPAL: - case OsZen: case OsHermitCore: return ZigLLVM_EABI; case OsOpenBSD: diff --git a/src/target.hpp b/src/target.hpp index e6b152be53ace68e46962177f9cc42f639dfeb2e..8297d528f9067425452a3152b85d7927942b5c56 100644 --- a/src/target.hpp +++ b/src/target.hpp @@ -49,7 +49,6 @@ enum Os { OsHurd, OsWASI, OsEmscripten, - OsZen, OsUefi, };