diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-12-15 15:47:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-15 15:47:22 -0500 |
| commit | eb5c9317aabe0e75ceec00dc1d194e574e9296e7 (patch) | |
| tree | 81ebc208916c7fd7789aeb4b1f41359a7fe69340 /lib/std | |
| parent | 12f0c383475df1d0bd0e1a7aee58090e2cb23eb7 (diff) | |
| parent | 6066e7bfd189019850deec9a32cfe51a7f0546a3 (diff) | |
| download | zig-eb5c9317aabe0e75ceec00dc1d194e574e9296e7.tar.gz zig-eb5c9317aabe0e75ceec00dc1d194e574e9296e7.zip | |
Merge pull request #22240 from alexrp/wasm32-freestanding-musl
Remove `wasm32-freestanding-musl`
Diffstat (limited to 'lib/std')
| -rw-r--r-- | lib/std/Target.zig | 2 | ||||
| -rw-r--r-- | lib/std/zig/target.zig | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/std/Target.zig b/lib/std/Target.zig index 29306e3729..476d7a6f8d 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -815,7 +815,7 @@ pub const Abi = enum { // - vertex pub fn default(arch: Cpu.Arch, os: Os) Abi { - return if (arch.isWasm()) .musl else switch (os.tag) { + return switch (os.tag) { .freestanding, .other => switch (arch) { // Soft float is usually a sane default for freestanding. .arm, diff --git a/lib/std/zig/target.zig b/lib/std/zig/target.zig index 5ba2f557fb..077e7090a8 100644 --- a/lib/std/zig/target.zig +++ b/lib/std/zig/target.zig @@ -70,7 +70,6 @@ pub const available_libcs = [_]ArchOsAbi{ .{ .arch = .s390x, .os = .linux, .abi = .musl }, .{ .arch = .sparc, .os = .linux, .abi = .gnu, .glibc_triple = "sparcv9-linux-gnu" }, .{ .arch = .sparc64, .os = .linux, .abi = .gnu }, - .{ .arch = .wasm32, .os = .freestanding, .abi = .musl }, .{ .arch = .wasm32, .os = .wasi, .abi = .musl }, .{ .arch = .x86, .os = .linux, .abi = .gnu }, .{ .arch = .x86, .os = .linux, .abi = .musl }, |