authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-12-02 12:01:49-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-12-02 12:01:49-05:00
logdcbd5ad1553c5994353de47babc0e07e02153bd8
tree0f862b9c2cd27c437855411eb25bc19866500b88
parentfc1373a85d55698575f361100f0867e15d6ec1d3
signaturelock-open Commit is signed but in an unrecognized format.

remove upstream support for Zen hobby OS

The new plan to support hobby operating systems is #3784. And what kind of name is "Zen" anyway? There's already a [Zen programming language](http://zenlang.sourceforge.net/) and that's just confusing.

7 files changed, 0 insertions(+), 27 deletions(-)

lib/std/os.zig-3
...@@ -31,7 +31,6 @@ pub const linux = @import("os/linux.zig");...@@ -31,7 +31,6 @@ pub const linux = @import("os/linux.zig");
31pub const uefi = @import("os/uefi.zig");31pub const uefi = @import("os/uefi.zig");
32pub const wasi = @import("os/wasi.zig");32pub const wasi = @import("os/wasi.zig");
33pub const windows = @import("os/windows.zig");33pub const windows = @import("os/windows.zig");
34pub const zen = @import("os/zen.zig");
3534
36comptime {35comptime {
37 assert(@import("std") == std); // std lib tests require --override-lib-dir36 assert(@import("std") == std); // std lib tests require --override-lib-dir
...@@ -45,7 +44,6 @@ test "" {...@@ -45,7 +44,6 @@ test "" {
45 _ = uefi;44 _ = uefi;
46 _ = wasi;45 _ = wasi;
47 _ = windows;46 _ = windows;
48 _ = zen;
4947
50 _ = @import("os/test.zig");48 _ = @import("os/test.zig");
51}49}
...@@ -59,7 +57,6 @@ pub const system = if (builtin.link_libc) std.c else switch (builtin.os) {...@@ -59,7 +57,6 @@ pub const system = if (builtin.link_libc) std.c else switch (builtin.os) {
59 .dragonfly => dragonfly,57 .dragonfly => dragonfly,
60 .wasi => wasi,58 .wasi => wasi,
61 .windows => windows,59 .windows => windows,
62 .zen => zen,
63 else => struct {},60 else => struct {},
64};61};
6562
lib/std/target.zig-2
...@@ -45,7 +45,6 @@ pub const Target = union(enum) {...@@ -45,7 +45,6 @@ pub const Target = union(enum) {
45 hurd,45 hurd,
46 wasi,46 wasi,
47 emscripten,47 emscripten,
48 zen,
49 uefi,48 uefi,
50 };49 };
5150
...@@ -432,7 +431,6 @@ pub const Target = union(enum) {...@@ -432,7 +431,6 @@ pub const Target = union(enum) {
432 .mesa3d,431 .mesa3d,
433 .contiki,432 .contiki,
434 .amdpal,433 .amdpal,
435 .zen,
436 .hermit,434 .hermit,
437 => return .eabi,435 => return .eabi,
438 .openbsd,436 .openbsd,
src-self-hosted/c_int.zig-1
...@@ -105,7 +105,6 @@ pub const CInt = struct {...@@ -105,7 +105,6 @@ pub const CInt = struct {
105 .macosx,105 .macosx,
106 .freebsd,106 .freebsd,
107 .openbsd,107 .openbsd,
108 .zen,
109 => switch (cint.id) {108 => switch (cint.id) {
110 .Short,109 .Short,
111 .UShort,110 .UShort,
src-self-hosted/link.zig-7
...@@ -304,13 +304,6 @@ fn constructLinkerArgsElf(ctx: *Context) !void {...@@ -304,13 +304,6 @@ fn constructLinkerArgsElf(ctx: *Context) !void {
304 if (ctx.comp.target != Target.Native) {304 if (ctx.comp.target != Target.Native) {
305 try ctx.args.append("--allow-shlib-undefined");305 try ctx.args.append("--allow-shlib-undefined");
306 }306 }
307
308 if (ctx.comp.target.getOs() == .zen) {
309 try ctx.args.append("-e");
310 try ctx.args.append("_start");
311
312 try ctx.args.append("--image-base=0x10000000");
313 }
314}307}
315308
316fn addPathJoin(ctx: *Context, dirname: []const u8, basename: []const u8) !void {309fn addPathJoin(ctx: *Context, dirname: []const u8, basename: []const u8) !void {
src/link.cpp-6
...@@ -1831,12 +1831,6 @@ static void construct_linker_job_elf(LinkJob *lj) {...@@ -1831,12 +1831,6 @@ static void construct_linker_job_elf(LinkJob *lj) {
1831 if (!g->zig_target->is_native) {1831 if (!g->zig_target->is_native) {
1832 lj->args.append("--allow-shlib-undefined");1832 lj->args.append("--allow-shlib-undefined");
1833 }1833 }
1834
1835 if (g->zig_target->os == OsZen) {
1836 lj->args.append("-e");
1837 lj->args.append("_start");
1838 lj->args.append("--image-base=0x10000000");
1839 }
1840}1834}
18411835
1842static void construct_linker_job_wasm(LinkJob *lj) {1836static void construct_linker_job_wasm(LinkJob *lj) {
src/target.cpp-7
...@@ -179,7 +179,6 @@ static const Os os_list[] = {...@@ -179,7 +179,6 @@ static const Os os_list[] = {
179 OsHurd,179 OsHurd,
180 OsWASI,180 OsWASI,
181 OsEmscripten,181 OsEmscripten,
182 OsZen,
183 OsUefi,182 OsUefi,
184};183};
185184
...@@ -269,7 +268,6 @@ Os target_os_enum(size_t index) {...@@ -269,7 +268,6 @@ Os target_os_enum(size_t index) {
269ZigLLVM_OSType get_llvm_os_type(Os os_type) {268ZigLLVM_OSType get_llvm_os_type(Os os_type) {
270 switch (os_type) {269 switch (os_type) {
271 case OsFreestanding:270 case OsFreestanding:
272 case OsZen:
273 return ZigLLVM_UnknownOS;271 return ZigLLVM_UnknownOS;
274 case OsAnanas:272 case OsAnanas:
275 return ZigLLVM_Ananas;273 return ZigLLVM_Ananas;
...@@ -425,8 +423,6 @@ const char *target_os_name(Os os_type) {...@@ -425,8 +423,6 @@ const char *target_os_name(Os os_type) {
425 switch (os_type) {423 switch (os_type) {
426 case OsFreestanding:424 case OsFreestanding:
427 return "freestanding";425 return "freestanding";
428 case OsZen:
429 return "zen";
430 case OsUefi:426 case OsUefi:
431 return "uefi";427 return "uefi";
432 case OsAnanas:428 case OsAnanas:
...@@ -1047,7 +1043,6 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {...@@ -1047,7 +1043,6 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
1047 }1043 }
1048 case OsLinux:1044 case OsLinux:
1049 case OsMacOSX:1045 case OsMacOSX:
1050 case OsZen:
1051 case OsFreeBSD:1046 case OsFreeBSD:
1052 case OsNetBSD:1047 case OsNetBSD:
1053 case OsDragonFly:1048 case OsDragonFly:
...@@ -1404,7 +1399,6 @@ const char *target_dynamic_linker(const ZigTarget *target) {...@@ -1404,7 +1399,6 @@ const char *target_dynamic_linker(const ZigTarget *target) {
1404 case OsMesa3D:1399 case OsMesa3D:
1405 case OsContiki:1400 case OsContiki:
1406 case OsAMDPAL:1401 case OsAMDPAL:
1407 case OsZen:
1408 case OsHermitCore:1402 case OsHermitCore:
1409 case OsHurd:1403 case OsHurd:
1410 case OsWASI:1404 case OsWASI:
...@@ -1655,7 +1649,6 @@ ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) {...@@ -1655,7 +1649,6 @@ ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) {
1655 case OsMesa3D:1649 case OsMesa3D:
1656 case OsContiki:1650 case OsContiki:
1657 case OsAMDPAL:1651 case OsAMDPAL:
1658 case OsZen:
1659 case OsHermitCore:1652 case OsHermitCore:
1660 return ZigLLVM_EABI;1653 return ZigLLVM_EABI;
1661 case OsOpenBSD:1654 case OsOpenBSD:
src/target.hpp-1
...@@ -49,7 +49,6 @@ enum Os {...@@ -49,7 +49,6 @@ enum Os {
49 OsHurd,49 OsHurd,
50 OsWASI,50 OsWASI,
51 OsEmscripten,51 OsEmscripten,
52 OsZen,
53 OsUefi,52 OsUefi,
54};53};
5554