diff --git a/lib/compiler/aro/aro/target.zig b/lib/compiler/aro/aro/target.zig index b84788429a..5b05e5c9b6 100644 --- a/lib/compiler/aro/aro/target.zig +++ b/lib/compiler/aro/aro/target.zig @@ -482,7 +482,6 @@ pub fn get32BitArchVariant(target: std.Target) ?std.Target { .spirv, .spirv32, .loongarch32, - .dxil, .xtensa, => {}, // Already 32 bit @@ -509,7 +508,6 @@ pub fn get64BitArchVariant(target: std.Target) ?std.Target { .arc, .avr, .csky, - .dxil, .hexagon, .kalimba, .lanai, @@ -578,7 +576,6 @@ pub fn toLLVMTriple(target: std.Target, buf: []u8) []const u8 { .bpfel => "bpfel", .bpfeb => "bpfeb", .csky => "csky", - .dxil => "dxil", .hexagon => "hexagon", .loongarch32 => "loongarch32", .loongarch64 => "loongarch64", @@ -702,21 +699,6 @@ pub fn toLLVMTriple(target: std.Target, buf: []u8) []const u8 { .cygnus => "cygnus", .simulator => "simulator", .macabi => "macabi", - .pixel => "pixel", - .vertex => "vertex", - .geometry => "geometry", - .hull => "hull", - .domain => "domain", - .compute => "compute", - .library => "library", - .raygeneration => "raygeneration", - .intersection => "intersection", - .anyhit => "anyhit", - .closesthit => "closesthit", - .miss => "miss", - .callable => "callable", - .mesh => "mesh", - .amplification => "amplification", .ohos => "openhos", }; writer.writeAll(llvm_abi) catch unreachable; diff --git a/lib/std/Target.zig b/lib/std/Target.zig index 58fbaab8b1..146af1cf9f 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -673,26 +673,26 @@ pub const Abi = enum { cygnus, simulator, macabi, - pixel, - vertex, - geometry, - hull, - domain, - compute, - library, - raygeneration, - intersection, - anyhit, - closesthit, - miss, - callable, - mesh, - amplification, ohos, // LLVM tags deliberately omitted: - // - gnuf64 + // - amplification + // - anyhit + // - callable + // - closesthit + // - compute // - coreclr + // - domain + // - geometry + // - gnuf64 + // - hull + // - intersection + // - library + // - mesh + // - miss + // - pixel + // - raygeneration + // - vertex pub fn default(arch: Cpu.Arch, os: Os) Abi { return if (arch.isWasm()) .musl else switch (os.tag) { @@ -788,8 +788,6 @@ pub const ObjectFormat = enum { c, /// The Common Object File Format used by Windows and UEFI. coff, - /// The DirectX Container format containing either DXIL or DXBC. - dxcontainer, /// The Executable and Linkable Format used by many Unixes. elf, /// The Generalized Object File Format used by z/OS. @@ -811,11 +809,13 @@ pub const ObjectFormat = enum { /// The eXtended Common Object File Format used by AIX. xcoff, + // LLVM tags deliberately omitted: + // - dxcontainer + pub fn fileExt(of: ObjectFormat, arch: Cpu.Arch) [:0]const u8 { return switch (of) { .c => ".c", .coff => ".obj", - .dxcontainer => ".dxil", .elf, .goff, .macho, .wasm, .xcoff => ".o", .hex => ".ihex", .nvptx => ".ptx", @@ -833,7 +833,6 @@ pub const ObjectFormat = enum { .uefi, .windows => .coff, .zos => .goff, else => switch (arch) { - .dxil => .dxcontainer, .nvptx, .nvptx64 => .nvptx, .spirv, .spirv32, .spirv64 => .spirv, .wasm32, .wasm64 => .wasm, @@ -873,7 +872,6 @@ pub fn toElfMachine(target: Target) std.elf.EM { .xcore => .XCORE, .xtensa => .XTENSA, - .dxil, .nvptx, .nvptx64, .spirv, @@ -907,7 +905,6 @@ pub fn toCoffMachine(target: Target) std.coff.MachineType { .bpfel, .bpfeb, .csky, - .dxil, .hexagon, .kalimba, .lanai, @@ -1133,7 +1130,6 @@ pub const Cpu = struct { bpfel, bpfeb, csky, - dxil, hexagon, kalimba, lanai, @@ -1172,6 +1168,7 @@ pub const Cpu = struct { // - aarch64_32 // - amdil // - amdil64 + // - dxil // - le32 // - le64 // - r600 @@ -1344,7 +1341,6 @@ pub const Cpu = struct { .spirv, .spirv32, .spirv64, - .dxil, .loongarch32, .loongarch64, .arc, @@ -1817,7 +1813,6 @@ pub const DynamicLinker = struct { .kalimba, .lanai, .ve, - .dxil, .loongarch32, .xtensa, => none, @@ -1913,7 +1908,6 @@ pub fn ptrBitWidth_cpu_abi(cpu: Cpu, abi: Abi) u16 { .sparc, .spirv32, .loongarch32, - .dxil, .xtensa, => 32, @@ -2415,7 +2409,6 @@ pub fn cTypeAlignment(target: Target, c_type: CType) u16 { .csky, .x86, .xcore, - .dxil, .loongarch32, .kalimba, .spu_2, @@ -2519,7 +2512,6 @@ pub fn cTypePreferredAlignment(target: Target, c_type: CType) u16 { .csky, .xcore, - .dxil, .loongarch32, .kalimba, .spu_2, diff --git a/lib/std/zig.zig b/lib/std/zig.zig index 325b7bea90..c3ce106634 100644 --- a/lib/std/zig.zig +++ b/lib/std/zig.zig @@ -233,7 +233,6 @@ pub fn binNameAlloc(allocator: Allocator, options: BinNameOptions) error{OutOfMe }), }, .nvptx => return std.fmt.allocPrint(allocator, "{s}.ptx", .{root_name}), - .dxcontainer => return std.fmt.allocPrint(allocator, "{s}.dxil", .{root_name}), } } diff --git a/lib/std/zig/LibCDirs.zig b/lib/std/zig/LibCDirs.zig index 8fb961c187..c0f26ffa82 100644 --- a/lib/std/zig/LibCDirs.zig +++ b/lib/std/zig/LibCDirs.zig @@ -254,23 +254,6 @@ fn libCGenericName(target: std.Target) [:0]const u8 { .simulator, .macabi, => unreachable, - - .pixel, - .vertex, - .geometry, - .hull, - .domain, - .compute, - .library, - .raygeneration, - .intersection, - .anyhit, - .closesthit, - .miss, - .callable, - .mesh, - .amplification, - => unreachable, } } diff --git a/src/Compilation/Config.zig b/src/Compilation/Config.zig index 6be2ae80f8..b18cd4dd08 100644 --- a/src/Compilation/Config.zig +++ b/src/Compilation/Config.zig @@ -440,7 +440,7 @@ pub fn resolve(options: Options) ResolveError!Config { .windows, .uefi => .code_view, else => .{ .dwarf = .@"32" }, }, - .spirv, .nvptx, .dxcontainer, .hex, .raw, .plan9 => .strip, + .spirv, .nvptx, .hex, .raw, .plan9 => .strip, }; }; diff --git a/src/Type.zig b/src/Type.zig index 0dfd12cb35..e4c7f7ab7a 100644 --- a/src/Type.zig +++ b/src/Type.zig @@ -1703,7 +1703,6 @@ pub fn maxIntAlignment(target: std.Target, use_llvm: bool) u16 { .spirv32, .ve, .spirv64, - .dxil, .loongarch32, .loongarch64, .xtensa, diff --git a/src/Zcu.zig b/src/Zcu.zig index 3b0d5d9d87..e71e7fae9d 100644 --- a/src/Zcu.zig +++ b/src/Zcu.zig @@ -3010,7 +3010,6 @@ pub fn atomicPtrAlignment( .wasm32, .csky, .spirv32, - .dxil, .loongarch32, .xtensa, => 32, diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index c9cb79b4a0..816975955a 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -51,7 +51,6 @@ pub fn targetTriple(allocator: Allocator, target: std.Target) ![]const u8 { .bpfel => "bpfel", .bpfeb => "bpfeb", .csky => "csky", - .dxil => "dxil", .hexagon => "hexagon", .loongarch32 => "loongarch32", .loongarch64 => "loongarch64", @@ -182,21 +181,6 @@ pub fn targetTriple(allocator: Allocator, target: std.Target) ![]const u8 { .cygnus => "cygnus", .simulator => "simulator", .macabi => "macabi", - .pixel => "pixel", - .vertex => "vertex", - .geometry => "geometry", - .hull => "hull", - .domain => "domain", - .compute => "compute", - .library => "library", - .raygeneration => "raygeneration", - .intersection => "intersection", - .anyhit => "anyhit", - .closesthit => "closesthit", - .miss => "miss", - .callable => "callable", - .mesh => "mesh", - .amplification => "amplification", .ohos => "ohos", }; try llvm_triple.appendSlice(llvm_abi); @@ -263,7 +247,6 @@ pub fn targetArch(arch_tag: std.Target.Cpu.Arch) llvm.ArchType { .bpfel => .bpfel, .bpfeb => .bpfeb, .csky => .csky, - .dxil => .dxil, .hexagon => .hexagon, .loongarch32 => .loongarch32, .loongarch64 => .loongarch64, @@ -12726,7 +12709,6 @@ pub fn initializeLLVMTarget(arch: std.Target.Cpu.Arch) void { .spirv, .spirv32, .spirv64, - .dxil, => {}, // LLVM does does not have a backend for these. diff --git a/src/link.zig b/src/link.zig index 2894302c11..3f05f0772c 100644 --- a/src/link.zig +++ b/src/link.zig @@ -932,7 +932,6 @@ pub const File = struct { .xcoff => @panic("TODO implement xcoff object format"), .hex => @panic("TODO implement hex object format"), .raw => @panic("TODO implement raw object format"), - .dxcontainer => @panic("TODO implement dxcontainer object format"), }; } diff --git a/src/target.zig b/src/target.zig index 59c151bd6e..d85981ec84 100644 --- a/src/target.zig +++ b/src/target.zig @@ -104,7 +104,6 @@ pub fn hasLlvmSupport(target: std.Target, ofmt: std.Target.ObjectFormat) bool { => return false, .coff, - .dxcontainer, .elf, .goff, .hex, @@ -161,7 +160,6 @@ pub fn hasLlvmSupport(target: std.Target, ofmt: std.Target.ObjectFormat) bool { => true, // An LLVM backend exists but we don't currently support using it. - .dxil, .spirv, .spirv32, .spirv64,