| author | |
| committer | |
| log | 03cc522fc0e3cd2434510eec7c39aa09282f4433 |
| tree | 3e125cac1cc4eebc38e206bedd04cbec2aae9c5b |
| parent | 66014c3de19a49d0c1001dfbbef5a85c375f4e32 |
9 files changed, 15 insertions(+), 18 deletions(-)
lib/std/Build/Configuration.zig-1| ... | ... | @@ -2443,7 +2443,6 @@ pub const TargetQuery = struct { |
| 2443 | 2443 | elf, |
| 2444 | 2444 | hex, |
| 2445 | 2445 | macho, |
| 2446 | spork8, | |
| 2447 | 2446 | plan9, |
| 2448 | 2447 | raw, |
| 2449 | 2448 | spirv, |
lib/std/Target.zig+2-4| ... | ... | @@ -104,7 +104,7 @@ pub const Os = struct { |
| 104 | 104 | .plan9 => arch.plan9Ext(), |
| 105 | 105 | else => switch (arch) { |
| 106 | 106 | .wasm32, .wasm64 => ".wasm", |
| 107 | .spork8 => ".spork8", | |
| 107 | .spork8 => ".bin", | |
| 108 | 108 | else => "", |
| 109 | 109 | }, |
| 110 | 110 | }; |
| ... | ... | @@ -1065,7 +1065,6 @@ pub const ObjectFormat = enum { |
| 1065 | 1065 | hex, |
| 1066 | 1066 | /// The Mach object format used by macOS and other Apple platforms. |
| 1067 | 1067 | macho, |
| 1068 | spork8, | |
| 1069 | 1068 | /// The a.out format used by Plan 9 from Bell Labs. |
| 1070 | 1069 | plan9, |
| 1071 | 1070 | /// Machine code with no metadata. |
| ... | ... | @@ -1081,7 +1080,6 @@ pub const ObjectFormat = enum { |
| 1081 | 1080 | .coff => ".obj", |
| 1082 | 1081 | .elf, .macho, .wasm => ".o", |
| 1083 | 1082 | .hex => ".ihex", |
| 1084 | .spork8 => ".spork8", | |
| 1085 | 1083 | .plan9 => arch.plan9Ext(), |
| 1086 | 1084 | .raw => ".bin", |
| 1087 | 1085 | .spirv => ".spv", |
| ... | ... | @@ -1096,7 +1094,7 @@ pub const ObjectFormat = enum { |
| 1096 | 1094 | else => switch (arch) { |
| 1097 | 1095 | .spirv32, .spirv64 => .spirv, |
| 1098 | 1096 | .wasm32, .wasm64 => .wasm, |
| 1099 | .spork8 => .spork8, | |
| 1097 | .spork8 => .raw, | |
| 1100 | 1098 | else => .elf, |
| 1101 | 1099 | }, |
| 1102 | 1100 | }; |
lib/std/debug.zig+2-2| ... | ... | @@ -75,8 +75,8 @@ pub fn TargetInfo(os: std.Target.Os.Tag, arch: std.Target.Cpu.Arch) type { |
| 75 | 75 | else => @import("debug/SelfInfo/Elf.zig"), |
| 76 | 76 | }, |
| 77 | 77 | .macho => @import("debug/SelfInfo/MachO.zig"), |
| 78 | .plan9, .spirv, .wasm, .spork8 => void, | |
| 79 | .c, .hex, .raw => unreachable, | |
| 78 | .plan9, .spirv, .wasm, .raw, .hex => void, | |
| 79 | .c => unreachable, | |
| 80 | 80 | }; |
| 81 | 81 | } |
| 82 | 82 |
lib/std/zig.zig-1| ... | ... | @@ -259,7 +259,6 @@ pub fn binNameAlloc(allocator: Allocator, options: BinNameOptions) error{OutOfMe |
| 259 | 259 | .spirv => return std.fmt.allocPrint(allocator, "{s}.spv", .{root_name}), |
| 260 | 260 | .hex => return std.fmt.allocPrint(allocator, "{s}.ihex", .{root_name}), |
| 261 | 261 | .raw => return std.fmt.allocPrint(allocator, "{s}.bin", .{root_name}), |
| 262 | .spork8 => return std.fmt.allocPrint(allocator, "{s}.spork8", .{root_name}), | |
| 263 | 262 | .plan9 => switch (options.output_mode) { |
| 264 | 263 | .Exe => return allocator.dupe(u8, root_name), |
| 265 | 264 | .Obj => return std.fmt.allocPrint(allocator, "{s}{s}", .{ |
src/Compilation/Config.zig+1-1| ... | ... | @@ -502,7 +502,7 @@ pub fn resolve(options: Options) ResolveError!Config { |
| 502 | 502 | .windows, .uefi => .code_view, |
| 503 | 503 | else => .{ .dwarf = .@"32" }, |
| 504 | 504 | }, |
| 505 | .spirv, .hex, .raw, .plan9, .spork8 => .strip, | |
| 505 | .spirv, .hex, .raw, .plan9 => .strip, | |
| 506 | 506 | }; |
| 507 | 507 | }; |
| 508 | 508 |
src/codegen.zig+4-4| ... | ... | @@ -80,7 +80,7 @@ pub fn legalizeFeatures(pt: Zcu.PerThread, nav_index: InternPool.Nav.Index) ?*co |
| 80 | 80 | .stage2_x86, |
| 81 | 81 | .stage2_riscv64, |
| 82 | 82 | .stage2_sparc64, |
| 83 | .stage2_spork8, | |
| 83 | .zsf_spork8, | |
| 84 | 84 | .stage2_spirv, |
| 85 | 85 | => |backend| { |
| 86 | 86 | dev.check(devFeatureForBackend(backend)); |
| ... | ... | @@ -122,7 +122,7 @@ pub const AnyMir = union { |
| 122 | 122 | .stage2_wasm => "wasm", |
| 123 | 123 | .stage2_c => "c", |
| 124 | 124 | .stage2_spirv => "spirv", |
| 125 | .stage2_spork8 => "spork8", | |
| 125 | .zsf_spork8 => "spork8", | |
| 126 | 126 | else => unreachable, |
| 127 | 127 | }; |
| 128 | 128 | } |
| ... | ... | @@ -140,7 +140,7 @@ pub const AnyMir = union { |
| 140 | 140 | .stage2_wasm, |
| 141 | 141 | .stage2_c, |
| 142 | 142 | .stage2_spirv, |
| 143 | .stage2_spork8, | |
| 143 | .zsf_spork8, | |
| 144 | 144 | => |backend_ct| @field(mir, tag(backend_ct)).deinit(gpa), |
| 145 | 145 | } |
| 146 | 146 | } |
| ... | ... | @@ -170,7 +170,7 @@ pub fn generateFunction( |
| 170 | 170 | .stage2_x86_64, |
| 171 | 171 | .stage2_wasm, |
| 172 | 172 | .stage2_c, |
| 173 | .stage2_spork8, | |
| 173 | .zsf_spork8, | |
| 174 | 174 | .stage2_spirv, |
| 175 | 175 | => |backend| { |
| 176 | 176 | dev.check(devFeatureForBackend(backend)); |
src/link.zig+4-2| ... | ... | @@ -1300,9 +1300,11 @@ pub const File = struct { |
| 1300 | 1300 | .plan9 => .plan9, |
| 1301 | 1301 | .c => .c, |
| 1302 | 1302 | .spirv => .spirv, |
| 1303 | .spork8 => .spork8, | |
| 1304 | 1303 | .hex => @panic("TODO implement hex object format"), |
| 1305 | .raw => @panic("TODO implement raw object format"), | |
| 1304 | // This may seem surprising at first, but with a little massaging, the spork8 linker | |
| 1305 | // could and probably should be generalized into a "raw linker" which is used to output | |
| 1306 | // bare machine code for any architecture for which a corresponding backend exists. | |
| 1307 | .raw => .spork8, | |
| 1306 | 1308 | }; |
| 1307 | 1309 | } |
| 1308 | 1310 |
src/link/Spork8.zig+2-2| ... | ... | @@ -47,7 +47,7 @@ pub fn createEmpty( |
| 47 | 47 | options: link.File.OpenOptions, |
| 48 | 48 | ) !*Spork8 { |
| 49 | 49 | const target = comp.root_mod.resolved_target.result; |
| 50 | assert(target.ofmt == .spork8); | |
| 50 | assert(target.ofmt == .raw); | |
| 51 | 51 | assert(comp.config.output_mode == .Exe); |
| 52 | 52 | const io = comp.io; |
| 53 | 53 | |
| ... | ... | @@ -90,7 +90,7 @@ pub fn updateFunc( |
| 90 | 90 | any_mir: *const codegen.AnyMir, |
| 91 | 91 | ) !void { |
| 92 | 92 | dev.check(.spork8_backend); |
| 93 | // This linker implementation only works with codegen backend `.stage2_spork8`. | |
| 93 | // This linker implementation only works with `std.lang.CompilerBackend.zsf_spork8`. | |
| 94 | 94 | const mir = &any_mir.spork8; |
| 95 | 95 | const zcu = pt.zcu; |
| 96 | 96 | const gpa = zcu.gpa; |
src/target.zig-1| ... | ... | @@ -189,7 +189,6 @@ pub fn hasLlvmSupport(target: *const std.Target, ofmt: std.Target.ObjectFormat) |
| 189 | 189 | // LLVM does not support these object formats: |
| 190 | 190 | .c, |
| 191 | 191 | .plan9, |
| 192 | .spork8, | |
| 193 | 192 | => return false, |
| 194 | 193 | |
| 195 | 194 | .coff, |