From b49b7501cf040349eb6d86b63041c5152f23e5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Tue, 30 Jul 2024 02:17:00 +0200 Subject: [PATCH] std.Target: Remove `cloudabi` OS tag. It's discontinued in favor of WASI. https://github.com/NuxiNL/cloudlibc --- lib/compiler/aro/aro/target.zig | 1 - lib/std/Target.zig | 7 ------- src/codegen/llvm.zig | 2 -- 3 files changed, 10 deletions(-) diff --git a/lib/compiler/aro/aro/target.zig b/lib/compiler/aro/aro/target.zig index f5387212815a52191231278f27a2051c4b4f4e26..2f46ebd605404f533ef0b6ace0652d8807dbdf89 100644 --- a/lib/compiler/aro/aro/target.zig +++ b/lib/compiler/aro/aro/target.zig @@ -614,7 +614,6 @@ pub fn toLLVMTriple(target: std.Target, buf: []u8) []const u8 { const llvm_os = switch (target.os.tag) { .freestanding => "unknown", - .cloudabi => "cloudabi", .dragonfly => "dragonfly", .freebsd => "freebsd", .fuchsia => "fuchsia", diff --git a/lib/std/Target.zig b/lib/std/Target.zig index 3557bc1c7200980089e6cd1848937134a14a8d18..190a2e553fe747292f78796017a6306bdc6e8218 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -17,7 +17,6 @@ pub const Os = struct { pub const Tag = enum { freestanding, - cloudabi, dragonfly, freebsd, fuchsia, @@ -139,7 +138,6 @@ pub const Os = struct { pub inline fn getVersionRangeTag(tag: Tag) @typeInfo(TaggedVersionRange).Union.tag_type.? { return switch (tag) { .freestanding, - .cloudabi, .fuchsia, .ps3, .zos, @@ -370,7 +368,6 @@ pub const Os = struct { pub fn default(tag: Tag, arch: Cpu.Arch) VersionRange { return switch (tag) { .freestanding, - .cloudabi, .fuchsia, .ps3, .zos, @@ -556,7 +553,6 @@ pub const Os = struct { .linux, .windows, .freestanding, - .cloudabi, .fuchsia, .ps3, .zos, @@ -662,7 +658,6 @@ pub const Abi = enum { pub fn default(arch: Cpu.Arch, os: Os) Abi { return if (arch.isWasm()) .musl else switch (os.tag) { .freestanding, - .cloudabi, .dragonfly, .ps3, .zos, @@ -1791,7 +1786,6 @@ pub const DynamicLinker = struct { // TODO go over each item in this list and either move it to the above list, or // implement the standard dynamic linker path code for it. - .cloudabi, .fuchsia, .ps3, .zos, @@ -2275,7 +2269,6 @@ pub fn c_type_bit_size(target: Target, c_type: CType) u16 { .longdouble => return 80, }, - .cloudabi, .ps3, .zos, .rtems, diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index 8f042cf265645275ab9884e32c3edfeb4721e89b..23e39caa987a7f8130700211bafa1a14f7c958c1 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -133,7 +133,6 @@ pub fn targetTriple(allocator: Allocator, target: std.Target) ![]const u8 { .opencl, .glsl450, .plan9, - .cloudabi, .minix, .contiki, .other, @@ -204,7 +203,6 @@ pub fn targetOs(os_tag: std.Target.Os.Tag) llvm.OSType { .opencl, .glsl450, .plan9, - .cloudabi, .minix, .contiki, => .UnknownOS, -- 2.54.0