Commit b732070fd36267fb055347e3aa8a1851e4054d50 | zig

build.zig+1-1

...	@@ -742,7 +742,7 @@ fn addCmakeCfgOptionsToExe(	...	@@ -742,7 +742,7 @@ fn addCmakeCfgOptionsToExe(
742	const mod = exe.root_module;	742	const mod = exe.root_module;
743	const target = mod.resolved_target.?.result;	743	const target = mod.resolved_target.?.result;
744		744
745	if (target.isDarwin()) {	745	if (target.os.tag.isDarwin()) {
746	// useful for package maintainers	746	// useful for package maintainers
747	exe.headerpad_max_install_names = true;	747	exe.headerpad_max_install_names = true;
748	}	748	}

lib/compiler/aro/aro/Compilation.zig+2-2

...	@@ -308,7 +308,7 @@ fn generateSystemDefines(comp: *Compilation, w: anytype) !void {	...	@@ -308,7 +308,7 @@ fn generateSystemDefines(comp: *Compilation, w: anytype) !void {
308	),	308	),
309	else => {},	309	else => {},
310	}	310	}
311	if (comp.target.isAndroid()) {	311	if (comp.target.abi.isAndroid()) {
312	try w.writeAll("#define __ANDROID__ 1\n");	312	try w.writeAll("#define __ANDROID__ 1\n");
313	}	313	}
314		314
...	@@ -734,7 +734,7 @@ pub fn float80Type(comp: *const Compilation) ?Type {	...	@@ -734,7 +734,7 @@ pub fn float80Type(comp: *const Compilation) ?Type {
734		734
735	/// Smallest integer type with at least N bits	735	/// Smallest integer type with at least N bits
736	pub fn intLeastN(comp: *const Compilation, bits: usize, signedness: std.builtin.Signedness) Type {	736	pub fn intLeastN(comp: *const Compilation, bits: usize, signedness: std.builtin.Signedness) Type {
737	if (bits == 64 and (comp.target.isDarwin() or comp.target.isWasm())) {	737	if (bits == 64 and (comp.target.os.tag.isDarwin() or comp.target.cpu.arch.isWasm())) {
738	// WebAssembly and Darwin use `long long` for `int_least64_t` and `int_fast64_t`.	738	// WebAssembly and Darwin use `long long` for `int_least64_t` and `int_fast64_t`.
739	return .{ .specifier = if (signedness == .signed) .long_long else .ulong_long };	739	return .{ .specifier = if (signedness == .signed) .long_long else .ulong_long };
740	}	740	}

lib/compiler/aro/aro/Driver/GCCDetector.zig+1-1

...	@@ -183,7 +183,7 @@ fn collectLibDirsAndTriples(	...	@@ -183,7 +183,7 @@ fn collectLibDirsAndTriples(
183	// TODO	183	// TODO
184	return;	184	return;
185	}	185	}
186	if (target.isAndroid()) {	186	if (target.abi.isAndroid()) {
187	const AArch64AndroidTriples: [1][]const u8 = .{"aarch64-linux-android"};	187	const AArch64AndroidTriples: [1][]const u8 = .{"aarch64-linux-android"};
188	const ARMAndroidTriples: [1][]const u8 = .{"arm-linux-androideabi"};	188	const ARMAndroidTriples: [1][]const u8 = .{"arm-linux-androideabi"};
189	const MIPSELAndroidTriples: [1][]const u8 = .{"mipsel-linux-android"};	189	const MIPSELAndroidTriples: [1][]const u8 = .{"mipsel-linux-android"};

lib/compiler/aro/aro/Toolchain.zig+7-7

...	@@ -161,7 +161,7 @@ pub fn getLinkerPath(tc: *const Toolchain, buf: []u8) ![]const u8 {	...	@@ -161,7 +161,7 @@ pub fn getLinkerPath(tc: *const Toolchain, buf: []u8) ![]const u8 {
161	} else {	161	} else {
162	var linker_name = try std.ArrayList(u8).initCapacity(tc.driver.comp.gpa, 5 + use_linker.len); // "ld64." ++ use_linker	162	var linker_name = try std.ArrayList(u8).initCapacity(tc.driver.comp.gpa, 5 + use_linker.len); // "ld64." ++ use_linker
163	defer linker_name.deinit();	163	defer linker_name.deinit();
164	if (tc.getTarget().isDarwin()) {	164	if (tc.getTarget().os.tag.isDarwin()) {
165	linker_name.appendSliceAssumeCapacity("ld64.");	165	linker_name.appendSliceAssumeCapacity("ld64.");
166	} else {	166	} else {
167	linker_name.appendSliceAssumeCapacity("ld.");	167	linker_name.appendSliceAssumeCapacity("ld.");
...	@@ -343,7 +343,7 @@ pub fn buildLinkerArgs(tc: Toolchain, argv: std.ArrayList([]const u8)) !void {	...	@@ -343,7 +343,7 @@ pub fn buildLinkerArgs(tc: Toolchain, argv: std.ArrayList([]const u8)) !void {
343	}	343	}
344		344
345	fn getDefaultRuntimeLibKind(tc: *const Toolchain) RuntimeLibKind {	345	fn getDefaultRuntimeLibKind(tc: *const Toolchain) RuntimeLibKind {
346	if (tc.getTarget().isAndroid()) {	346	if (tc.getTarget().abi.isAndroid()) {
347	return .compiler_rt;	347	return .compiler_rt;
348	}	348	}
349	return .libgcc;	349	return .libgcc;
...	@@ -369,7 +369,7 @@ pub fn getCompilerRt(tc: *const Toolchain, component: []const u8, file_kind: Fil	...	@@ -369,7 +369,7 @@ pub fn getCompilerRt(tc: *const Toolchain, component: []const u8, file_kind: Fil
369		369
370	fn getLibGCCKind(tc: *const Toolchain) LibGCCKind {	370	fn getLibGCCKind(tc: *const Toolchain) LibGCCKind {
371	const target = tc.getTarget();	371	const target = tc.getTarget();
372	if (tc.driver.static_libgcc or tc.driver.static or tc.driver.static_pie or target.isAndroid()) {	372	if (tc.driver.static_libgcc or tc.driver.static or tc.driver.static_pie or target.abi.isAndroid()) {
373	return .static;	373	return .static;
374	}	374	}
375	if (tc.driver.shared_libgcc) {	375	if (tc.driver.shared_libgcc) {
...	@@ -384,7 +384,7 @@ fn getUnwindLibKind(tc: *const Toolchain) !UnwindLibKind {	...	@@ -384,7 +384,7 @@ fn getUnwindLibKind(tc: *const Toolchain) !UnwindLibKind {
384	switch (tc.getRuntimeLibKind()) {	384	switch (tc.getRuntimeLibKind()) {
385	.compiler_rt => {	385	.compiler_rt => {
386	const target = tc.getTarget();	386	const target = tc.getTarget();
387	if (target.isAndroid() or target.os.tag == .aix) {	387	if (target.abi.isAndroid() or target.os.tag == .aix) {
388	return .compiler_rt;	388	return .compiler_rt;
389	} else {	389	} else {
390	return .none;	390	return .none;
...	@@ -417,14 +417,14 @@ fn getAsNeededOption(is_solaris: bool, needed: bool) []const u8 {	...	@@ -417,14 +417,14 @@ fn getAsNeededOption(is_solaris: bool, needed: bool) []const u8 {
417	fn addUnwindLibrary(tc: const Toolchain, argv: std.ArrayList([]const u8)) !void {	417	fn addUnwindLibrary(tc: const Toolchain, argv: std.ArrayList([]const u8)) !void {
418	const unw = try tc.getUnwindLibKind();	418	const unw = try tc.getUnwindLibKind();
419	const target = tc.getTarget();	419	const target = tc.getTarget();
420	if ((target.isAndroid() and unw == .libgcc) or	420	if ((target.abi.isAndroid() and unw == .libgcc) or
421	target.os.tag == .elfiamcu or	421	target.os.tag == .elfiamcu or
422	target.ofmt == .wasm or	422	target.ofmt == .wasm or
423	target_util.isWindowsMSVCEnvironment(target) or	423	target_util.isWindowsMSVCEnvironment(target) or
424	unw == .none) return;	424	unw == .none) return;
425		425
426	const lgk = tc.getLibGCCKind();	426	const lgk = tc.getLibGCCKind();
427	const as_needed = lgk == .unspecified and !target.isAndroid() and !target_util.isCygwinMinGW(target) and target.os.tag != .aix;	427	const as_needed = lgk == .unspecified and !target.abi.isAndroid() and !target_util.isCygwinMinGW(target) and target.os.tag != .aix;
428	if (as_needed) {	428	if (as_needed) {
429	try argv.append(getAsNeededOption(target.os.tag == .solaris, true));	429	try argv.append(getAsNeededOption(target.os.tag == .solaris, true));
430	}	430	}
...	@@ -483,7 +483,7 @@ pub fn addRuntimeLibs(tc: const Toolchain, argv: std.ArrayList([]const u8)) !v	...	@@ -483,7 +483,7 @@ pub fn addRuntimeLibs(tc: const Toolchain, argv: std.ArrayList([]const u8)) !v
483	},	483	},
484	}	484	}
485		485
486	if (target.isAndroid() and !tc.driver.static and !tc.driver.static_pie) {	486	if (target.abi.isAndroid() and !tc.driver.static and !tc.driver.static_pie) {
487	try argv.append("-ldl");	487	try argv.append("-ldl");
488	}	488	}
489	}	489	}

lib/compiler/aro/aro/Type.zig+1-1

...	@@ -1102,7 +1102,7 @@ pub fn alignof(ty: Type, comp: *const Compilation) u29 {	...	@@ -1102,7 +1102,7 @@ pub fn alignof(ty: Type, comp: *const Compilation) u29 {
1102	.double => comp.target.cTypeAlignment(.double),	1102	.double => comp.target.cTypeAlignment(.double),
1103	.long_double => comp.target.cTypeAlignment(.longdouble),	1103	.long_double => comp.target.cTypeAlignment(.longdouble),
1104		1104
1105	.int128, .uint128 => if (comp.target.cpu.arch == .s390x and comp.target.os.tag == .linux and comp.target.isGnu()) 8 else 16,	1105	.int128, .uint128 => if (comp.target.cpu.arch == .s390x and comp.target.os.tag == .linux and comp.target.abi.isGnu()) 8 else 16,
1106	.fp16, .float16 => 2,	1106	.fp16, .float16 => 2,
1107		1107
1108	.float128 => 16,	1108	.float128 => 16,

lib/compiler/aro/aro/target.zig+8-13

...	@@ -117,8 +117,8 @@ pub fn int64Type(target: std.Target) Type {	...	@@ -117,8 +117,8 @@ pub fn int64Type(target: std.Target) Type {
117		117
118	.sparc64 => return intMaxType(target),	118	.sparc64 => return intMaxType(target),
119		119
120	.x86, .x86_64 => if (!target.isDarwin()) return intMaxType(target),	120	.x86, .x86_64 => if (!target.os.tag.isDarwin()) return intMaxType(target),
121	.aarch64, .aarch64_be => if (!target.isDarwin() and target.os.tag != .openbsd and target.os.tag != .windows) return .{ .specifier = .long },	121	.aarch64, .aarch64_be => if (!target.os.tag.isDarwin() and target.os.tag != .openbsd and target.os.tag != .windows) return .{ .specifier = .long },
122	else => {},	122	else => {},
123	}	123	}
124	return .{ .specifier = .long_long };	124	return .{ .specifier = .long_long };
...	@@ -144,7 +144,7 @@ pub fn defaultFunctionAlignment(target: std.Target) u8 {	...	@@ -144,7 +144,7 @@ pub fn defaultFunctionAlignment(target: std.Target) u8 {
144	}	144	}
145		145
146	pub fn isTlsSupported(target: std.Target) bool {	146	pub fn isTlsSupported(target: std.Target) bool {
147	if (target.isDarwin()) {	147	if (target.os.tag.isDarwin()) {
148	var supported = false;	148	var supported = false;
149	switch (target.os.tag) {	149	switch (target.os.tag) {
150	.macos => supported = !(target.os.isAtLeast(.macos, .{ .major = 10, .minor = 7, .patch = 0 }) orelse false),	150	.macos => supported = !(target.os.isAtLeast(.macos, .{ .major = 10, .minor = 7, .patch = 0 }) orelse false),
...	@@ -199,7 +199,7 @@ pub fn minZeroWidthBitfieldAlignment(target: std.Target) ?u29 {	...	@@ -199,7 +199,7 @@ pub fn minZeroWidthBitfieldAlignment(target: std.Target) ?u29 {
199	pub fn unnamedFieldAffectsAlignment(target: std.Target) bool {	199	pub fn unnamedFieldAffectsAlignment(target: std.Target) bool {
200	switch (target.cpu.arch) {	200	switch (target.cpu.arch) {
201	.aarch64 => {	201	.aarch64 => {
202	if (target.isDarwin() or target.os.tag == .windows) return false;	202	if (target.os.tag.isDarwin() or target.os.tag == .windows) return false;
203	return true;	203	return true;
204	},	204	},
205	.armeb => {	205	.armeb => {
...	@@ -229,7 +229,7 @@ pub fn packAllEnums(target: std.Target) bool {	...	@@ -229,7 +229,7 @@ pub fn packAllEnums(target: std.Target) bool {
229	pub fn defaultAlignment(target: std.Target) u29 {	229	pub fn defaultAlignment(target: std.Target) u29 {
230	switch (target.cpu.arch) {	230	switch (target.cpu.arch) {
231	.avr => return 1,	231	.avr => return 1,
232	.arm => if (target.isAndroid() or target.os.tag == .ios) return 16 else return 8,	232	.arm => if (target.abi.isAndroid() or target.os.tag == .ios) return 16 else return 8,
233	.sparc => if (std.Target.sparc.featureSetHas(target.cpu.features, .v9)) return 16 else return 8,	233	.sparc => if (std.Target.sparc.featureSetHas(target.cpu.features, .v9)) return 16 else return 8,
234	.mips, .mipsel => switch (target.abi) {	234	.mips, .mipsel => switch (target.abi) {
235	.none, .gnuabi64 => return 16,	235	.none, .gnuabi64 => return 16,
...	@@ -242,9 +242,8 @@ pub fn defaultAlignment(target: std.Target) u29 {	...	@@ -242,9 +242,8 @@ pub fn defaultAlignment(target: std.Target) u29 {
242	pub fn systemCompiler(target: std.Target) LangOpts.Compiler {	242	pub fn systemCompiler(target: std.Target) LangOpts.Compiler {
243	// Android is linux but not gcc, so these checks go first	243	// Android is linux but not gcc, so these checks go first
244	// the rest for documentation as fn returns .clang	244	// the rest for documentation as fn returns .clang
245	if (target.isDarwin() or	245	if (target.abi.isAndroid() or
246	target.isAndroid() or	246	target.os.tag.isBSD() or
247	target.isBSD() or
248	target.os.tag == .fuchsia or	247	target.os.tag == .fuchsia or
249	target.os.tag == .solaris or	248	target.os.tag == .solaris or
250	target.os.tag == .haiku or	249	target.os.tag == .haiku or
...	@@ -268,7 +267,7 @@ pub fn systemCompiler(target: std.Target) LangOpts.Compiler {	...	@@ -268,7 +267,7 @@ pub fn systemCompiler(target: std.Target) LangOpts.Compiler {
268		267
269	pub fn hasFloat128(target: std.Target) bool {	268	pub fn hasFloat128(target: std.Target) bool {
270	if (target.cpu.arch.isWasm()) return true;	269	if (target.cpu.arch.isWasm()) return true;
271	if (target.isDarwin()) return false;	270	if (target.os.tag.isDarwin()) return false;
272	if (target.cpu.arch.isPowerPC()) return std.Target.powerpc.featureSetHas(target.cpu.features, .float128);	271	if (target.cpu.arch.isPowerPC()) return std.Target.powerpc.featureSetHas(target.cpu.features, .float128);
273	return switch (target.os.tag) {	272	return switch (target.os.tag) {
274	.dragonfly,	273	.dragonfly,
...	@@ -461,7 +460,6 @@ pub fn get32BitArchVariant(target: std.Target) ?std.Target {	...	@@ -461,7 +460,6 @@ pub fn get32BitArchVariant(target: std.Target) ?std.Target {
461	.amdgcn,	460	.amdgcn,
462	.avr,	461	.avr,
463	.msp430,	462	.msp430,
464	.spu_2,
465	.ve,	463	.ve,
466	.bpfel,	464	.bpfel,
467	.bpfeb,	465	.bpfeb,
...	@@ -522,7 +520,6 @@ pub fn get64BitArchVariant(target: std.Target) ?std.Target {	...	@@ -522,7 +520,6 @@ pub fn get64BitArchVariant(target: std.Target) ?std.Target {
522	.lanai,	520	.lanai,
523	.m68k,	521	.m68k,
524	.msp430,	522	.msp430,
525	.spu_2,
526	.xcore,	523	.xcore,
527	.xtensa,	524	.xtensa,
528	=> return null,	525	=> return null,
...	@@ -620,8 +617,6 @@ pub fn toLLVMTriple(target: std.Target, buf: []u8) []const u8 {	...	@@ -620,8 +617,6 @@ pub fn toLLVMTriple(target: std.Target, buf: []u8) []const u8 {
620	.wasm32 => "wasm32",	617	.wasm32 => "wasm32",
621	.wasm64 => "wasm64",	618	.wasm64 => "wasm64",
622	.ve => "ve",	619	.ve => "ve",
623	// Note: spu_2 is not supported in LLVM; this is the Zig arch name
624	.spu_2 => "spu_2",
625	};	620	};
626	writer.writeAll(llvm_arch) catch unreachable;	621	writer.writeAll(llvm_arch) catch unreachable;
627	writer.writeByte('-') catch unreachable;	622	writer.writeByte('-') catch unreachable;

lib/compiler/aro/aro/toolchains/Linux.zig+7-7

lib/compiler_rt/common.zig+3-3

...	@@ -14,7 +14,7 @@ else	...	@@ -14,7 +14,7 @@ else
14	/// For WebAssembly this allows the symbol to be resolved to other modules, but will not	14	/// For WebAssembly this allows the symbol to be resolved to other modules, but will not
15	/// export it to the host runtime.	15	/// export it to the host runtime.
16	pub const visibility: std.builtin.SymbolVisibility =	16	pub const visibility: std.builtin.SymbolVisibility =
17	if (builtin.target.isWasm() and linkage != .internal) .hidden else .default;	17	if (builtin.target.cpu.arch.isWasm() and linkage != .internal) .hidden else .default;
18		18
19	pub const want_aeabi = switch (builtin.abi) {	19	pub const want_aeabi = switch (builtin.abi) {
20	.eabi,	20	.eabi,
...	@@ -92,7 +92,7 @@ pub const panic = if (builtin.is_test) std.debug.FullPanic(std.debug.defaultPani	...	@@ -92,7 +92,7 @@ pub const panic = if (builtin.is_test) std.debug.FullPanic(std.debug.defaultPani
92	pub fn F16T(comptime OtherType: type) type {	92	pub fn F16T(comptime OtherType: type) type {
93	return switch (builtin.cpu.arch) {	93	return switch (builtin.cpu.arch) {
94	.arm, .armeb, .thumb, .thumbeb => if (std.Target.arm.featureSetHas(builtin.cpu.features, .has_v8))	94	.arm, .armeb, .thumb, .thumbeb => if (std.Target.arm.featureSetHas(builtin.cpu.features, .has_v8))
95	switch (builtin.abi.floatAbi()) {	95	switch (builtin.abi.float()) {
96	.soft => u16,	96	.soft => u16,
97	.hard => f16,	97	.hard => f16,
98	}	98	}
...	@@ -100,7 +100,7 @@ pub fn F16T(comptime OtherType: type) type {	...	@@ -100,7 +100,7 @@ pub fn F16T(comptime OtherType: type) type {
100	u16,	100	u16,
101	.aarch64, .aarch64_be => f16,	101	.aarch64, .aarch64_be => f16,
102	.riscv32, .riscv64 => f16,	102	.riscv32, .riscv64 => f16,
103	.x86, .x86_64 => if (builtin.target.isDarwin()) switch (OtherType) {	103	.x86, .x86_64 => if (builtin.target.os.tag.isDarwin()) switch (OtherType) {
104	// Starting with LLVM 16, Darwin uses different abi for f16	104	// Starting with LLVM 16, Darwin uses different abi for f16
105	// depending on the type of the other return/argument..???	105	// depending on the type of the other return/argument..???
106	f32, f64 => u16,	106	f32, f64 => u16,

lib/std/Build/Step/Compile.zig+3-3

lib/std/Target.zig+68-131

 @@ -144,10 +144,6 @@ pub const Os = struct {
             };
         }
-        pub inline fn isGnuLibC(tag: Os.Tag, abi: Abi) bool {
-            return (tag == .hurd or tag == .linux) and abi.isGnu();
-        }
         pub fn defaultVersionRange(tag: Tag, arch: Cpu.Arch, abi: Abi) Os {
             return .{
                 .tag = tag,
 @@ -218,23 +214,6 @@ pub const Os = struct {
                 .windows => .windows,
             };
         }
-        pub fn archName(tag: Tag, arch: Cpu.Arch) [:0]const u8 {
-            return switch (tag) {
-                .linux => switch (arch) {
-                    .arm, .armeb, .thumb, .thumbeb => "arm",
-                    .aarch64, .aarch64_be => "aarch64",
-                    .loongarch32, .loongarch64 => "loongarch",
-                    .mips, .mipsel, .mips64, .mips64el => "mips",
-                    .powerpc, .powerpcle, .powerpc64, .powerpc64le => "powerpc",
-                    .riscv32, .riscv64 => "riscv",
-                    .sparc, .sparc64 => "sparc",
-                    .x86, .x86_64 => "x86",
-                    else => @tagName(arch),
-                },
-                else => @tagName(arch),
-            };
-        }
     };
     /// Based on NTDDI version constants from
 @@ -763,6 +742,7 @@ pub const mips = @import("Target/mips.zig");
 pub const msp430 = @import("Target/msp430.zig");
 pub const nvptx = @import("Target/nvptx.zig");
 pub const powerpc = @import("Target/powerpc.zig");
+pub const propeller = @import("Target/propeller.zig");
 pub const riscv = @import("Target/riscv.zig");
 pub const sparc = @import("Target/sparc.zig");
 pub const spirv = @import("Target/spirv.zig");
 @@ -772,7 +752,6 @@ pub const wasm = @import("Target/wasm.zig");
 pub const x86 = @import("Target/x86.zig");
 pub const xcore = @import("Target/xcore.zig");
 pub const xtensa = @import("Target/xtensa.zig");
-pub const propeller = @import("Target/propeller.zig");
 pub const Abi = enum {
     none,
 @@ -990,7 +969,12 @@ pub const Abi = enum {
         };
     }
-    pub inline fn floatAbi(abi: Abi) FloatAbi {
+    pub const Float = enum {
+        hard,
+        soft,
+    };
+    pub inline fn float(abi: Abi) Float {
         return switch (abi) {
             .androideabi,
             .eabi,
 @@ -1081,20 +1065,17 @@ pub fn toElfMachine(target: Target) std.elf.EM {
         .msp430 => .MSP430,
         .powerpc, .powerpcle => .PPC,
         .powerpc64, .powerpc64le => .PPC64,
+        .propeller => .PROPELLER,
         .riscv32, .riscv64 => .RISCV,
         .s390x => .S390,
         .sparc => if (Target.sparc.featureSetHas(target.cpu.features, .v9)) .SPARC32PLUS else .SPARC,
         .sparc64 => .SPARCV9,
-        .spu_2 => .SPU_2,
         .ve => .VE,
         .x86 => if (target.os.tag == .elfiamcu) .IAMCU else .@"386",
         .x86_64 => .X86_64,
         .xcore => .XCORE,
         .xtensa => .XTENSA,
-        .propeller1 => .PROPELLER,
-        .propeller2 => .PROPELLER2,
         .nvptx,
         .nvptx64,
         .spirv,
 @@ -1148,14 +1129,12 @@ pub fn toCoffMachine(target: Target) std.coff.MachineType {
         .spirv,
         .spirv32,
         .spirv64,
-        .spu_2,
         .ve,
         .wasm32,
         .wasm64,
         .xcore,
         .xtensa,
-        .propeller1,
+        .propeller,
-        .propeller2,
         => .UNKNOWN,
     };
 }
 @@ -1368,8 +1347,7 @@ pub const Cpu = struct {
         powerpcle,
         powerpc64,
         powerpc64le,
-        propeller1,
+        propeller,
-        propeller2,
         riscv32,
         riscv64,
         s390x,
 @@ -1378,7 +1356,6 @@ pub const Cpu = struct {
         spirv,
         spirv32,
         spirv64,
-        spu_2,
         ve,
         wasm32,
         wasm64,
 @@ -1520,14 +1497,6 @@ pub const Cpu = struct {
             };
         }
-        /// Returns if the architecture is a Parallax propeller architecture.
-        pub inline fn isPropeller(arch: Arch) bool {
-            return switch (arch) {
-                .propeller1, .propeller2 => true,
-                else => false,
-            };
-        }
         pub fn parseCpuModel(arch: Arch, cpu_name: []const u8) !*const Cpu.Model {
             for (arch.allCpuModels()) |cpu| {
                 if (std.mem.eql(u8, cpu_name, cpu.name)) {
 @@ -1564,7 +1533,6 @@ pub const Cpu = struct {
                 .xcore,
                 .thumb,
                 .ve,
-                .spu_2,
                 // GPU bitness is opaque. For now, assume little endian.
                 .spirv,
                 .spirv32,
 @@ -1572,8 +1540,7 @@ pub const Cpu = struct {
                 .loongarch32,
                 .loongarch64,
                 .arc,
-                .propeller1,
+                .propeller,
-                .propeller2,
                 => .little,
                 .armeb,
 @@ -1593,26 +1560,6 @@ pub const Cpu = struct {
             };
         }
-        /// Returns whether this architecture supports the address space
-        pub fn supportsAddressSpace(arch: Arch, address_space: std.builtin.AddressSpace) bool {
-            const is_nvptx = arch.isNvptx();
-            const is_spirv = arch.isSpirV();
-            const is_gpu = is_nvptx or is_spirv or arch == .amdgcn;
-            return switch (address_space) {
-                .generic => true,
-                .fs, .gs, .ss => arch == .x86_64 or arch == .x86,
-                .global, .constant, .local, .shared => is_gpu,
-                .param => is_nvptx,
-                .input, .output, .uniform, .push_constant, .storage_buffer => is_spirv,
-                // TODO this should also check how many flash banks the cpu has
-                .flash, .flash1, .flash2, .flash3, .flash4, .flash5 => arch == .avr,
-                // Propeller address spaces:
-                .cog, .hub => arch.isPropeller(),
-                .lut => (arch == .propeller2),
-            };
-        }
         /// Returns a name that matches the lib/std/target/* source file name.
         pub fn genericName(arch: Arch) [:0]const u8 {
             return switch (arch) {
 @@ -1622,6 +1569,7 @@ pub const Cpu = struct {
                 .loongarch32, .loongarch64 => "loongarch",
                 .mips, .mipsel, .mips64, .mips64el => "mips",
                 .powerpc, .powerpcle, .powerpc64, .powerpc64le => "powerpc",
+                .propeller => "propeller",
                 .riscv32, .riscv64 => "riscv",
                 .sparc, .sparc64 => "sparc",
                 .s390x => "s390x",
 @@ -1629,7 +1577,6 @@ pub const Cpu = struct {
                 .nvptx, .nvptx64 => "nvptx",
                 .wasm32, .wasm64 => "wasm",
                 .spirv, .spirv32, .spirv64 => "spirv",
-                .propeller1, .propeller2 => "propeller",
                 else => @tagName(arch),
             };
         }
 @@ -1770,10 +1717,8 @@ pub const Cpu = struct {
                 .aarch64_vfabi_sve,
                 => &.{ .aarch64, .aarch64_be },
-                .arm_apcs,
                 .arm_aapcs,
                 .arm_aapcs_vfp,
-                .arm_aapcs16_vfp,
                 .arm_interrupt,
                 => &.{ .arm, .armeb, .thumb, .thumbeb },
 @@ -1813,7 +1758,7 @@ pub const Cpu = struct {
                 .powerpc_aix_altivec,
                 => &.{ .powerpc, .powerpcle },
-                .wasm_watc,
+                .wasm_mvp,
                 => &.{ .wasm64, .wasm32 },
                 .arc_sysv,
 @@ -1854,11 +1799,8 @@ pub const Cpu = struct {
                 .msp430_eabi,
                 => &.{.msp430},
-                .propeller1_sysv,
+                .propeller_sysv,
-                => &.{.propeller1},
+                => &.{.propeller},
-                .propeller2_sysv,
-                => &.{.propeller2},
                 .s390x_sysv,
                 .s390x_sysv_vx,
 @@ -1937,8 +1879,7 @@ pub const Cpu = struct {
                 .msp430 => &msp430.cpu.generic,
                 .powerpc, .powerpcle => &powerpc.cpu.ppc,
                 .powerpc64, .powerpc64le => &powerpc.cpu.ppc64,
-                .propeller1 => &propeller.cpu.generic,
+                .propeller => &propeller.cpu.p1,
-                .propeller2 => &propeller.cpu.generic,
                 .riscv32 => &riscv.cpu.generic_rv32,
                 .riscv64 => &riscv.cpu.generic_rv64,
                 .spirv, .spirv32, .spirv64 => &spirv.cpu.generic,
 @@ -1954,7 +1895,6 @@ pub const Cpu = struct {
                 .xtensa => &xtensa.cpu.generic,
                 .kalimba,
-                .spu_2,
                 => &S.generic_model,
             };
         }
 @@ -2015,6 +1955,35 @@ pub const Cpu = struct {
     pub fn baseline(arch: Arch, os: Os) Cpu {
         return Model.baseline(arch, os).toCpu(arch);
     }
+    /// Returns whether this architecture supports `address_space`. If `context` is `null`, this
+    /// function simply answers the general question of whether the architecture has any concept
+    /// of `address_space`; if non-`null`, the function additionally checks whether
+    /// `address_space` is valid in that context.
+    pub fn supportsAddressSpace(
+        cpu: Cpu,
+        address_space: std.builtin.AddressSpace,
+        context: ?std.builtin.AddressSpace.Context,
+    ) bool {
+        const arch = cpu.arch;
+        const is_nvptx = arch.isNvptx();
+        const is_spirv = arch.isSpirV();
+        const is_gpu = is_nvptx or is_spirv or arch == .amdgcn;
+        return switch (address_space) {
+            .generic => true,
+            .fs, .gs, .ss => (arch == .x86_64 or arch == .x86) and (context == null or context == .pointer),
+            .flash, .flash1, .flash2, .flash3, .flash4, .flash5 => arch == .avr, // TODO this should also check how many flash banks the cpu has
+            .cog, .hub => arch == .propeller,
+            .lut => arch == .propeller and std.Target.propeller.featureSetHas(cpu.features, .p2),
+            .global, .local, .shared => is_gpu,
+            .constant => is_gpu and (context == null or context == .constant),
+            .param => is_nvptx,
+            .input, .output, .uniform, .push_constant, .storage_buffer => is_spirv,
+        };
+    }
 };
 pub fn zigTriple(target: Target, allocator: Allocator) Allocator.Error![]u8 {
 @@ -2054,48 +2023,29 @@ pub fn libPrefix(target: Target) [:0]const u8 {
 }
 pub inline fn isMinGW(target: Target) bool {
-    return target.os.tag == .windows and target.isGnu();
+    return target.os.tag == .windows and target.abi.isGnu();
-}
-pub inline fn isGnu(target: Target) bool {
-    return target.abi.isGnu();
-}
-pub inline fn isMusl(target: Target) bool {
-    return target.abi.isMusl();
-}
-pub inline fn isAndroid(target: Target) bool {
-    return target.abi.isAndroid();
-}
-pub inline fn isWasm(target: Target) bool {
-    return target.cpu.arch.isWasm();
-}
-pub inline fn isDarwin(target: Target) bool {
-    return target.os.tag.isDarwin();
-}
-pub inline fn isBSD(target: Target) bool {
-    return target.os.tag.isBSD();
 }
 pub inline fn isGnuLibC(target: Target) bool {
-    return target.os.tag.isGnuLibC(target.abi);
+    return switch (target.os.tag) {
+        .hurd, .linux => target.abi.isGnu(),
+        else => false,
+    };
 }
-pub inline fn isSpirV(target: Target) bool {
+pub inline fn isMuslLibC(target: Target) bool {
-    return target.cpu.arch.isSpirV();
+    return target.os.tag == .linux and target.abi.isMusl();
 }
-pub const FloatAbi = enum {
+pub inline fn isDarwinLibC(target: Target) bool {
-    hard,
+    return switch (target.abi) {
-    soft,
+        .none, .macabi, .simulator => target.os.tag.isDarwin(),
-};
+        else => false,
+    };
+}
-pub inline fn floatAbi(target: Target) FloatAbi {
+pub inline fn isWasiLibC(target: Target) bool {
-    return target.abi.floatAbi();
+    return target.os.tag == .wasi and target.abi.isMusl();
 }
 pub const DynamicLinker = struct {
 @@ -2627,7 +2577,6 @@ pub fn ptrBitWidth_cpu_abi(cpu: Cpu, abi: Abi) u16 {
     return switch (cpu.arch) {
         .avr,
         .msp430,
-        .spu_2,
         => 16,
         .arc,
 @@ -2653,8 +2602,7 @@ pub fn ptrBitWidth_cpu_abi(cpu: Cpu, abi: Abi) u16 {
         .spirv32,
         .loongarch32,
         .xtensa,
-        .propeller1,
+        .propeller,
-        .propeller2,
         => 32,
         .aarch64,
 @@ -2733,7 +2681,7 @@ pub fn stackAlignment(target: Target) u16 {
 /// Note that char signedness is implementation-defined and many compilers provide
 /// an option to override the default signedness e.g. GCC's -funsigned-char / -fsigned-char
 pub fn charSignedness(target: Target) std.builtin.Signedness {
-    if (target.isDarwin() or target.os.tag == .windows or target.os.tag == .uefi) return .signed;
+    if (target.os.tag.isDarwin() or target.os.tag == .windows or target.os.tag == .uefi) return .signed;
     return switch (target.cpu.arch) {
         .arm,
 @@ -3164,10 +3112,8 @@ pub fn cTypeAlignment(target: Target, c_type: CType) u16 {
             .x86,
             .xcore,
             .kalimba,
-            .spu_2,
             .xtensa,
-            .propeller1,
+            .propeller,
-            .propeller2,
             => 4,
             .arm,
 @@ -3260,10 +3206,8 @@ pub fn cTypePreferredAlignment(target: Target, c_type: CType) u16 {
             .csky,
             .xcore,
             .kalimba,
-            .spu_2,
             .xtensa,
-            .propeller1,
+            .propeller,
-            .propeller2,
             => 4,
             .arc,
 @@ -3330,7 +3274,7 @@ pub fn cCallingConvention(target: Target) ?std.builtin.CallingConvention {
             .windows => .{ .aarch64_aapcs_win = .{} },
             else => .{ .aarch64_aapcs = .{} },
         },
-        .arm, .armeb, .thumb, .thumbeb => switch (target.abi.floatAbi()) {
+        .arm, .armeb, .thumb, .thumbeb => switch (target.abi.float()) {
             .soft => .{ .arm_aapcs = .{} },
             .hard => .{ .arm_aapcs_vfp = .{} },
         },
 @@ -3343,7 +3287,7 @@ pub fn cCallingConvention(target: Target) ?std.builtin.CallingConvention {
         .riscv32 => .{ .riscv32_ilp32 = .{} },
         .sparc64 => .{ .sparc64_sysv = .{} },
         .sparc => .{ .sparc_sysv = .{} },
-        .powerpc64 => if (target.isMusl())
+        .powerpc64 => if (target.abi.isMusl())
             .{ .powerpc64_elf_v2 = .{} }
         else
             .{ .powerpc64_elf = .{} },
 @@ -3352,8 +3296,7 @@ pub fn cCallingConvention(target: Target) ?std.builtin.CallingConvention {
             .aix => .{ .powerpc_aix = .{} },
             else => .{ .powerpc_sysv = .{} },
         },
-        .wasm32 => .{ .wasm_watc = .{} },
+        .wasm32, .wasm64 => .{ .wasm_mvp = .{} },
-        .wasm64 => .{ .wasm_watc = .{} },
         .arc => .{ .arc_sysv = .{} },
         .avr => .avr_gnu,
         .bpfel, .bpfeb => .{ .bpf_std = .{} },
 @@ -3368,10 +3311,8 @@ pub fn cCallingConvention(target: Target) ?std.builtin.CallingConvention {
         else
             .{ .m68k_sysv = .{} },
         .msp430 => .{ .msp430_eabi = .{} },
-        .propeller1 => .{ .propeller1_sysv = .{} },
+        .propeller => .{ .propeller_sysv = .{} },
-        .propeller2 => .{ .propeller2_sysv = .{} },
         .s390x => .{ .s390x_sysv = .{} },
-        .spu_2 => null,
         .ve => .{ .ve_sysv = .{} },
         .xcore => .{ .xcore_xs1 = .{} },
         .xtensa => .{ .xtensa_call0 = .{} },
 @@ -3381,10 +3322,6 @@ pub fn cCallingConvention(target: Target) ?std.builtin.CallingConvention {
     };
 }
-pub fn osArchName(target: std.Target) [:0]const u8 {
-    return target.os.tag.archName(target.cpu.arch);
-}
 const Target = @This();
 const std = @import("std.zig");
 const builtin = @import("builtin");

lib/std/Target/Query.zig+2-3

...	@@ -26,7 +26,7 @@ os_version_min: ?OsVersion = null,	...	@@ -26,7 +26,7 @@ os_version_min: ?OsVersion = null,
26	os_version_max: ?OsVersion = null,	26	os_version_max: ?OsVersion = null,
27		27
28	/// `null` means default when cross compiling, or native when `os_tag` is native.	28	/// `null` means default when cross compiling, or native when `os_tag` is native.
29	/// If `isGnuLibC()` is `false`, this must be `null` and is ignored.	29	/// If `isGnu()` is `false`, this must be `null` and is ignored.
30	glibc_version: ?SemanticVersion = null,	30	glibc_version: ?SemanticVersion = null,
31		31
32	/// `null` means default when cross compiling, or native when `os_tag` is native.	32	/// `null` means default when cross compiling, or native when `os_tag` is native.
...	@@ -235,8 +235,7 @@ pub fn parse(args: ParseOptions) !Query {	...	@@ -235,8 +235,7 @@ pub fn parse(args: ParseOptions) !Query {
235		235
236	const abi_ver_text = abi_it.rest();	236	const abi_ver_text = abi_it.rest();
237	if (abi_it.next() != null) {	237	if (abi_it.next() != null) {
238	const tag = result.os_tag orelse builtin.os.tag;	238	if (abi.isGnu()) {
239	if (tag.isGnuLibC(abi)) {
240	result.glibc_version = parseVersion(abi_ver_text) catch \|err\| switch (err) {	239	result.glibc_version = parseVersion(abi_ver_text) catch \|err\| switch (err) {
241	error.Overflow => return error.InvalidAbiVersion,	240	error.Overflow => return error.InvalidAbiVersion,
242	error.InvalidVersion => return error.InvalidAbiVersion,	241	error.InvalidVersion => return error.InvalidAbiVersion,

lib/std/Target/propeller.zig+30-4

...	@@ -1,20 +1,46 @@	...	@@ -1,20 +1,46 @@
		1	//! This file is auto-generated by tools/update_cpu_features.zig.
		2
1	const std = @import("../std.zig");	3	const std = @import("../std.zig");
2	const CpuFeature = std.Target.Cpu.Feature;	4	const CpuFeature = std.Target.Cpu.Feature;
3	const CpuModel = std.Target.Cpu.Model;	5	const CpuModel = std.Target.Cpu.Model;
4		6
5	pub const Feature = enum {};	7	pub const Feature = enum {
		8	p2,
		9	};
6		10
7	pub const featureSet = CpuFeature.FeatureSetFns(Feature).featureSet;	11	pub const featureSet = CpuFeature.FeatureSetFns(Feature).featureSet;
8	pub const featureSetHas = CpuFeature.FeatureSetFns(Feature).featureSetHas;	12	pub const featureSetHas = CpuFeature.FeatureSetFns(Feature).featureSetHas;
9	pub const featureSetHasAny = CpuFeature.FeatureSetFns(Feature).featureSetHasAny;	13	pub const featureSetHasAny = CpuFeature.FeatureSetFns(Feature).featureSetHasAny;
10	pub const featureSetHasAll = CpuFeature.FeatureSetFns(Feature).featureSetHasAll;	14	pub const featureSetHasAll = CpuFeature.FeatureSetFns(Feature).featureSetHasAll;
11		15
12	pub const all_features: [0]CpuFeature = .{};	16	pub const all_features = blk: {
		17	const len = @typeInfo(Feature).@"enum".fields.len;
		18	std.debug.assert(len <= CpuFeature.Set.needed_bit_count);
		19	var result: [len]CpuFeature = undefined;
		20	result[@intFromEnum(Feature.p2)] = .{
		21	.llvm_name = null,
		22	.description = "Enable Propeller 2",
		23	.dependencies = featureSet(&[_]Feature{}),
		24	};
		25	const ti = @typeInfo(Feature);
		26	for (&result, 0..) \|*elem, i\| {
		27	elem.index = i;
		28	elem.name = ti.@"enum".fields[i].name;
		29	}
		30	break :blk result;
		31	};
13		32
14	pub const cpu = struct {	33	pub const cpu = struct {
15	pub const generic = CpuModel{	34	pub const p1: CpuModel = .{
16	.name = "generic",	35	.name = "p1",
17	.llvm_name = null,	36	.llvm_name = null,
18	.features = featureSet(&[_]Feature{}),	37	.features = featureSet(&[_]Feature{}),
19	};	38	};
		39	pub const p2: CpuModel = .{
		40	.name = "p2",
		41	.llvm_name = null,
		42	.features = featureSet(&[_]Feature{
		43	.p2,
		44	}),
		45	};
20	};	46	};

lib/std/Thread.zig+1-1

...	@@ -734,7 +734,7 @@ const PosixThreadImpl = struct {	...	@@ -734,7 +734,7 @@ const PosixThreadImpl = struct {
734	else => {	734	else => {
735	var count: c_int = undefined;	735	var count: c_int = undefined;
736	var count_len: usize = @sizeOf(c_int);	736	var count_len: usize = @sizeOf(c_int);
737	const name = if (comptime target.isDarwin()) "hw.logicalcpu" else "hw.ncpu";	737	const name = if (comptime target.os.tag.isDarwin()) "hw.logicalcpu" else "hw.ncpu";
738	posix.sysctlbynameZ(name, &count, &count_len, null, 0) catch \|err\| switch (err) {	738	posix.sysctlbynameZ(name, &count, &count_len, null, 0) catch \|err\| switch (err) {
739	error.NameTooLong, error.UnknownName => unreachable,	739	error.NameTooLong, error.UnknownName => unreachable,
740	else => \|e\| return e,	740	else => \|e\| return e,

lib/std/Thread/Futex.zig+1-1

...	@@ -80,7 +80,7 @@ else if (builtin.os.tag == .openbsd)	...	@@ -80,7 +80,7 @@ else if (builtin.os.tag == .openbsd)
80	OpenbsdImpl	80	OpenbsdImpl
81	else if (builtin.os.tag == .dragonfly)	81	else if (builtin.os.tag == .dragonfly)
82	DragonflyImpl	82	DragonflyImpl
83	else if (builtin.target.isWasm())	83	else if (builtin.target.cpu.arch.isWasm())
84	WasmImpl	84	WasmImpl
85	else if (std.Thread.use_pthreads)	85	else if (std.Thread.use_pthreads)
86	PosixImpl	86	PosixImpl

lib/std/builtin.zig+19-13

 @@ -220,8 +220,6 @@ pub const CallingConvention = union(enum(u8)) {
     };
     /// Deprecated; use `.x86_thiscall`.
     pub const Thiscall: CallingConvention = .{ .x86_thiscall = .{} };
-    /// Deprecated; do not use.
-    pub const APCS: CallingConvention = .{ .arm_apcs = .{} };
     /// Deprecated; use `.arm_aapcs`.
     pub const AAPCS: CallingConvention = .{ .arm_aapcs = .{} };
     /// Deprecated; use `.arm_aapcs_vfp`.
 @@ -284,14 +282,10 @@ pub const CallingConvention = union(enum(u8)) {
     aarch64_vfabi_sve: CommonOptions,
     // Calling convetions for the `arm`, `armeb`, `thumb`, and `thumbeb` architectures.
-    /// Deprecated; do not use.
-    arm_apcs: CommonOptions, // Removal of `arm_apcs` is blocked by #21842.
     /// ARM Architecture Procedure Call Standard
     arm_aapcs: CommonOptions,
     /// ARM Architecture Procedure Call Standard Vector Floating-Point
     arm_aapcs_vfp: CommonOptions,
-    /// Deprecated; do not use.
-    arm_aapcs16_vfp: CommonOptions, // Removal of `arm_aapcs16_vfp` is blocked by #21842.
     arm_interrupt: ArmInterruptOptions,
     // Calling conventions for the `mips64` and `mips64el` architectures.
 @@ -331,7 +325,7 @@ pub const CallingConvention = union(enum(u8)) {
     powerpc_aix_altivec: CommonOptions,
     /// The standard `wasm32` and `wasm64` calling convention, as specified in the WebAssembly Tool Conventions.
-    wasm_watc: CommonOptions,
+    wasm_mvp: CommonOptions,
     /// The standard `arc` calling convention.
     arc_sysv: CommonOptions,
 @@ -371,11 +365,8 @@ pub const CallingConvention = union(enum(u8)) {
     /// The standard `msp430` calling convention.
     msp430_eabi: CommonOptions,
-    /// The standard `propeller1` calling convention.
+    /// The standard `propeller` calling convention.
-    propeller1_sysv: CommonOptions,
+    propeller_sysv: CommonOptions,
-    /// The standard `propeller2` calling convention.
-    propeller2_sysv: CommonOptions,
     // Calling conventions for the `s390x` architecture.
     s390x_sysv: CommonOptions,
 @@ -500,6 +491,21 @@ pub const CallingConvention = union(enum(u8)) {
 /// This data structure is used by the Zig language code generation and
 /// therefore must be kept in sync with the compiler implementation.
 pub const AddressSpace = enum(u5) {
+    /// The places where a user can specify an address space attribute
+    pub const Context = enum {
+        /// A function is specified to be placed in a certain address space.
+        function,
+        /// A (global) variable is specified to be placed in a certain address space.
+        /// In contrast to .constant, these values (and thus the address space they will be
+        /// placed in) are required to be mutable.
+        variable,
+        /// A (global) constant value is specified to be placed in a certain address space.
+        /// In contrast to .variable, values placed in this address space are not required to be mutable.
+        constant,
+        /// A pointer is ascripted to point into a certain address space.
+        pointer,
+    };
     // CPU address spaces.
     generic,
     gs,
 @@ -951,7 +957,7 @@ pub const VaList = switch (builtin.cpu.arch) {
     .amdgcn => *u8,
     .avr => *anyopaque,
     .bpfel, .bpfeb => *anyopaque,
-    .hexagon => if (builtin.target.isMusl()) VaListHexagon else *u8,
+    .hexagon => if (builtin.target.abi.isMusl()) VaListHexagon else *u8,
     .loongarch32, .loongarch64 => *anyopaque,
     .mips, .mipsel, .mips64, .mips64el => *anyopaque,
     .riscv32, .riscv64 => *anyopaque,

lib/std/c.zig+6-6

...	@@ -2808,7 +2808,7 @@ pub const Sigaction = switch (native_os) {	...	@@ -2808,7 +2808,7 @@ pub const Sigaction = switch (native_os) {
2808	.mipsel,	2808	.mipsel,
2809	.mips64,	2809	.mips64,
2810	.mips64el,	2810	.mips64el,
2811	=> if (builtin.target.isMusl())	2811	=> if (builtin.target.abi.isMusl())
2812	linux.Sigaction	2812	linux.Sigaction
2813	else if (builtin.target.ptrBitWidth() == 64) extern struct {	2813	else if (builtin.target.ptrBitWidth() == 64) extern struct {
2814	pub const handler_fn = *align(1) const fn (i32) callconv(.c) void;	2814	pub const handler_fn = *align(1) const fn (i32) callconv(.c) void;
...	@@ -6701,7 +6701,7 @@ pub const Stat = switch (native_os) {	...	@@ -6701,7 +6701,7 @@ pub const Stat = switch (native_os) {
6701	return self.ctim;	6701	return self.ctim;
6702	}	6702	}
6703	},	6703	},
6704	.mips, .mipsel => if (builtin.target.isMusl()) extern struct {	6704	.mips, .mipsel => if (builtin.target.abi.isMusl()) extern struct {
6705	dev: dev_t,	6705	dev: dev_t,
6706	__pad0: [2]i32,	6706	__pad0: [2]i32,
6707	ino: ino_t,	6707	ino: ino_t,
...	@@ -6762,7 +6762,7 @@ pub const Stat = switch (native_os) {	...	@@ -6762,7 +6762,7 @@ pub const Stat = switch (native_os) {
6762	return self.ctim;	6762	return self.ctim;
6763	}	6763	}
6764	},	6764	},
6765	.mips64, .mips64el => if (builtin.target.isMusl()) extern struct {	6765	.mips64, .mips64el => if (builtin.target.abi.isMusl()) extern struct {
6766	dev: dev_t,	6766	dev: dev_t,
6767	__pad0: [3]i32,	6767	__pad0: [3]i32,
6768	ino: ino_t,	6768	ino: ino_t,
...	@@ -9863,16 +9863,16 @@ pub const LC = enum(c_int) {	...	@@ -9863,16 +9863,16 @@ pub const LC = enum(c_int) {
9863		9863
9864	pub extern "c" fn setlocale(category: LC, locale: ?[:0]const u8) ?[:0]const u8;	9864	pub extern "c" fn setlocale(category: LC, locale: ?[:0]const u8) ?[:0]const u8;
9865		9865
9866	pub const getcontext = if (builtin.target.isAndroid() or builtin.target.os.tag == .openbsd)	9866	pub const getcontext = if (builtin.target.abi.isAndroid() or builtin.target.os.tag == .openbsd)
9867	{} // android bionic and openbsd libc does not implement getcontext	9867	{} // android bionic and openbsd libc does not implement getcontext
9868	else if (native_os == .linux and builtin.target.isMusl())	9868	else if (native_os == .linux and builtin.target.abi.isMusl())
9869	linux.getcontext	9869	linux.getcontext
9870	else	9870	else
9871	private.getcontext;	9871	private.getcontext;
9872		9872
9873	pub const max_align_t = if (native_abi == .msvc or native_abi == .itanium)	9873	pub const max_align_t = if (native_abi == .msvc or native_abi == .itanium)
9874	f64	9874	f64
9875	else if (builtin.target.isDarwin())	9875	else if (native_os.isDarwin())
9876	c_longdouble	9876	c_longdouble
9877	else	9877	else
9878	extern struct {	9878	extern struct {

lib/std/c/darwin.zig+1-1

...	@@ -979,7 +979,7 @@ pub const kevent64_s = extern struct {	...	@@ -979,7 +979,7 @@ pub const kevent64_s = extern struct {
979	// to make sure the struct is laid out the same. These values were	979	// to make sure the struct is laid out the same. These values were
980	// produced from C code using the offsetof macro.	980	// produced from C code using the offsetof macro.
981	comptime {	981	comptime {
982	if (builtin.target.isDarwin()) {	982	if (builtin.target.os.tag.isDarwin()) {
983	assert(@offsetOf(kevent64_s, "ident") == 0);	983	assert(@offsetOf(kevent64_s, "ident") == 0);
984	assert(@offsetOf(kevent64_s, "filter") == 8);	984	assert(@offsetOf(kevent64_s, "filter") == 8);
985	assert(@offsetOf(kevent64_s, "flags") == 10);	985	assert(@offsetOf(kevent64_s, "flags") == 10);

lib/std/debug.zig+4-4

lib/std/debug/Dwarf/abi.zig-1

...	@@ -17,7 +17,6 @@ pub fn supportsUnwinding(target: std.Target) bool {	...	@@ -17,7 +17,6 @@ pub fn supportsUnwinding(target: std.Target) bool {
17	.spirv,	17	.spirv,
18	.spirv32,	18	.spirv32,
19	.spirv64,	19	.spirv64,
20	.spu_2,
21	=> false,	20	=> false,
22		21
23	// Enabling this causes relocation errors such as:	22	// Enabling this causes relocation errors such as:

lib/std/debug/SelfInfo.zig+4-4

lib/std/elf.zig-2

...	@@ -1178,8 +1178,6 @@ pub const EM = enum(u16) {	...	@@ -1178,8 +1178,6 @@ pub const EM = enum(u16) {
1178	MIPS_RS3_LE = 10,	1178	MIPS_RS3_LE = 10,
1179	/// Old version of Sparc v9, from before the ABI (deprecated)	1179	/// Old version of Sparc v9, from before the ABI (deprecated)
1180	OLD_SPARCV9 = 11,	1180	OLD_SPARCV9 = 11,
1181	/// SPU Mark II
1182	SPU_2 = 13,
1183	/// HPPA	1181	/// HPPA
1184	PARISC = 15,	1182	PARISC = 15,
1185	/// Fujitsu VPP500 (also old version of PowerPC; deprecated)	1183	/// Fujitsu VPP500 (also old version of PowerPC; deprecated)

lib/std/fs/Dir.zig+1-1

...	@@ -2587,7 +2587,7 @@ const CopyFileRawError = error{SystemResources} \|\| posix.CopyFileRangeError \|\| p	...	@@ -2587,7 +2587,7 @@ const CopyFileRawError = error{SystemResources} \|\| posix.CopyFileRangeError \|\| p
2587	// The copy starts at offset 0, the initial offsets are preserved.	2587	// The copy starts at offset 0, the initial offsets are preserved.
2588	// No metadata is transferred over.	2588	// No metadata is transferred over.
2589	fn copy_file(fd_in: posix.fd_t, fd_out: posix.fd_t, maybe_size: ?u64) CopyFileRawError!void {	2589	fn copy_file(fd_in: posix.fd_t, fd_out: posix.fd_t, maybe_size: ?u64) CopyFileRawError!void {
2590	if (builtin.target.isDarwin()) {	2590	if (builtin.target.os.tag.isDarwin()) {
2591	const rc = posix.system.fcopyfile(fd_in, fd_out, null, .{ .DATA = true });	2591	const rc = posix.system.fcopyfile(fd_in, fd_out, null, .{ .DATA = true });
2592	switch (posix.errno(rc)) {	2592	switch (posix.errno(rc)) {
2593	.SUCCESS => return,	2593	.SUCCESS => return,

lib/std/heap.zig+3-3

...	@@ -348,7 +348,7 @@ pub const page_allocator: Allocator = if (@hasDecl(root, "os") and	...	@@ -348,7 +348,7 @@ pub const page_allocator: Allocator = if (@hasDecl(root, "os") and
348	@hasDecl(root.os, "heap") and	348	@hasDecl(root.os, "heap") and
349	@hasDecl(root.os.heap, "page_allocator"))	349	@hasDecl(root.os.heap, "page_allocator"))
350	root.os.heap.page_allocator	350	root.os.heap.page_allocator
351	else if (builtin.target.isWasm()) .{	351	else if (builtin.target.cpu.arch.isWasm()) .{
352	.ptr = undefined,	352	.ptr = undefined,
353	.vtable = &WasmAllocator.vtable,	353	.vtable = &WasmAllocator.vtable,
354	} else if (builtin.target.os.tag == .plan9) .{	354	} else if (builtin.target.os.tag == .plan9) .{
...	@@ -508,7 +508,7 @@ test PageAllocator {	...	@@ -508,7 +508,7 @@ test PageAllocator {
508	const allocator = page_allocator;	508	const allocator = page_allocator;
509	try testAllocator(allocator);	509	try testAllocator(allocator);
510	try testAllocatorAligned(allocator);	510	try testAllocatorAligned(allocator);
511	if (!builtin.target.isWasm()) {	511	if (!builtin.target.cpu.arch.isWasm()) {
512	try testAllocatorLargeAlignment(allocator);	512	try testAllocatorLargeAlignment(allocator);
513	try testAllocatorAlignedShrink(allocator);	513	try testAllocatorAlignedShrink(allocator);
514	}	514	}
...	@@ -990,7 +990,7 @@ test {	...	@@ -990,7 +990,7 @@ test {
990	_ = FixedBufferAllocator;	990	_ = FixedBufferAllocator;
991	_ = ThreadSafeAllocator;	991	_ = ThreadSafeAllocator;
992	_ = SbrkAllocator;	992	_ = SbrkAllocator;
993	if (builtin.target.isWasm()) {	993	if (builtin.target.cpu.arch.isWasm()) {
994	_ = WasmAllocator;	994	_ = WasmAllocator;
995	}	995	}
996	if (!builtin.single_threaded) _ = smp_allocator;	996	if (!builtin.single_threaded) _ = smp_allocator;

lib/std/heap/WasmAllocator.zig+1-1

...	@@ -7,7 +7,7 @@ const wasm = std.wasm;	...	@@ -7,7 +7,7 @@ const wasm = std.wasm;
7	const math = std.math;	7	const math = std.math;
8		8
9	comptime {	9	comptime {
10	if (!builtin.target.isWasm()) {	10	if (!builtin.target.cpu.arch.isWasm()) {
11	@compileError("only available for wasm32 arch");	11	@compileError("only available for wasm32 arch");
12	}	12	}
13	if (!builtin.single_threaded) {	13	if (!builtin.single_threaded) {

lib/std/heap/debug_allocator.zig+2-2

...	@@ -1140,7 +1140,7 @@ test "shrink" {	...	@@ -1140,7 +1140,7 @@ test "shrink" {
1140	}	1140	}
1141		1141
1142	test "large object - grow" {	1142	test "large object - grow" {
1143	if (builtin.target.isWasm()) {	1143	if (builtin.target.cpu.arch.isWasm()) {
1144	// Not expected to pass on targets that do not have memory mapping.	1144	// Not expected to pass on targets that do not have memory mapping.
1145	return error.SkipZigTest;	1145	return error.SkipZigTest;
1146	}	1146	}
...	@@ -1319,7 +1319,7 @@ test "realloc large object to larger alignment" {	...	@@ -1319,7 +1319,7 @@ test "realloc large object to larger alignment" {
1319	}	1319	}
1320		1320
1321	test "large object rejects shrinking to small" {	1321	test "large object rejects shrinking to small" {
1322	if (builtin.target.isWasm()) {	1322	if (builtin.target.cpu.arch.isWasm()) {
1323	// Not expected to pass on targets that do not have memory mapping.	1323	// Not expected to pass on targets that do not have memory mapping.
1324	return error.SkipZigTest;	1324	return error.SkipZigTest;
1325	}	1325	}

lib/std/math/big/int_test.zig+1-1

...	@@ -2262,7 +2262,7 @@ test "bitNotWrap more than two limbs" {	...	@@ -2262,7 +2262,7 @@ test "bitNotWrap more than two limbs" {
2262	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO	2262	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
2263	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO	2263	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
2264	// LLVM: unexpected runtime library name: __umodei4	2264	// LLVM: unexpected runtime library name: __umodei4
2265	if (builtin.zig_backend == .stage2_llvm and comptime builtin.target.isWasm()) return error.SkipZigTest; // TODO	2265	if (builtin.zig_backend == .stage2_llvm and comptime builtin.target.cpu.arch.isWasm()) return error.SkipZigTest; // TODO
2266		2266
2267	var a = try Managed.initSet(testing.allocator, maxInt(Limb));	2267	var a = try Managed.initSet(testing.allocator, maxInt(Limb));
2268	defer a.deinit();	2268	defer a.deinit();

lib/std/math/gamma.zig+1-1

...	@@ -263,7 +263,7 @@ test gamma {	...	@@ -263,7 +263,7 @@ test gamma {
263	}	263	}
264		264
265	test "gamma.special" {	265	test "gamma.special" {
266	if (builtin.cpu.arch.isArm() and builtin.target.floatAbi() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234	266	if (builtin.cpu.arch.isArm() and builtin.target.abi.float() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234
267		267
268	inline for (&.{ f32, f64 }) \|T\| {	268	inline for (&.{ f32, f64 }) \|T\| {
269	try expect(std.math.isNan(gamma(T, -std.math.nan(T))));	269	try expect(std.math.isNan(gamma(T, -std.math.nan(T))));

lib/std/math/log10.zig+1-1

...	@@ -135,7 +135,7 @@ test log10_int {	...	@@ -135,7 +135,7 @@ test log10_int {
135	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO	135	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
136	if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO	136	if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
137	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO	137	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
138	if (builtin.zig_backend == .stage2_llvm and comptime builtin.target.isWasm()) return error.SkipZigTest; // TODO	138	if (builtin.zig_backend == .stage2_llvm and comptime builtin.target.cpu.arch.isWasm()) return error.SkipZigTest; // TODO
139		139
140	inline for (	140	inline for (
141	.{ u8, u16, u32, u64, u128, u256, u512 },	141	.{ u8, u16, u32, u64, u128, u256, u512 },

lib/std/posix.zig+2-2

...	@@ -3583,7 +3583,7 @@ pub fn socket(domain: u32, socket_type: u32, protocol: u32) SocketError!socket_t	...	@@ -3583,7 +3583,7 @@ pub fn socket(domain: u32, socket_type: u32, protocol: u32) SocketError!socket_t
3583	return rc;	3583	return rc;
3584	}	3584	}
3585		3585
3586	const have_sock_flags = !builtin.target.isDarwin() and native_os != .haiku;	3586	const have_sock_flags = !builtin.target.os.tag.isDarwin() and native_os != .haiku;
3587	const filtered_sock_type = if (!have_sock_flags)	3587	const filtered_sock_type = if (!have_sock_flags)
3588	socket_type & ~@as(u32, SOCK.NONBLOCK \| SOCK.CLOEXEC)	3588	socket_type & ~@as(u32, SOCK.NONBLOCK \| SOCK.CLOEXEC)
3589	else	3589	else
...	@@ -3879,7 +3879,7 @@ pub fn accept(	...	@@ -3879,7 +3879,7 @@ pub fn accept(
3879	/// description of the `CLOEXEC` flag in `open` for reasons why this may be useful.	3879	/// description of the `CLOEXEC` flag in `open` for reasons why this may be useful.
3880	flags: u32,	3880	flags: u32,
3881	) AcceptError!socket_t {	3881	) AcceptError!socket_t {
3882	const have_accept4 = !(builtin.target.isDarwin() or native_os == .windows or native_os == .haiku);	3882	const have_accept4 = !(builtin.target.os.tag.isDarwin() or native_os == .windows or native_os == .haiku);
3883	assert(0 == (flags & ~@as(u32, SOCK.NONBLOCK \| SOCK.CLOEXEC))); // Unsupported flag(s)	3883	assert(0 == (flags & ~@as(u32, SOCK.NONBLOCK \| SOCK.CLOEXEC))); // Unsupported flag(s)
3884		3884
3885	const accepted_sock: socket_t = while (true) {	3885	const accepted_sock: socket_t = while (true) {

lib/std/zig/LibCDirs.zig+3-3

lib/std/zig/LibCInstallation.zig+5-5

...	@@ -81,7 +81,7 @@ pub fn parse(	...	@@ -81,7 +81,7 @@ pub fn parse(
81	}	81	}
82		82
83	const os_tag = target.os.tag;	83	const os_tag = target.os.tag;
84	if (self.crt_dir == null and !target.isDarwin()) {	84	if (self.crt_dir == null and !target.os.tag.isDarwin()) {
85	log.err("crt_dir may not be empty for {s}", .{@tagName(os_tag)});	85	log.err("crt_dir may not be empty for {s}", .{@tagName(os_tag)});
86	return error.ParseError;	86	return error.ParseError;
87	}	87	}
...	@@ -167,7 +167,7 @@ pub const FindNativeOptions = struct {	...	@@ -167,7 +167,7 @@ pub const FindNativeOptions = struct {
167	pub fn findNative(args: FindNativeOptions) FindError!LibCInstallation {	167	pub fn findNative(args: FindNativeOptions) FindError!LibCInstallation {
168	var self: LibCInstallation = .{};	168	var self: LibCInstallation = .{};
169		169
170	if (is_darwin and args.target.isDarwin()) {	170	if (is_darwin and args.target.os.tag.isDarwin()) {
171	if (!std.zig.system.darwin.isSdkInstalled(args.allocator))	171	if (!std.zig.system.darwin.isSdkInstalled(args.allocator))
172	return error.DarwinSdkNotFound;	172	return error.DarwinSdkNotFound;
173	const sdk = std.zig.system.darwin.getSdk(args.allocator, args.target) orelse	173	const sdk = std.zig.system.darwin.getSdk(args.allocator, args.target) orelse
...	@@ -444,7 +444,7 @@ fn findNativeCrtDirPosix(self: *LibCInstallation, args: FindNativeOptions) FindE	...	@@ -444,7 +444,7 @@ fn findNativeCrtDirPosix(self: *LibCInstallation, args: FindNativeOptions) FindE
444	self.crt_dir = try ccPrintFileName(.{	444	self.crt_dir = try ccPrintFileName(.{
445	.allocator = args.allocator,	445	.allocator = args.allocator,
446	.search_basename = switch (args.target.os.tag) {	446	.search_basename = switch (args.target.os.tag) {
447	.linux => if (args.target.isAndroid()) "crtbegin_dynamic.o" else "crt1.o",	447	.linux => if (args.target.abi.isAndroid()) "crtbegin_dynamic.o" else "crt1.o",
448	else => "crt1.o",	448	else => "crt1.o",
449	},	449	},
450	.want_dirname = .only_dir,	450	.want_dirname = .only_dir,
...	@@ -734,7 +734,7 @@ pub const CrtBasenames = struct {	...	@@ -734,7 +734,7 @@ pub const CrtBasenames = struct {
734		734
735	const target = args.target;	735	const target = args.target;
736		736
737	if (target.isAndroid()) return switch (mode) {	737	if (target.abi.isAndroid()) return switch (mode) {
738	.dynamic_lib => .{	738	.dynamic_lib => .{
739	.crtbegin = "crtbegin_so.o",	739	.crtbegin = "crtbegin_so.o",
740	.crtend = "crtend_so.o",	740	.crtend = "crtend_so.o",
...	@@ -1025,7 +1025,7 @@ const fs = std.fs;	...	@@ -1025,7 +1025,7 @@ const fs = std.fs;
1025	const Allocator = std.mem.Allocator;	1025	const Allocator = std.mem.Allocator;
1026	const Path = std.Build.Cache.Path;	1026	const Path = std.Build.Cache.Path;
1027		1027
1028	const is_darwin = builtin.target.isDarwin();	1028	const is_darwin = builtin.target.os.tag.isDarwin();
1029	const is_windows = builtin.target.os.tag == .windows;	1029	const is_windows = builtin.target.os.tag == .windows;
1030	const is_haiku = builtin.target.os.tag == .haiku;	1030	const is_haiku = builtin.target.os.tag == .haiku;
1031		1031

lib/std/zig/system.zig+1-1

...	@@ -415,7 +415,7 @@ pub fn resolveTargetQuery(query: Target.Query) DetectError!Target {	...	@@ -415,7 +415,7 @@ pub fn resolveTargetQuery(query: Target.Query) DetectError!Target {
415	}	415	}
416		416
417	// https://github.com/llvm/llvm-project/issues/105978	417	// https://github.com/llvm/llvm-project/issues/105978
418	if (result.cpu.arch.isArm() and result.abi.floatAbi() == .soft) {	418	if (result.cpu.arch.isArm() and result.abi.float() == .soft) {
419	result.cpu.features.removeFeature(@intFromEnum(Target.arm.Feature.vfp2));	419	result.cpu.features.removeFeature(@intFromEnum(Target.arm.Feature.vfp2));
420	}	420	}
421	}	421	}

lib/std/zig/system/NativePaths.zig+1-1

...	@@ -83,7 +83,7 @@ pub fn detect(arena: Allocator, native_target: std.Target) !NativePaths {	...	@@ -83,7 +83,7 @@ pub fn detect(arena: Allocator, native_target: std.Target) !NativePaths {
83		83
84	// TODO: consider also adding homebrew paths	84	// TODO: consider also adding homebrew paths
85	// TODO: consider also adding macports paths	85	// TODO: consider also adding macports paths
86	if (builtin.target.isDarwin()) {	86	if (builtin.target.os.tag.isDarwin()) {
87	if (std.zig.system.darwin.isSdkInstalled(arena)) sdk: {	87	if (std.zig.system.darwin.isSdkInstalled(arena)) sdk: {
88	const sdk = std.zig.system.darwin.getSdk(arena, native_target) orelse break :sdk;	88	const sdk = std.zig.system.darwin.getSdk(arena, native_target) orelse break :sdk;
89	try self.addLibDir(try std.fs.path.join(arena, &.{ sdk, "usr/lib" }));	89	try self.addLibDir(try std.fs.path.join(arena, &.{ sdk, "usr/lib" }));

lib/std/zig/target.zig+17

...	@@ -129,6 +129,23 @@ pub fn glibcRuntimeTriple(	...	@@ -129,6 +129,23 @@ pub fn glibcRuntimeTriple(
129	};	129	};
130	}	130	}
131		131
		132	pub fn osArchName(target: std.Target) [:0]const u8 {
		133	return switch (target.os.tag) {
		134	.linux => switch (target.cpu.arch) {
		135	.arm, .armeb, .thumb, .thumbeb => "arm",
		136	.aarch64, .aarch64_be => "aarch64",
		137	.loongarch32, .loongarch64 => "loongarch",
		138	.mips, .mipsel, .mips64, .mips64el => "mips",
		139	.powerpc, .powerpcle, .powerpc64, .powerpc64le => "powerpc",
		140	.riscv32, .riscv64 => "riscv",
		141	.sparc, .sparc64 => "sparc",
		142	.x86, .x86_64 => "x86",
		143	else => @tagName(target.cpu.arch),
		144	},
		145	else => @tagName(target.cpu.arch),
		146	};
		147	}
		148
132	pub fn muslArchName(arch: std.Target.Cpu.Arch, abi: std.Target.Abi) [:0]const u8 {	149	pub fn muslArchName(arch: std.Target.Cpu.Arch, abi: std.Target.Abi) [:0]const u8 {
133	return switch (abi) {	150	return switch (abi) {
134	.muslabin32 => "mipsn32",	151	.muslabin32 => "mipsn32",

src/Compilation.zig+6-15

src/Sema.zig+10-52

...	@@ -9378,7 +9378,7 @@ pub fn handleExternLibName(	...	@@ -9378,7 +9378,7 @@ pub fn handleExternLibName(
9378	);	9378	);
9379	break :blk;	9379	break :blk;
9380	}	9380	}
9381	if (!target.isWasm() and !block.ownerModule().pic) {	9381	if (!target.cpu.arch.isWasm() and !block.ownerModule().pic) {
9382	return sema.fail(	9382	return sema.fail(
9383	block,	9383	block,
9384	src_loc,	9384	src_loc,
...	@@ -9407,10 +9407,8 @@ const calling_conventions_supporting_var_args = [_]std.builtin.CallingConvention	...	@@ -9407,10 +9407,8 @@ const calling_conventions_supporting_var_args = [_]std.builtin.CallingConvention
9407	.aarch64_aapcs_win,	9407	.aarch64_aapcs_win,
9408	.aarch64_vfabi,	9408	.aarch64_vfabi,
9409	.aarch64_vfabi_sve,	9409	.aarch64_vfabi_sve,
9410	.arm_apcs,
9411	.arm_aapcs,	9410	.arm_aapcs,
9412	.arm_aapcs_vfp,	9411	.arm_aapcs_vfp,
9413	.arm_aapcs16_vfp,
9414	.mips64_n64,	9412	.mips64_n64,
9415	.mips64_n32,	9413	.mips64_n32,
9416	.mips_o32,	9414	.mips_o32,
...	@@ -9427,7 +9425,7 @@ const calling_conventions_supporting_var_args = [_]std.builtin.CallingConvention	...	@@ -9427,7 +9425,7 @@ const calling_conventions_supporting_var_args = [_]std.builtin.CallingConvention
9427	.powerpc_sysv_altivec,	9425	.powerpc_sysv_altivec,
9428	.powerpc_aix,	9426	.powerpc_aix,
9429	.powerpc_aix_altivec,	9427	.powerpc_aix_altivec,
9430	.wasm_watc,	9428	.wasm_mvp,
9431	.arc_sysv,	9429	.arc_sysv,
9432	.avr_gnu,	9430	.avr_gnu,
9433	.bpf_std,	9431	.bpf_std,
...	@@ -26513,7 +26511,7 @@ fn zirWasmMemorySize(	...	@@ -26513,7 +26511,7 @@ fn zirWasmMemorySize(
26513	const index_src = block.builtinCallArgSrc(extra.node, 0);	26511	const index_src = block.builtinCallArgSrc(extra.node, 0);
26514	const builtin_src = block.nodeOffset(extra.node);	26512	const builtin_src = block.nodeOffset(extra.node);
26515	const target = sema.pt.zcu.getTarget();	26513	const target = sema.pt.zcu.getTarget();
26516	if (!target.isWasm()) {	26514	if (!target.cpu.arch.isWasm()) {
26517	return sema.fail(block, builtin_src, "builtin @wasmMemorySize is available when targeting WebAssembly; targeted CPU architecture is {s}", .{@tagName(target.cpu.arch)});	26515	return sema.fail(block, builtin_src, "builtin @wasmMemorySize is available when targeting WebAssembly; targeted CPU architecture is {s}", .{@tagName(target.cpu.arch)});
26518	}	26516	}
26519		26517
...	@@ -26538,7 +26536,7 @@ fn zirWasmMemoryGrow(	...	@@ -26538,7 +26536,7 @@ fn zirWasmMemoryGrow(
26538	const index_src = block.builtinCallArgSrc(extra.node, 0);	26536	const index_src = block.builtinCallArgSrc(extra.node, 0);
26539	const delta_src = block.builtinCallArgSrc(extra.node, 1);	26537	const delta_src = block.builtinCallArgSrc(extra.node, 1);
26540	const target = sema.pt.zcu.getTarget();	26538	const target = sema.pt.zcu.getTarget();
26541	if (!target.isWasm()) {	26539	if (!target.cpu.arch.isWasm()) {
26542	return sema.fail(block, builtin_src, "builtin @wasmMemoryGrow is available when targeting WebAssembly; targeted CPU architecture is {s}", .{@tagName(target.cpu.arch)});	26540	return sema.fail(block, builtin_src, "builtin @wasmMemoryGrow is available when targeting WebAssembly; targeted CPU architecture is {s}", .{@tagName(target.cpu.arch)});
26543	}	26541	}
26544		26542
...	@@ -37222,30 +37220,12 @@ fn analyzeComptimeAlloc(	...	@@ -37222,30 +37220,12 @@ fn analyzeComptimeAlloc(
37222	} })));	37220	} })));
37223	}	37221	}
37224		37222
37225	/// The places where a user can specify an address space attribute
37226	pub const AddressSpaceContext = enum {
37227	/// A function is specified to be placed in a certain address space.
37228	function,
37229
37230	/// A (global) variable is specified to be placed in a certain address space.
37231	/// In contrast to .constant, these values (and thus the address space they will be
37232	/// placed in) are required to be mutable.
37233	variable,
37234
37235	/// A (global) constant value is specified to be placed in a certain address space.
37236	/// In contrast to .variable, values placed in this address space are not required to be mutable.
37237	constant,
37238
37239	/// A pointer is ascripted to point into a certain address space.
37240	pointer,
37241	};
37242
37243	fn resolveAddressSpace(	37223	fn resolveAddressSpace(
37244	sema: *Sema,	37224	sema: *Sema,
37245	block: *Block,	37225	block: *Block,
37246	src: LazySrcLoc,	37226	src: LazySrcLoc,
37247	zir_ref: Zir.Inst.Ref,	37227	zir_ref: Zir.Inst.Ref,
37248	ctx: AddressSpaceContext,	37228	ctx: std.builtin.AddressSpace.Context,
37249	) !std.builtin.AddressSpace {	37229	) !std.builtin.AddressSpace {
37250	const air_ref = try sema.resolveInst(zir_ref);	37230	const air_ref = try sema.resolveInst(zir_ref);
37251	return sema.analyzeAsAddressSpace(block, src, air_ref, ctx);	37231	return sema.analyzeAsAddressSpace(block, src, air_ref, ctx);
...	@@ -37256,7 +37236,7 @@ pub fn analyzeAsAddressSpace(	...	@@ -37256,7 +37236,7 @@ pub fn analyzeAsAddressSpace(
37256	block: *Block,	37236	block: *Block,
37257	src: LazySrcLoc,	37237	src: LazySrcLoc,
37258	air_ref: Air.Inst.Ref,	37238	air_ref: Air.Inst.Ref,
37259	ctx: AddressSpaceContext,	37239	ctx: std.builtin.AddressSpace.Context,
37260	) !std.builtin.AddressSpace {	37240	) !std.builtin.AddressSpace {
37261	const pt = sema.pt;	37241	const pt = sema.pt;
37262	const addrspace_ty = try sema.getBuiltinType(src, .AddressSpace);	37242	const addrspace_ty = try sema.getBuiltinType(src, .AddressSpace);
...	@@ -37264,30 +37244,8 @@ pub fn analyzeAsAddressSpace(	...	@@ -37264,30 +37244,8 @@ pub fn analyzeAsAddressSpace(
37264	const addrspace_val = try sema.resolveConstDefinedValue(block, src, coerced, .{ .simple = .@"addrspace" });	37244	const addrspace_val = try sema.resolveConstDefinedValue(block, src, coerced, .{ .simple = .@"addrspace" });
37265	const address_space = try sema.interpretBuiltinType(block, src, addrspace_val, std.builtin.AddressSpace);	37245	const address_space = try sema.interpretBuiltinType(block, src, addrspace_val, std.builtin.AddressSpace);
37266	const target = pt.zcu.getTarget();	37246	const target = pt.zcu.getTarget();
37267	const arch = target.cpu.arch;	37247
37268		37248	if (!target.cpu.supportsAddressSpace(address_space, ctx)) {
37269	const is_nv = arch.isNvptx();
37270	const is_amd = arch == .amdgcn;
37271	const is_spirv = arch.isSpirV();
37272	const is_gpu = is_nv or is_amd or is_spirv;
37273
37274	const supported = switch (address_space) {
37275	// TODO: on spir-v only when os is opencl.
37276	.generic => true,
37277	.gs, .fs, .ss => (arch == .x86 or arch == .x86_64) and ctx == .pointer,
37278	// TODO: check that .shared and .local are left uninitialized
37279	.param => is_nv,
37280	.input, .output, .uniform, .push_constant, .storage_buffer => is_spirv,
37281	.global, .shared, .local => is_gpu,
37282	.constant => is_gpu and (ctx == .constant),
37283	// TODO this should also check how many flash banks the cpu has
37284	.flash, .flash1, .flash2, .flash3, .flash4, .flash5 => arch == .avr,
37285
37286	.cog, .hub => arch.isPropeller(),
37287	.lut => (arch == .propeller2),
37288	};
37289
37290	if (!supported) {
37291	// TODO error messages could be made more elaborate here	37249	// TODO error messages could be made more elaborate here
37292	const entity = switch (ctx) {	37250	const entity = switch (ctx) {
37293	.function => "functions",	37251	.function => "functions",
...	@@ -37299,7 +37257,7 @@ pub fn analyzeAsAddressSpace(	...	@@ -37299,7 +37257,7 @@ pub fn analyzeAsAddressSpace(
37299	block,	37257	block,
37300	src,	37258	src,
37301	"{s} with address space '{s}' are not supported on {s}",	37259	"{s} with address space '{s}' are not supported on {s}",
37302	.{ entity, @tagName(address_space), arch.genericName() },	37260	.{ entity, @tagName(address_space), target.cpu.arch.genericName() },
37303	);	37261	);
37304	}	37262	}
37305		37263
...	@@ -38729,7 +38687,7 @@ pub fn resolveNavPtrModifiers(	...	@@ -38729,7 +38687,7 @@ pub fn resolveNavPtrModifiers(
38729	};	38687	};
38730		38688
38731	const @"addrspace": std.builtin.AddressSpace = as: {	38689	const @"addrspace": std.builtin.AddressSpace = as: {
38732	const addrspace_ctx: Sema.AddressSpaceContext = switch (zir_decl.kind) {	38690	const addrspace_ctx: std.builtin.AddressSpace.Context = switch (zir_decl.kind) {
38733	.@"var" => .variable,	38691	.@"var" => .variable,
38734	else => switch (nav_ty.zigTypeTag(zcu)) {	38692	else => switch (nav_ty.zigTypeTag(zcu)) {
38735	.@"fn" => .function,	38693	.@"fn" => .function,

src/Type.zig+1-2

...	@@ -1647,7 +1647,7 @@ pub fn maxIntAlignment(target: std.Target) u16 {	...	@@ -1647,7 +1647,7 @@ pub fn maxIntAlignment(target: std.Target) u16 {
1647	.avr => 1,	1647	.avr => 1,
1648	.msp430 => 2,	1648	.msp430 => 2,
1649	.xcore => 4,	1649	.xcore => 4,
1650	.propeller1, .propeller2 => 4,	1650	.propeller => 4,
1651		1651
1652	.arm,	1652	.arm,
1653	.armeb,	1653	.armeb,
...	@@ -1698,7 +1698,6 @@ pub fn maxIntAlignment(target: std.Target) u16 {	...	@@ -1698,7 +1698,6 @@ pub fn maxIntAlignment(target: std.Target) u16 {
1698		1698
1699	// Below this comment are unverified but based on the fact that C requires	1699	// Below this comment are unverified but based on the fact that C requires
1700	// int128_t to be 16 bytes aligned, it's a safe default.	1700	// int128_t to be 16 bytes aligned, it's a safe default.
1701	.spu_2,
1702	.csky,	1701	.csky,
1703	.arc,	1702	.arc,
1704	.m68k,	1703	.m68k,

src/Zcu.zig+3-7

...	@@ -3594,7 +3594,6 @@ pub fn atomicPtrAlignment(	...	@@ -3594,7 +3594,6 @@ pub fn atomicPtrAlignment(
3594	const max_atomic_bits: u16 = switch (target.cpu.arch) {	3594	const max_atomic_bits: u16 = switch (target.cpu.arch) {
3595	.avr,	3595	.avr,
3596	.msp430,	3596	.msp430,
3597	.spu_2,
3598	=> 16,	3597	=> 16,
3599		3598
3600	.arc,	3599	.arc,
...	@@ -3620,8 +3619,7 @@ pub fn atomicPtrAlignment(	...	@@ -3620,8 +3619,7 @@ pub fn atomicPtrAlignment(
3620	.spirv32,	3619	.spirv32,
3621	.loongarch32,	3620	.loongarch32,
3622	.xtensa,	3621	.xtensa,
3623	.propeller1,	3622	.propeller,
3624	.propeller2,
3625	=> 32,	3623	=> 32,
3626		3624
3627	.amdgcn,	3625	.amdgcn,
...	@@ -4211,9 +4209,7 @@ pub fn callconvSupported(zcu: *Zcu, cc: std.builtin.CallingConvention) union(enu	...	@@ -4211,9 +4209,7 @@ pub fn callconvSupported(zcu: *Zcu, cc: std.builtin.CallingConvention) union(enu
4211	=> \|opts\| opts.incoming_stack_alignment == null,	4209	=> \|opts\| opts.incoming_stack_alignment == null,
4212		4210
4213	.arm_aapcs_vfp,	4211	.arm_aapcs_vfp,
4214	=> \|opts\| opts.incoming_stack_alignment == null and target.os.tag != .watchos,	4212	=> \|opts\| opts.incoming_stack_alignment == null,
4215	.arm_aapcs16_vfp,
4216	=> \|opts\| opts.incoming_stack_alignment == null and target.os.tag == .watchos,
4217		4213
4218	.arm_interrupt,	4214	.arm_interrupt,
4219	=> \|opts\| opts.incoming_stack_alignment == null,	4215	=> \|opts\| opts.incoming_stack_alignment == null,
...	@@ -4241,7 +4237,7 @@ pub fn callconvSupported(zcu: *Zcu, cc: std.builtin.CallingConvention) union(enu	...	@@ -4241,7 +4237,7 @@ pub fn callconvSupported(zcu: *Zcu, cc: std.builtin.CallingConvention) union(enu
4241	};	4237	};
4242	},	4238	},
4243	.stage2_wasm => switch (cc) {	4239	.stage2_wasm => switch (cc) {
4244	.wasm_watc => \|opts\| opts.incoming_stack_alignment == null,	4240	.wasm_mvp => \|opts\| opts.incoming_stack_alignment == null,
4245	else => false,	4241	else => false,
4246	},	4242	},
4247	.stage2_arm => switch (cc) {	4243	.stage2_arm => switch (cc) {

src/arch/wasm/CodeGen.zig+8-8

src/arch/x86_64/CodeGen.zig+1-1

...	@@ -90078,7 +90078,7 @@ fn floatCompilerRtAbiName(float_bits: u32) u8 {	...	@@ -90078,7 +90078,7 @@ fn floatCompilerRtAbiName(float_bits: u32) u8 {
90078	fn floatCompilerRtAbiType(self: *CodeGen, ty: Type, other_ty: Type) Type {	90078	fn floatCompilerRtAbiType(self: *CodeGen, ty: Type, other_ty: Type) Type {
90079	if (ty.toIntern() == .f16_type and	90079	if (ty.toIntern() == .f16_type and
90080	(other_ty.toIntern() == .f32_type or other_ty.toIntern() == .f64_type) and	90080	(other_ty.toIntern() == .f32_type or other_ty.toIntern() == .f64_type) and
90081	self.target.isDarwin()) return .u16;	90081	self.target.os.tag.isDarwin()) return .u16;
90082	return ty;	90082	return ty;
90083	}	90083	}
90084		90084

src/codegen/c.zig+1-1

...	@@ -7725,7 +7725,7 @@ fn toCallingConvention(cc: std.builtin.CallingConvention, zcu: *Zcu) ?[]const u8	...	@@ -7725,7 +7725,7 @@ fn toCallingConvention(cc: std.builtin.CallingConvention, zcu: *Zcu) ?[]const u8
7725	.aarch64_vfabi_sve => "aarch64_sve_pcs",	7725	.aarch64_vfabi_sve => "aarch64_sve_pcs",
7726		7726
7727	.arm_aapcs => "pcs(\"aapcs\")",	7727	.arm_aapcs => "pcs(\"aapcs\")",
7728	.arm_aapcs_vfp, .arm_aapcs16_vfp => "pcs(\"aapcs-vfp\")",	7728	.arm_aapcs_vfp => "pcs(\"aapcs-vfp\")",
7729		7729
7730	.arm_interrupt => \|opts\| switch (opts.type) {	7730	.arm_interrupt => \|opts\| switch (opts.type) {
7731	.generic => "interrupt",	7731	.generic => "interrupt",

src/codegen/llvm.zig+20-33

...	@@ -98,9 +98,7 @@ pub fn targetTriple(allocator: Allocator, target: std.Target) ![]const u8 {	...	@@ -98,9 +98,7 @@ pub fn targetTriple(allocator: Allocator, target: std.Target) ![]const u8 {
98	.ve => "ve",	98	.ve => "ve",
99		99
100	.kalimba,	100	.kalimba,
101	.spu_2,	101	.propeller,
102	.propeller1,
103	.propeller2,
104	=> unreachable, // Gated by hasLlvmSupport().	102	=> unreachable, // Gated by hasLlvmSupport().
105		103
106	};	104	};
...	@@ -1303,7 +1301,7 @@ pub const Object = struct {	...	@@ -1303,7 +1301,7 @@ pub const Object = struct {
1303	.large => .Large,	1301	.large => .Large,
1304	};	1302	};
1305		1303
1306	const float_abi: llvm.TargetMachine.FloatABI = if (comp.root_mod.resolved_target.result.floatAbi() == .hard)	1304	const float_abi: llvm.TargetMachine.FloatABI = if (comp.root_mod.resolved_target.result.abi.float() == .hard)
1307	.Hard	1305	.Hard
1308	else	1306	else
1309	.Soft;	1307	.Soft;
...	@@ -2941,7 +2939,7 @@ pub const Object = struct {	...	@@ -2941,7 +2939,7 @@ pub const Object = struct {
2941	function_index.setLinkage(.internal, &o.builder);	2939	function_index.setLinkage(.internal, &o.builder);
2942	function_index.setUnnamedAddr(.unnamed_addr, &o.builder);	2940	function_index.setUnnamedAddr(.unnamed_addr, &o.builder);
2943	} else {	2941	} else {
2944	if (target.isWasm()) {	2942	if (target.cpu.arch.isWasm()) {
2945	try attributes.addFnAttr(.{ .string = .{	2943	try attributes.addFnAttr(.{ .string = .{
2946	.kind = try o.builder.string("wasm-import-name"),	2944	.kind = try o.builder.string("wasm-import-name"),
2947	.value = try o.builder.string(nav.name.toSlice(ip)),	2945	.value = try o.builder.string(nav.name.toSlice(ip)),
...	@@ -3158,7 +3156,7 @@ pub const Object = struct {	...	@@ -3158,7 +3156,7 @@ pub const Object = struct {
3158	.value = try o.builder.string(std.mem.span(s)),	3156	.value = try o.builder.string(std.mem.span(s)),
3159	} }, &o.builder);	3157	} }, &o.builder);
3160	}	3158	}
3161	if (target.floatAbi() == .soft) {	3159	if (target.abi.float() == .soft) {
3162	// `use-soft-float` means "use software routines for floating point computations". In	3160	// `use-soft-float` means "use software routines for floating point computations". In
3163	// other words, it configures how LLVM lowers basic float instructions like `fcmp`,	3161	// other words, it configures how LLVM lowers basic float instructions like `fcmp`,
3164	// `fadd`, etc. The float calling convention is configured on `TargetMachine` and is	3162	// `fadd`, etc. The float calling convention is configured on `TargetMachine` and is
...	@@ -4832,7 +4830,7 @@ pub const NavGen = struct {	...	@@ -4832,7 +4830,7 @@ pub const NavGen = struct {
4832	const global_index = o.nav_map.get(nav_index).?;	4830	const global_index = o.nav_map.get(nav_index).?;
4833		4831
4834	const decl_name = decl_name: {	4832	const decl_name = decl_name: {
4835	if (zcu.getTarget().isWasm() and ty.zigTypeTag(zcu) == .@"fn") {	4833	if (zcu.getTarget().cpu.arch.isWasm() and ty.zigTypeTag(zcu) == .@"fn") {
4836	if (lib_name.toSlice(ip)) \|lib_name_slice\| {	4834	if (lib_name.toSlice(ip)) \|lib_name_slice\| {
4837	if (!std.mem.eql(u8, lib_name_slice, "c")) {	4835	if (!std.mem.eql(u8, lib_name_slice, "c")) {
4838	break :decl_name try o.builder.strtabStringFmt("{}\|{s}", .{ nav.name.fmt(ip), lib_name_slice });	4836	break :decl_name try o.builder.strtabStringFmt("{}\|{s}", .{ nav.name.fmt(ip), lib_name_slice });
...	@@ -6569,7 +6567,7 @@ pub const FuncGen = struct {	...	@@ -6569,7 +6567,7 @@ pub const FuncGen = struct {
6569	// Workaround for:	6567	// Workaround for:
6570	// * https://github.com/llvm/llvm-project/blob/56905dab7da50bccfcceaeb496b206ff476127e1/llvm/lib/MC/WasmObjectWriter.cpp#L560	6568	// * https://github.com/llvm/llvm-project/blob/56905dab7da50bccfcceaeb496b206ff476127e1/llvm/lib/MC/WasmObjectWriter.cpp#L560
6571	// * https://github.com/llvm/llvm-project/blob/56905dab7da50bccfcceaeb496b206ff476127e1/llvm/test/MC/WebAssembly/blockaddress.ll	6569	// * https://github.com/llvm/llvm-project/blob/56905dab7da50bccfcceaeb496b206ff476127e1/llvm/test/MC/WebAssembly/blockaddress.ll
6572	if (zcu.comp.getTarget().isWasm()) break :jmp_table null;	6570	if (zcu.comp.getTarget().cpu.arch.isWasm()) break :jmp_table null;
6573		6571
6574	// On a 64-bit target, 1024 pointers in our jump table is about 8K of pointers. This seems just	6572	// On a 64-bit target, 1024 pointers in our jump table is about 8K of pointers. This seems just
6575	// about acceptable - it won't fill L1d cache on most CPUs.	6573	// about acceptable - it won't fill L1d cache on most CPUs.
...	@@ -10026,7 +10024,7 @@ pub const FuncGen = struct {	...	@@ -10026,7 +10024,7 @@ pub const FuncGen = struct {
10026	// of the length. This means we need to emit a check where we skip the memset when the length	10024	// of the length. This means we need to emit a check where we skip the memset when the length
10027	// is 0 as we allow for undefined pointers in 0-sized slices.	10025	// is 0 as we allow for undefined pointers in 0-sized slices.
10028	// This logic can be removed once https://github.com/ziglang/zig/issues/16360 is done.	10026	// This logic can be removed once https://github.com/ziglang/zig/issues/16360 is done.
10029	const intrinsic_len0_traps = o.target.isWasm() and	10027	const intrinsic_len0_traps = o.target.cpu.arch.isWasm() and
10030	ptr_ty.isSlice(zcu) and	10028	ptr_ty.isSlice(zcu) and
10031	std.Target.wasm.featureSetHas(o.target.cpu.features, .bulk_memory);	10029	std.Target.wasm.featureSetHas(o.target.cpu.features, .bulk_memory);
10032		10030
...	@@ -10183,7 +10181,7 @@ pub const FuncGen = struct {	...	@@ -10183,7 +10181,7 @@ pub const FuncGen = struct {
10183	// For this reason we must add a check for 0-sized slices as its pointer field can be undefined.	10181	// For this reason we must add a check for 0-sized slices as its pointer field can be undefined.
10184	// We only have to do this for slices as arrays will have a valid pointer.	10182	// We only have to do this for slices as arrays will have a valid pointer.
10185	// This logic can be removed once https://github.com/ziglang/zig/issues/16360 is done.	10183	// This logic can be removed once https://github.com/ziglang/zig/issues/16360 is done.
10186	if (o.target.isWasm() and	10184	if (o.target.cpu.arch.isWasm() and
10187	std.Target.wasm.featureSetHas(o.target.cpu.features, .bulk_memory) and	10185	std.Target.wasm.featureSetHas(o.target.cpu.features, .bulk_memory) and
10188	dest_ptr_ty.isSlice(zcu))	10186	dest_ptr_ty.isSlice(zcu))
10189	{	10187	{
...	@@ -11768,16 +11766,8 @@ fn toLlvmCallConvTag(cc_tag: std.builtin.CallingConvention.Tag, target: std.Targ	...	@@ -11768,16 +11766,8 @@ fn toLlvmCallConvTag(cc_tag: std.builtin.CallingConvention.Tag, target: std.Targ
11768	.x86_interrupt => .x86_intrcc,	11766	.x86_interrupt => .x86_intrcc,
11769	.aarch64_vfabi => .aarch64_vector_pcs,	11767	.aarch64_vfabi => .aarch64_vector_pcs,
11770	.aarch64_vfabi_sve => .aarch64_sve_vector_pcs,	11768	.aarch64_vfabi_sve => .aarch64_sve_vector_pcs,
11771	.arm_apcs => .arm_apcscc,
11772	.arm_aapcs => .arm_aapcscc,	11769	.arm_aapcs => .arm_aapcscc,
11773	.arm_aapcs_vfp => if (target.os.tag != .watchos)	11770	.arm_aapcs_vfp => .arm_aapcs_vfpcc,
11774	.arm_aapcs_vfpcc
11775	else
11776	null,
11777	.arm_aapcs16_vfp => if (target.os.tag == .watchos)
11778	.arm_aapcs_vfpcc
11779	else
11780	null,
11781	.riscv64_lp64_v => .riscv_vectorcallcc,	11771	.riscv64_lp64_v => .riscv_vectorcallcc,
11782	.riscv32_ilp32_v => .riscv_vectorcallcc,	11772	.riscv32_ilp32_v => .riscv_vectorcallcc,
11783	.avr_builtin => .avr_builtincc,	11773	.avr_builtin => .avr_builtincc,
...	@@ -11821,7 +11811,7 @@ fn toLlvmCallConvTag(cc_tag: std.builtin.CallingConvention.Tag, target: std.Targ	...	@@ -11821,7 +11811,7 @@ fn toLlvmCallConvTag(cc_tag: std.builtin.CallingConvention.Tag, target: std.Targ
11821	.powerpc_sysv_altivec,	11811	.powerpc_sysv_altivec,
11822	.powerpc_aix,	11812	.powerpc_aix,
11823	.powerpc_aix_altivec,	11813	.powerpc_aix_altivec,
11824	.wasm_watc,	11814	.wasm_mvp,
11825	.arc_sysv,	11815	.arc_sysv,
11826	.avr_gnu,	11816	.avr_gnu,
11827	.bpf_std,	11817	.bpf_std,
...	@@ -11834,8 +11824,7 @@ fn toLlvmCallConvTag(cc_tag: std.builtin.CallingConvention.Tag, target: std.Targ	...	@@ -11834,8 +11824,7 @@ fn toLlvmCallConvTag(cc_tag: std.builtin.CallingConvention.Tag, target: std.Targ
11834	.m68k_sysv,	11824	.m68k_sysv,
11835	.m68k_gnu,	11825	.m68k_gnu,
11836	.msp430_eabi,	11826	.msp430_eabi,
11837	.propeller1_sysv,	11827	.propeller_sysv,
11838	.propeller2_sysv,
11839	.s390x_sysv,	11828	.s390x_sysv,
11840	.s390x_sysv_vx,	11829	.s390x_sysv_vx,
11841	.ve_sysv,	11830	.ve_sysv,
...	@@ -11999,12 +11988,12 @@ fn firstParamSRet(fn_info: InternPool.Key.FuncType, zcu: *Zcu, target: std.Targe	...	@@ -11999,12 +11988,12 @@ fn firstParamSRet(fn_info: InternPool.Key.FuncType, zcu: *Zcu, target: std.Targe
11999	.x86_64_win => x86_64_abi.classifyWindows(return_type, zcu) == .memory,	11988	.x86_64_win => x86_64_abi.classifyWindows(return_type, zcu) == .memory,
12000	.x86_sysv, .x86_win => isByRef(return_type, zcu),	11989	.x86_sysv, .x86_win => isByRef(return_type, zcu),
12001	.x86_stdcall => !isScalar(zcu, return_type),	11990	.x86_stdcall => !isScalar(zcu, return_type),
12002	.wasm_watc => wasm_c_abi.classifyType(return_type, zcu)[0] == .indirect,	11991	.wasm_mvp => wasm_c_abi.classifyType(return_type, zcu)[0] == .indirect,
12003	.aarch64_aapcs,	11992	.aarch64_aapcs,
12004	.aarch64_aapcs_darwin,	11993	.aarch64_aapcs_darwin,
12005	.aarch64_aapcs_win,	11994	.aarch64_aapcs_win,
12006	=> aarch64_c_abi.classifyType(return_type, zcu) == .memory,	11995	=> aarch64_c_abi.classifyType(return_type, zcu) == .memory,
12007	.arm_aapcs, .arm_aapcs_vfp, .arm_aapcs16_vfp => switch (arm_c_abi.classifyType(return_type, zcu, .ret)) {	11996	.arm_aapcs, .arm_aapcs_vfp => switch (arm_c_abi.classifyType(return_type, zcu, .ret)) {
12008	.memory, .i64_array => true,	11997	.memory, .i64_array => true,
12009	.i32_array => \|size\| size != 1,	11998	.i32_array => \|size\| size != 1,
12010	.byval => false,	11999	.byval => false,
...	@@ -12054,7 +12043,7 @@ fn lowerFnRetTy(o: *Object, fn_info: InternPool.Key.FuncType) Allocator.Error!Bu	...	@@ -12054,7 +12043,7 @@ fn lowerFnRetTy(o: *Object, fn_info: InternPool.Key.FuncType) Allocator.Error!Bu
12054	.integer => return o.builder.intType(@intCast(return_type.bitSize(zcu))),	12043	.integer => return o.builder.intType(@intCast(return_type.bitSize(zcu))),
12055	.double_integer => return o.builder.arrayType(2, .i64),	12044	.double_integer => return o.builder.arrayType(2, .i64),
12056	},	12045	},
12057	.arm_aapcs, .arm_aapcs_vfp, .arm_aapcs16_vfp => switch (arm_c_abi.classifyType(return_type, zcu, .ret)) {	12046	.arm_aapcs, .arm_aapcs_vfp => switch (arm_c_abi.classifyType(return_type, zcu, .ret)) {
12058	.memory, .i64_array => return .void,	12047	.memory, .i64_array => return .void,
12059	.i32_array => \|len\| return if (len == 1) .i32 else .void,	12048	.i32_array => \|len\| return if (len == 1) .i32 else .void,
12060	.byval => return o.lowerType(return_type),	12049	.byval => return o.lowerType(return_type),
...	@@ -12084,7 +12073,7 @@ fn lowerFnRetTy(o: *Object, fn_info: InternPool.Key.FuncType) Allocator.Error!Bu	...	@@ -12084,7 +12073,7 @@ fn lowerFnRetTy(o: *Object, fn_info: InternPool.Key.FuncType) Allocator.Error!Bu
12084	return o.builder.structType(.normal, types[0..types_len]);	12073	return o.builder.structType(.normal, types[0..types_len]);
12085	},	12074	},
12086	},	12075	},
12087	.wasm_watc => {	12076	.wasm_mvp => {
12088	if (isScalar(zcu, return_type)) {	12077	if (isScalar(zcu, return_type)) {
12089	return o.lowerType(return_type);	12078	return o.lowerType(return_type);
12090	}	12079	}
...	@@ -12303,7 +12292,7 @@ const ParamTypeIterator = struct {	...	@@ -12303,7 +12292,7 @@ const ParamTypeIterator = struct {
12303	.double_integer => return Lowering{ .i64_array = 2 },	12292	.double_integer => return Lowering{ .i64_array = 2 },
12304	}	12293	}
12305	},	12294	},
12306	.arm_aapcs, .arm_aapcs_vfp, .arm_aapcs16_vfp => {	12295	.arm_aapcs, .arm_aapcs_vfp => {
12307	it.zig_index += 1;	12296	it.zig_index += 1;
12308	it.llvm_index += 1;	12297	it.llvm_index += 1;
12309	switch (arm_c_abi.classifyType(ty, zcu, .arg)) {	12298	switch (arm_c_abi.classifyType(ty, zcu, .arg)) {
...	@@ -12349,7 +12338,7 @@ const ParamTypeIterator = struct {	...	@@ -12349,7 +12338,7 @@ const ParamTypeIterator = struct {
12349	},	12338	},
12350	}	12339	}
12351	},	12340	},
12352	.wasm_watc => {	12341	.wasm_mvp => {
12353	it.zig_index += 1;	12342	it.zig_index += 1;
12354	it.llvm_index += 1;	12343	it.llvm_index += 1;
12355	if (isScalar(zcu, ty)) {	12344	if (isScalar(zcu, ty)) {
...	@@ -12707,7 +12696,7 @@ fn backendSupportsF16(target: std.Target) bool {	...	@@ -12707,7 +12696,7 @@ fn backendSupportsF16(target: std.Target) bool {
12707	.armeb,	12696	.armeb,
12708	.thumb,	12697	.thumb,
12709	.thumbeb,	12698	.thumbeb,
12710	=> target.floatAbi() == .soft or std.Target.arm.featureSetHas(target.cpu.features, .fp_armv8),	12699	=> target.abi.float() == .soft or std.Target.arm.featureSetHas(target.cpu.features, .fp_armv8),
12711	.aarch64,	12700	.aarch64,
12712	.aarch64_be,	12701	.aarch64_be,
12713	=> std.Target.aarch64.featureSetHas(target.cpu.features, .fp_armv8),	12702	=> std.Target.aarch64.featureSetHas(target.cpu.features, .fp_armv8),
...	@@ -12734,7 +12723,7 @@ fn backendSupportsF128(target: std.Target) bool {	...	@@ -12734,7 +12723,7 @@ fn backendSupportsF128(target: std.Target) bool {
12734	.armeb,	12723	.armeb,
12735	.thumb,	12724	.thumb,
12736	.thumbeb,	12725	.thumbeb,
12737	=> target.floatAbi() == .soft or std.Target.arm.featureSetHas(target.cpu.features, .fp_armv8),	12726	=> target.abi.float() == .soft or std.Target.arm.featureSetHas(target.cpu.features, .fp_armv8),
12738	.aarch64,	12727	.aarch64,
12739	.aarch64_be,	12728	.aarch64_be,
12740	=> std.Target.aarch64.featureSetHas(target.cpu.features, .fp_armv8),	12729	=> std.Target.aarch64.featureSetHas(target.cpu.features, .fp_armv8),
...	@@ -13024,9 +13013,7 @@ pub fn initializeLLVMTarget(arch: std.Target.Cpu.Arch) void {	...	@@ -13024,9 +13013,7 @@ pub fn initializeLLVMTarget(arch: std.Target.Cpu.Arch) void {
13024		13013
13025	// LLVM does does not have a backend for these.	13014	// LLVM does does not have a backend for these.
13026	.kalimba,	13015	.kalimba,
13027	.spu_2,	13016	.propeller,
13028	.propeller1,
13029	.propeller2,
13030	=> unreachable,	13017	=> unreachable,
13031	}	13018	}
13032	}	13019	}

src/glibc.zig+1-1

...	@@ -469,7 +469,7 @@ fn add_include_dirs(comp: Compilation, arena: Allocator, args: std.ArrayList([	...	@@ -469,7 +469,7 @@ fn add_include_dirs(comp: Compilation, arena: Allocator, args: std.ArrayList([
469	try args.append("-I");	469	try args.append("-I");
470	try args.append(try lib_path(comp, arena, lib_libc ++ "include" ++ s ++ "generic-glibc"));	470	try args.append(try lib_path(comp, arena, lib_libc ++ "include" ++ s ++ "generic-glibc"));
471		471
472	const arch_name = target.osArchName();	472	const arch_name = std.zig.target.osArchName(target);
473	try args.append("-I");	473	try args.append("-I");
474	try args.append(try std.fmt.allocPrint(arena, "{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "{s}-linux-any", .{	474	try args.append(try std.fmt.allocPrint(arena, "{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "{s}-linux-any", .{
475	comp.zig_lib_directory.path.?, arch_name,	475	comp.zig_lib_directory.path.?, arch_name,

src/libtsan.zig+6-6

 @@ -36,7 +36,7 @@ pub fn buildTsan(comp: *Compilation, prog_node: std.Progress.Node) BuildError!vo
         .watchos => if (target.abi == .simulator) "clang_rt.tsan_watchossim_dynamic" else "clang_rt.tsan_watchos_dynamic",
         else => "tsan",
     };
-    const link_mode: std.builtin.LinkMode = if (target.isDarwin()) .dynamic else .static;
+    const link_mode: std.builtin.LinkMode = if (target.os.tag.isDarwin()) .dynamic else .static;
     const output_mode = .Lib;
     const basename = try std.zig.binNameAlloc(arena, .{
         .root_name = root_name,
 @@ -52,9 +52,9 @@ pub fn buildTsan(comp: *Compilation, prog_node: std.Progress.Node) BuildError!vo
     const optimize_mode = comp.compilerRtOptMode();
     const strip = comp.compilerRtStrip();
-    const link_libcpp = target.isDarwin();
     const unwind_tables: std.builtin.UnwindTables =
         if (target.cpu.arch == .x86 and target.os.tag == .windows) .none else .@"async";
+    const link_libcpp = target.os.tag.isDarwin();
     const config = Compilation.Config.resolve(.{
         .output_mode = output_mode,
 @@ -276,14 +276,14 @@ pub fn buildTsan(comp: *Compilation, prog_node: std.Progress.Node) BuildError!vo
         });
     }
-    const skip_linker_dependencies = !target.isDarwin();
+    const skip_linker_dependencies = !target.os.tag.isDarwin();
-    const linker_allow_shlib_undefined = target.isDarwin();
+    const linker_allow_shlib_undefined = target.os.tag.isDarwin();
-    const install_name = if (target.isDarwin())
+    const install_name = if (target.os.tag.isDarwin())
         try std.fmt.allocPrintZ(arena, "@rpath/{s}", .{basename})
     else
         null;
     // Workaround for https://github.com/llvm/llvm-project/issues/97627
-    const headerpad_size: ?u32 = if (target.isDarwin()) 32 else null;
+    const headerpad_size: ?u32 = if (target.os.tag.isDarwin()) 32 else null;
     const sub_compilation = Compilation.create(comp.gpa, arena, .{
         .local_cache_directory = comp.global_cache_directory,
         .global_cache_directory = comp.global_cache_directory,

src/libunwind.zig+1-1

...	@@ -136,7 +136,7 @@ pub fn buildStaticLib(comp: *Compilation, prog_node: std.Progress.Node) BuildErr	...	@@ -136,7 +136,7 @@ pub fn buildStaticLib(comp: *Compilation, prog_node: std.Progress.Node) BuildErr
136	if (!comp.config.any_non_single_threaded) {	136	if (!comp.config.any_non_single_threaded) {
137	try cflags.append("-D_LIBUNWIND_HAS_NO_THREADS");	137	try cflags.append("-D_LIBUNWIND_HAS_NO_THREADS");
138	}	138	}
139	if (target.cpu.arch.isArm() and target.abi.floatAbi() == .hard) {	139	if (target.cpu.arch.isArm() and target.abi.float() == .hard) {
140	try cflags.append("-DCOMPILER_RT_ARMHF_TARGET");	140	try cflags.append("-DCOMPILER_RT_ARMHF_TARGET");
141	}	141	}
142	try cflags.append("-Wno-bitwise-conditional-parentheses");	142	try cflags.append("-Wno-bitwise-conditional-parentheses");

src/link.zig+2-2

...	@@ -2067,7 +2067,7 @@ fn resolveLibInput(	...	@@ -2067,7 +2067,7 @@ fn resolveLibInput(
2067		2067
2068	const lib_name = name_query.name;	2068	const lib_name = name_query.name;
2069		2069
2070	if (target.isDarwin() and link_mode == .dynamic) tbd: {	2070	if (target.os.tag.isDarwin() and link_mode == .dynamic) tbd: {
2071	// Prefer .tbd over .dylib.	2071	// Prefer .tbd over .dylib.
2072	const test_path: Path = .{	2072	const test_path: Path = .{
2073	.root_dir = lib_directory,	2073	.root_dir = lib_directory,
...	@@ -2104,7 +2104,7 @@ fn resolveLibInput(	...	@@ -2104,7 +2104,7 @@ fn resolveLibInput(
2104		2104
2105	// In the case of Darwin, the main check will be .dylib, so here we	2105	// In the case of Darwin, the main check will be .dylib, so here we
2106	// additionally check for .so files.	2106	// additionally check for .so files.
2107	if (target.isDarwin() and link_mode == .dynamic) so: {	2107	if (target.os.tag.isDarwin() and link_mode == .dynamic) so: {
2108	const test_path: Path = .{	2108	const test_path: Path = .{
2109	.root_dir = lib_directory,	2109	.root_dir = lib_directory,
2110	.sub_path = try std.fmt.allocPrint(arena, "lib{s}.so", .{lib_name}),	2110	.sub_path = try std.fmt.allocPrint(arena, "lib{s}.so", .{lib_name}),

src/link/Coff.zig+1-1

...	@@ -1881,7 +1881,7 @@ fn linkWithLLD(coff: *Coff, arena: Allocator, tid: Zcu.PerThread.Id, prog_node:	...	@@ -1881,7 +1881,7 @@ fn linkWithLLD(coff: *Coff, arena: Allocator, tid: Zcu.PerThread.Id, prog_node:
1881	try argv.append(try allocPrint(arena, "-MLLVM:-target-abi={s}", .{mabi}));	1881	try argv.append(try allocPrint(arena, "-MLLVM:-target-abi={s}", .{mabi}));
1882	}	1882	}
1883		1883
1884	try argv.append(try allocPrint(arena, "-MLLVM:-float-abi={s}", .{if (target.abi.floatAbi() == .hard) "hard" else "soft"}));	1884	try argv.append(try allocPrint(arena, "-MLLVM:-float-abi={s}", .{if (target.abi.float() == .hard) "hard" else "soft"}));
1885		1885
1886	if (comp.config.lto != .none) {	1886	if (comp.config.lto != .none) {
1887	switch (optimize_mode) {	1887	switch (optimize_mode) {

src/link/Dwarf.zig+1-4

 @@ -3538,11 +3538,8 @@ fn updateLazyType(
                     .aarch64_vfabi => .LLVM_AAPCS,
                     .aarch64_vfabi_sve => .LLVM_AAPCS,
-                    .arm_apcs => .normal,
                     .arm_aapcs => .LLVM_AAPCS,
-                    .arm_aapcs_vfp,
+                    .arm_aapcs_vfp => .LLVM_AAPCS_VFP,
-                    .arm_aapcs16_vfp,
-                    => .LLVM_AAPCS_VFP,
                     .riscv64_lp64_v,
                     .riscv32_ilp32_v,

src/link/Elf.zig+2-2

...	@@ -1709,7 +1709,7 @@ fn linkWithLLD(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: s	...	@@ -1709,7 +1709,7 @@ fn linkWithLLD(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: s
1709		1709
1710	try argv.appendSlice(&.{	1710	try argv.appendSlice(&.{
1711	"-mllvm",	1711	"-mllvm",
1712	try std.fmt.allocPrint(arena, "-float-abi={s}", .{if (target.abi.floatAbi() == .hard) "hard" else "soft"}),	1712	try std.fmt.allocPrint(arena, "-float-abi={s}", .{if (target.abi.float() == .hard) "hard" else "soft"}),
1713	});	1713	});
1714		1714
1715	if (comp.config.lto != .none) {	1715	if (comp.config.lto != .none) {
...	@@ -2053,7 +2053,7 @@ fn linkWithLLD(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: s	...	@@ -2053,7 +2053,7 @@ fn linkWithLLD(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: s
2053	try argv.append(lib_path);	2053	try argv.append(lib_path);
2054	}	2054	}
2055	try argv.append(try comp.crtFileAsString(arena, "libc_nonshared.a"));	2055	try argv.append(try comp.crtFileAsString(arena, "libc_nonshared.a"));
2056	} else if (target.isMusl()) {	2056	} else if (target.abi.isMusl()) {
2057	try argv.append(try comp.crtFileAsString(arena, switch (link_mode) {	2057	try argv.append(try comp.crtFileAsString(arena, switch (link_mode) {
2058	.static => "libc.a",	2058	.static => "libc.a",
2059	.dynamic => "libc.so",	2059	.dynamic => "libc.so",

src/link/MachO.zig+1-1

...	@@ -3548,7 +3548,7 @@ pub fn getTarget(self: MachO) std.Target {	...	@@ -3548,7 +3548,7 @@ pub fn getTarget(self: MachO) std.Target {
3548	pub fn invalidateKernelCache(dir: fs.Dir, sub_path: []const u8) !void {	3548	pub fn invalidateKernelCache(dir: fs.Dir, sub_path: []const u8) !void {
3549	const tracy = trace(@src());	3549	const tracy = trace(@src());
3550	defer tracy.end();	3550	defer tracy.end();
3551	if (builtin.target.isDarwin() and builtin.target.cpu.arch == .aarch64) {	3551	if (builtin.target.os.tag.isDarwin() and builtin.target.cpu.arch == .aarch64) {
3552	try dir.copyFile(sub_path, dir, sub_path, .{});	3552	try dir.copyFile(sub_path, dir, sub_path, .{});
3553	}	3553	}
3554	}	3554	}

src/link/Wasm.zig+2-2

src/main.zig+1-1

...	@@ -3983,7 +3983,7 @@ fn createModule(	...	@@ -3983,7 +3983,7 @@ fn createModule(
3983	}	3983	}
3984	create_module.lib_dir_args = undefined; // From here we use lib_directories instead.	3984	create_module.lib_dir_args = undefined; // From here we use lib_directories instead.
3985		3985
3986	if (resolved_target.is_native_os and target.isDarwin()) {	3986	if (resolved_target.is_native_os and target.os.tag.isDarwin()) {
3987	// If we want to link against frameworks, we need system headers.	3987	// If we want to link against frameworks, we need system headers.
3988	if (create_module.frameworks.count() > 0)	3988	if (create_module.frameworks.count() > 0)
3989	create_module.want_native_include_dirs = true;	3989	create_module.want_native_include_dirs = true;

src/target.zig+9-12

 @@ -12,7 +12,7 @@ pub const default_stack_protector_buffer_size = 4;
 pub fn cannotDynamicLink(target: std.Target) bool {
     return switch (target.os.tag) {
         .freestanding => true,
-        else => target.isSpirV(),
+        else => target.cpu.arch.isSpirV(),
     };
 }
 @@ -40,12 +40,12 @@ pub fn libcNeedsLibUnwind(target: std.Target) bool {
 }
 pub fn requiresPIE(target: std.Target) bool {
-    return target.isAndroid() or target.isDarwin() or target.os.tag == .openbsd;
+    return target.abi.isAndroid() or target.os.tag.isDarwin() or target.os.tag == .openbsd;
 }
 /// This function returns whether non-pic code is completely invalid on the given target.
 pub fn requiresPIC(target: std.Target, linking_libc: bool) bool {
-    return target.isAndroid() or
+    return target.abi.isAndroid() or
         target.os.tag == .windows or target.os.tag == .uefi or
         osRequiresLibC(target) or
         (linking_libc and target.isGnuLibC());
 @@ -195,9 +195,7 @@ pub fn hasLlvmSupport(target: std.Target, ofmt: std.Target.ObjectFormat) bool {
         // No LLVM backend exists.
         .kalimba,
-        .spu_2,
+        .propeller,
-        .propeller1,
-        .propeller2,
         => false,
     };
 }
 @@ -247,7 +245,7 @@ pub fn clangSupportsStackProtector(target: std.Target) bool {
 }
 pub fn libcProvidesStackProtector(target: std.Target) bool {
-    return !target.isMinGW() and target.os.tag != .wasi and !target.isSpirV();
+    return !target.isMinGW() and target.os.tag != .wasi and !target.cpu.arch.isSpirV();
 }
 pub fn supportsReturnAddress(target: std.Target) bool {
 @@ -444,12 +442,11 @@ pub fn addrSpaceCastIsValid(
     from: AddressSpace,
     to: AddressSpace,
 ) bool {
-    const arch = target.cpu.arch;
+    switch (target.cpu.arch) {
-    switch (arch) {
+        .x86_64, .x86 => return target.cpu.supportsAddressSpace(from, null) and target.cpu.supportsAddressSpace(to, null),
-        .x86_64, .x86 => return arch.supportsAddressSpace(from) and arch.supportsAddressSpace(to),
         .nvptx64, .nvptx, .amdgcn => {
-            const to_generic = arch.supportsAddressSpace(from) and to == .generic;
+            const to_generic = target.cpu.supportsAddressSpace(from, null) and to == .generic;
-            const from_generic = arch.supportsAddressSpace(to) and from == .generic;
+            const from_generic = target.cpu.supportsAddressSpace(to, null) and from == .generic;
             return to_generic or from_generic;
         },
         else => return from == .generic and to == .generic,

stage1/zig.h+94-57

stage1/zig1.wasm

Binary files a/stage1/zig1.wasm and b/stage1/zig1.wasm differ

test/behavior/floatop.zig+2-2

...	@@ -126,7 +126,7 @@ test "cmp f16" {	...	@@ -126,7 +126,7 @@ test "cmp f16" {
126	if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;	126	if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
127	if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;	127	if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
128	if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;	128	if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
129	if (builtin.cpu.arch.isArm() and builtin.target.floatAbi() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234	129	if (builtin.cpu.arch.isArm() and builtin.target.abi.float() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234
130		130
131	try testCmp(f16);	131	try testCmp(f16);
132	try comptime testCmp(f16);	132	try comptime testCmp(f16);
...	@@ -135,7 +135,7 @@ test "cmp f16" {	...	@@ -135,7 +135,7 @@ test "cmp f16" {
135	test "cmp f32/f64" {	135	test "cmp f32/f64" {
136	if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO	136	if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
137	if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;	137	if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
138	if (builtin.cpu.arch.isArm() and builtin.target.floatAbi() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234	138	if (builtin.cpu.arch.isArm() and builtin.target.abi.float() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234
139		139
140	try testCmp(f32);	140	try testCmp(f32);
141	try comptime testCmp(f32);	141	try comptime testCmp(f32);

test/behavior/math.zig+3-3

test/c_abi/main.zig+4-4

...	@@ -135,7 +135,7 @@ export fn zig_f64(x: f64) void {	...	@@ -135,7 +135,7 @@ export fn zig_f64(x: f64) void {
135	expect(x == 56.78) catch @panic("test failure: zig_f64");	135	expect(x == 56.78) catch @panic("test failure: zig_f64");
136	}	136	}
137	export fn zig_longdouble(x: c_longdouble) void {	137	export fn zig_longdouble(x: c_longdouble) void {
138	if (!builtin.target.isWasm()) return; // waiting for #1481	138	if (!builtin.target.cpu.arch.isWasm()) return; // waiting for #1481
139	expect(x == 12.34) catch @panic("test failure: zig_longdouble");	139	expect(x == 12.34) catch @panic("test failure: zig_longdouble");
140	}	140	}
141		141
...	@@ -1661,7 +1661,7 @@ test "bool simd vector" {	...	@@ -1661,7 +1661,7 @@ test "bool simd vector" {
1661	}	1661	}
1662		1662
1663	{	1663	{
1664	if (!builtin.target.isWasm()) c_vector_256_bool(.{	1664	if (!builtin.target.cpu.arch.isWasm()) c_vector_256_bool(.{
1665	false,	1665	false,
1666	true,	1666	true,
1667	true,	1667	true,
...	@@ -2179,7 +2179,7 @@ test "bool simd vector" {	...	@@ -2179,7 +2179,7 @@ test "bool simd vector" {
2179	try expect(vec[255] == false);	2179	try expect(vec[255] == false);
2180	}	2180	}
2181	{	2181	{
2182	if (!builtin.target.isWasm()) c_vector_512_bool(.{	2182	if (!builtin.target.cpu.arch.isWasm()) c_vector_512_bool(.{
2183	true,	2183	true,
2184	true,	2184	true,
2185	true,	2185	true,
...	@@ -5593,7 +5593,7 @@ test "f80 extra struct" {	...	@@ -5593,7 +5593,7 @@ test "f80 extra struct" {
5593		5593
5594	comptime {	5594	comptime {
5595	skip: {	5595	skip: {
5596	if (builtin.target.isWasm()) break :skip;	5596	if (builtin.target.cpu.arch.isWasm()) break :skip;
5597		5597
5598	_ = struct {	5598	_ = struct {
5599	export fn zig_f128(x: f128) f128 {	5599	export fn zig_f128(x: f128) f128 {

test/cases/compile_errors/@import_zon_bad_type.zig+3-3

...	@@ -117,9 +117,9 @@ export fn testMutablePointer() void {	...	@@ -117,9 +117,9 @@ export fn testMutablePointer() void {
117	// tmp.zig:37:38: note: imported here	117	// tmp.zig:37:38: note: imported here
118	// neg_inf.zon:1:1: error: expected type '?u8'	118	// neg_inf.zon:1:1: error: expected type '?u8'
119	// tmp.zig:57:28: note: imported here	119	// tmp.zig:57:28: note: imported here
120	// neg_inf.zon:1:1: error: expected type 'tmp.testNonExhaustiveEnum__enum_490'	120	// neg_inf.zon:1:1: error: expected type 'tmp.testNonExhaustiveEnum__enum_487'
121	// tmp.zig:62:39: note: imported here	121	// tmp.zig:62:39: note: imported here
122	// neg_inf.zon:1:1: error: expected type 'tmp.testUntaggedUnion__union_492'	122	// neg_inf.zon:1:1: error: expected type 'tmp.testUntaggedUnion__union_489'
123	// tmp.zig:67:44: note: imported here	123	// tmp.zig:67:44: note: imported here
124	// neg_inf.zon:1:1: error: expected type 'tmp.testTaggedUnionVoid__union_495'	124	// neg_inf.zon:1:1: error: expected type 'tmp.testTaggedUnionVoid__union_492'
125	// tmp.zig:72:50: note: imported here	125	// tmp.zig:72:50: note: imported here

test/cases/compile_errors/anytype_param_requires_comptime.zig+1-1

...	@@ -15,6 +15,6 @@ pub export fn entry() void {	...	@@ -15,6 +15,6 @@ pub export fn entry() void {
15	// error	15	// error
16	//	16	//
17	// :7:25: error: unable to resolve comptime value	17	// :7:25: error: unable to resolve comptime value
18	// :7:25: note: initializer of comptime-only struct 'tmp.S.foo__anon_464.C' must be comptime-known	18	// :7:25: note: initializer of comptime-only struct 'tmp.S.foo__anon_461.C' must be comptime-known
19	// :4:16: note: struct requires comptime because of this field	19	// :4:16: note: struct requires comptime because of this field
20	// :4:16: note: types are not available at runtime	20	// :4:16: note: types are not available at runtime

test/cases/compile_errors/bogus_method_call_on_slice.zig+1-1

...	@@ -16,5 +16,5 @@ pub export fn entry2() void {	...	@@ -16,5 +16,5 @@ pub export fn entry2() void {
16	//	16	//
17	// :3:6: error: no field or member function named 'copy' in '[]const u8'	17	// :3:6: error: no field or member function named 'copy' in '[]const u8'
18	// :9:8: error: no field or member function named 'bar' in '@TypeOf(.{})'	18	// :9:8: error: no field or member function named 'bar' in '@TypeOf(.{})'
19	// :12:18: error: no field or member function named 'bar' in 'tmp.entry2__struct_468'	19	// :12:18: error: no field or member function named 'bar' in 'tmp.entry2__struct_465'
20	// :12:6: note: struct declared here	20	// :12:6: note: struct declared here

test/cases/compile_errors/callconv_apcs_aapcs_aapcsvfp_on_unsupported_platform.zig+2-4

 @@ -1,10 +1,8 @@
-export fn entry1() callconv(.APCS) void {}
 export fn entry2() callconv(.AAPCS) void {}
 export fn entry3() callconv(.AAPCSVFP) void {}
 // error
 // target=x86_64-linux-none
 //
-// :1:30: error: calling convention 'arm_apcs' only available on architectures 'arm', 'armeb', 'thumb', 'thumbeb'
+// :1:30: error: calling convention 'arm_aapcs' only available on architectures 'arm', 'armeb', 'thumb', 'thumbeb'
-// :2:30: error: calling convention 'arm_aapcs' only available on architectures 'arm', 'armeb', 'thumb', 'thumbeb'
+// :2:30: error: calling convention 'arm_aapcs_vfp' only available on architectures 'arm', 'armeb', 'thumb', 'thumbeb'
-// :3:30: error: calling convention 'arm_aapcs_vfp' only available on architectures 'arm', 'armeb', 'thumb', 'thumbeb'

test/cases/compile_errors/coerce_anon_struct.zig+1-1

...	@@ -6,6 +6,6 @@ export fn foo() void {	...	@@ -6,6 +6,6 @@ export fn foo() void {
6		6
7	// error	7	// error
8	//	8	//
9	// :4:16: error: expected type 'tmp.T', found 'tmp.foo__struct_457'	9	// :4:16: error: expected type 'tmp.T', found 'tmp.foo__struct_454'
10	// :3:16: note: struct declared here	10	// :3:16: note: struct declared here
11	// :1:11: note: struct declared here	11	// :1:11: note: struct declared here

test/cases/compile_errors/redundant_try.zig+2-2

...	@@ -44,9 +44,9 @@ comptime {	...	@@ -44,9 +44,9 @@ comptime {
44	//	44	//
45	// :5:23: error: expected error union type, found 'comptime_int'	45	// :5:23: error: expected error union type, found 'comptime_int'
46	// :10:23: error: expected error union type, found '@TypeOf(.{})'	46	// :10:23: error: expected error union type, found '@TypeOf(.{})'
47	// :15:23: error: expected error union type, found 'tmp.test2__struct_494'	47	// :15:23: error: expected error union type, found 'tmp.test2__struct_491'
48	// :15:23: note: struct declared here	48	// :15:23: note: struct declared here
49	// :20:27: error: expected error union type, found 'tmp.test3__struct_496'	49	// :20:27: error: expected error union type, found 'tmp.test3__struct_493'
50	// :20:27: note: struct declared here	50	// :20:27: note: struct declared here
51	// :25:23: error: expected error union type, found 'struct { comptime *const [5:0]u8 = "hello" }'	51	// :25:23: error: expected error union type, found 'struct { comptime *const [5:0]u8 = "hello" }'
52	// :31:13: error: expected error union type, found 'u32'	52	// :31:13: error: expected error union type, found 'u32'

test/standalone/stack_iterator/build.zig+2-2

...	@@ -24,7 +24,7 @@ pub fn build(b: *std.Build) void {	...	@@ -24,7 +24,7 @@ pub fn build(b: *std.Build) void {
24	.root_source_file = b.path("unwind.zig"),	24	.root_source_file = b.path("unwind.zig"),
25	.target = target,	25	.target = target,
26	.optimize = optimize,	26	.optimize = optimize,
27	.unwind_tables = if (target.result.isDarwin()) .@"async" else null,	27	.unwind_tables = if (target.result.os.tag.isDarwin()) .@"async" else null,
28	.omit_frame_pointer = false,	28	.omit_frame_pointer = false,
29	}),	29	}),
30	});	30	});
...	@@ -94,7 +94,7 @@ pub fn build(b: *std.Build) void {	...	@@ -94,7 +94,7 @@ pub fn build(b: *std.Build) void {
94	.root_source_file = b.path("shared_lib_unwind.zig"),	94	.root_source_file = b.path("shared_lib_unwind.zig"),
95	.target = target,	95	.target = target,
96	.optimize = optimize,	96	.optimize = optimize,
97	.unwind_tables = if (target.result.isDarwin()) .@"async" else null,	97	.unwind_tables = if (target.result.os.tag.isDarwin()) .@"async" else null,
98	.omit_frame_pointer = true,	98	.omit_frame_pointer = true,
99	}),	99	}),
100	});	100	});

test/standalone/stack_iterator/shared_lib_unwind.zig+2-2

...	@@ -36,8 +36,8 @@ extern fn frame0(	...	@@ -36,8 +36,8 @@ extern fn frame0(
36		36
37	pub fn main() !void {	37	pub fn main() !void {
38	// Disabled until the DWARF unwinder bugs on .aarch64 are solved	38	// Disabled until the DWARF unwinder bugs on .aarch64 are solved
39	if (builtin.omit_frame_pointer and comptime builtin.target.isDarwin() and builtin.cpu.arch == .aarch64) return;	39	if (builtin.omit_frame_pointer and comptime builtin.target.os.tag.isDarwin() and builtin.cpu.arch == .aarch64) return;
40	if (builtin.target.isDarwin() and builtin.cpu.arch == .x86_64) return; // https://github.com/ziglang/zig/issues/21337	40	if (builtin.target.os.tag.isDarwin() and builtin.cpu.arch == .x86_64) return; // https://github.com/ziglang/zig/issues/21337
41		41
42	if (!std.debug.have_ucontext or !std.debug.have_getcontext) return;	42	if (!std.debug.have_ucontext or !std.debug.have_getcontext) return;
43		43

test/standalone/stack_iterator/unwind.zig+1-1

...	@@ -88,7 +88,7 @@ noinline fn frame0(expected: [4]usize, unwound: [4]usize) void {	...	@@ -88,7 +88,7 @@ noinline fn frame0(expected: [4]usize, unwound: [4]usize) void {
88		88
89	pub fn main() !void {	89	pub fn main() !void {
90	// Disabled until the DWARF unwinder bugs on .aarch64 are solved	90	// Disabled until the DWARF unwinder bugs on .aarch64 are solved
91	if (builtin.omit_frame_pointer and comptime builtin.target.isDarwin() and builtin.cpu.arch == .aarch64) return;	91	if (builtin.omit_frame_pointer and comptime builtin.target.os.tag.isDarwin() and builtin.cpu.arch == .aarch64) return;
92		92
93	if (!std.debug.have_ucontext or !std.debug.have_getcontext) return;	93	if (!std.debug.have_ucontext or !std.debug.have_getcontext) return;
94		94

tools/update_cpu_features.zig+361-281

...	@@ -34,10 +34,12 @@ const Feature = struct {	...	@@ -34,10 +34,12 @@ const Feature = struct {
34	flatten: bool = false,	34	flatten: bool = false,
35	};	35	};
36		36
37	const LlvmTarget = struct {	37	const ArchTarget = struct {
38	zig_name: []const u8,	38	zig_name: []const u8,
39	llvm_name: []const u8,	39	llvm: ?struct {
40	td_name: []const u8,	40	name: []const u8,
		41	td_name: []const u8,
		42	},
41	feature_overrides: []const FeatureOverride = &.{},	43	feature_overrides: []const FeatureOverride = &.{},
42	extra_cpus: []const Cpu = &.{},	44	extra_cpus: []const Cpu = &.{},
43	extra_features: []const Feature = &.{},	45	extra_features: []const Feature = &.{},
...	@@ -45,11 +47,13 @@ const LlvmTarget = struct {	...	@@ -45,11 +47,13 @@ const LlvmTarget = struct {
45	branch_quota: ?usize = null,	47	branch_quota: ?usize = null,
46	};	48	};
47		49
48	const llvm_targets = [_]LlvmTarget{	50	const targets = [_]ArchTarget{
49	.{	51	.{
50	.zig_name = "aarch64",	52	.zig_name = "aarch64",
51	.llvm_name = "AArch64",	53	.llvm = .{
52	.td_name = "AArch64.td",	54	.name = "AArch64",
		55	.td_name = "AArch64",
		56	},
53	.branch_quota = 2000,	57	.branch_quota = 2000,
54	.feature_overrides = &.{	58	.feature_overrides = &.{
55	.{	59	.{
...	@@ -391,8 +395,10 @@ const llvm_targets = [_]LlvmTarget{	...	@@ -391,8 +395,10 @@ const llvm_targets = [_]LlvmTarget{
391	},	395	},
392	.{	396	.{
393	.zig_name = "amdgcn",	397	.zig_name = "amdgcn",
394	.llvm_name = "AMDGPU",	398	.llvm = .{
395	.td_name = "AMDGPU.td",	399	.name = "AMDGPU",
		400	.td_name = "AMDGPU",
		401	},
396	.feature_overrides = &.{	402	.feature_overrides = &.{
397	.{	403	.{
398	.llvm_name = "DumpCode",	404	.llvm_name = "DumpCode",
...	@@ -418,13 +424,17 @@ const llvm_targets = [_]LlvmTarget{	...	@@ -418,13 +424,17 @@ const llvm_targets = [_]LlvmTarget{
418	},	424	},
419	.{	425	.{
420	.zig_name = "arc",	426	.zig_name = "arc",
421	.llvm_name = "ARC",	427	.llvm = .{
422	.td_name = "ARC.td",	428	.name = "ARC",
		429	.td_name = "ARC",
		430	},
423	},	431	},
424	.{	432	.{
425	.zig_name = "arm",	433	.zig_name = "arm",
426	.llvm_name = "ARM",	434	.llvm = .{
427	.td_name = "ARM.td",	435	.name = "ARM",
		436	.td_name = "ARM",
		437	},
428	.branch_quota = 10000,	438	.branch_quota = 10000,
429	.feature_overrides = &.{	439	.feature_overrides = &.{
430	.{	440	.{
...	@@ -928,66 +938,113 @@ const llvm_targets = [_]LlvmTarget{	...	@@ -928,66 +938,113 @@ const llvm_targets = [_]LlvmTarget{
928	},	938	},
929	.{	939	.{
930	.zig_name = "avr",	940	.zig_name = "avr",
931	.llvm_name = "AVR",	941	.llvm = .{
932	.td_name = "AVR.td",	942	.name = "AVR",
		943	.td_name = "AVR",
		944	},
933	},	945	},
934	.{	946	.{
935	.zig_name = "bpf",	947	.zig_name = "bpf",
936	.llvm_name = "BPF",	948	.llvm = .{
937	.td_name = "BPF.td",	949	.name = "BPF",
		950	.td_name = "BPF",
		951	},
938	},	952	},
939	.{	953	.{
940	.zig_name = "csky",	954	.zig_name = "csky",
941	.llvm_name = "CSKY",	955	.llvm = .{
942	.td_name = "CSKY.td",	956	.name = "CSKY",
		957	.td_name = "CSKY",
		958	},
943	},	959	},
944	.{	960	.{
945	.zig_name = "hexagon",	961	.zig_name = "hexagon",
946	.llvm_name = "Hexagon",	962	.llvm = .{
947	.td_name = "Hexagon.td",	963	.name = "Hexagon",
		964	.td_name = "Hexagon",
		965	},
948	},	966	},
949	.{	967	.{
950	.zig_name = "lanai",	968	.zig_name = "lanai",
951	.llvm_name = "Lanai",	969	.llvm = .{
952	.td_name = "Lanai.td",	970	.name = "Lanai",
		971	.td_name = "Lanai",
		972	},
953	},	973	},
954	.{	974	.{
955	.zig_name = "loongarch",	975	.zig_name = "loongarch",
956	.llvm_name = "LoongArch",	976	.llvm = .{
957	.td_name = "LoongArch.td",	977	.name = "LoongArch",
		978	.td_name = "LoongArch",
		979	},
958	},	980	},
959	.{	981	.{
960	.zig_name = "m68k",	982	.zig_name = "m68k",
961	.llvm_name = "M68k",	983	.llvm = .{
962	.td_name = "M68k.td",	984	.name = "M68k",
		985	.td_name = "M68k",
		986	},
963	},	987	},
964	.{	988	.{
965	.zig_name = "msp430",	989	.zig_name = "msp430",
966	.llvm_name = "MSP430",	990	.llvm = .{
967	.td_name = "MSP430.td",	991	.name = "MSP430",
		992	.td_name = "MSP430",
		993	},
968	},	994	},
969	.{	995	.{
970	.zig_name = "mips",	996	.zig_name = "mips",
971	.llvm_name = "Mips",	997	.llvm = .{
972	.td_name = "Mips.td",	998	.name = "Mips",
		999	.td_name = "Mips",
		1000	},
973	},	1001	},
974	.{	1002	.{
975	.zig_name = "nvptx",	1003	.zig_name = "nvptx",
976	.llvm_name = "NVPTX",	1004	.llvm = .{
977	.td_name = "NVPTX.td",	1005	.name = "NVPTX",
		1006	.td_name = "NVPTX",
		1007	},
978	},	1008	},
979	.{	1009	.{
980	.zig_name = "powerpc",	1010	.zig_name = "powerpc",
981	.llvm_name = "PowerPC",	1011	.llvm = .{
982	.td_name = "PPC.td",	1012	.name = "PowerPC",
		1013	.td_name = "PPC",
		1014	},
983	.omit_cpus = &.{	1015	.omit_cpus = &.{
984	"ppc32",	1016	"ppc32",
985	},	1017	},
986	},	1018	},
		1019	.{
		1020	.zig_name = "propeller",
		1021	.llvm = null,
		1022	.extra_features = &.{
		1023	.{
		1024	.zig_name = "p2",
		1025	.desc = "Enable Propeller 2",
		1026	.deps = &.{},
		1027	},
		1028	},
		1029	.extra_cpus = &.{
		1030	.{
		1031	.llvm_name = null,
		1032	.zig_name = "p1",
		1033	.features = &.{},
		1034	},
		1035	.{
		1036	.llvm_name = null,
		1037	.zig_name = "p2",
		1038	.features = &.{"p2"},
		1039	},
		1040	},
		1041	},
987	.{	1042	.{
988	.zig_name = "riscv",	1043	.zig_name = "riscv",
989	.llvm_name = "RISCV",	1044	.llvm = .{
990	.td_name = "RISCV.td",	1045	.name = "RISCV",
		1046	.td_name = "RISCV",
		1047	},
991	.branch_quota = 2000,	1048	.branch_quota = 2000,
992	.feature_overrides = &.{	1049	.feature_overrides = &.{
993	.{	1050	.{
...	@@ -1010,29 +1067,38 @@ const llvm_targets = [_]LlvmTarget{	...	@@ -1010,29 +1067,38 @@ const llvm_targets = [_]LlvmTarget{
1010	},	1067	},
1011	.{	1068	.{
1012	.zig_name = "sparc",	1069	.zig_name = "sparc",
1013	.llvm_name = "Sparc",	1070	.llvm = .{
1014	.td_name = "Sparc.td",	1071	.name = "Sparc",
		1072	.td_name = "Sparc",
		1073	},
1015	},	1074	},
1016	// TODO: merge tools/update_spirv_features.zig into this script	1075	// TODO: merge tools/update_spirv_features.zig into this script
1017	//.{	1076	//.{
1018	// .zig_name = "spirv",	1077	// .zig_name = "spirv",
1019	// .llvm_name = "SPIRV",	1078	// .llvm = .{
1020	// .td_name = "SPIRV.td",	1079	// .name = "SPIRV",
		1080	// },
1021	//},	1081	//},
1022	.{	1082	.{
1023	.zig_name = "s390x",	1083	.zig_name = "s390x",
1024	.llvm_name = "SystemZ",	1084	.llvm = .{
1025	.td_name = "SystemZ.td",	1085	.name = "SystemZ",
		1086	.td_name = "SystemZ",
		1087	},
1026	},	1088	},
1027	.{	1089	.{
1028	.zig_name = "ve",	1090	.zig_name = "ve",
1029	.llvm_name = "VE",	1091	.llvm = .{
1030	.td_name = "VE.td",	1092	.name = "VE",
		1093	.td_name = "VE",
		1094	},
1031	},	1095	},
1032	.{	1096	.{
1033	.zig_name = "wasm",	1097	.zig_name = "wasm",
1034	.llvm_name = "WebAssembly",	1098	.llvm = .{
1035	.td_name = "WebAssembly.td",	1099	.name = "WebAssembly",
		1100	.td_name = "WebAssembly",
		1101	},
1036	.extra_features = &.{	1102	.extra_features = &.{
1037	.{	1103	.{
1038	.zig_name = "nontrapping_bulk_memory_len0",	1104	.zig_name = "nontrapping_bulk_memory_len0",
...	@@ -1057,8 +1123,10 @@ const llvm_targets = [_]LlvmTarget{	...	@@ -1057,8 +1123,10 @@ const llvm_targets = [_]LlvmTarget{
1057	},	1123	},
1058	.{	1124	.{
1059	.zig_name = "x86",	1125	.zig_name = "x86",
1060	.llvm_name = "X86",	1126	.llvm = .{
1061	.td_name = "X86.td",	1127	.name = "X86",
		1128	.td_name = "X86",
		1129	},
1062	.feature_overrides = &.{	1130	.feature_overrides = &.{
1063	.{	1131	.{
1064	.llvm_name = "64bit-mode",	1132	.llvm_name = "64bit-mode",
...	@@ -1362,13 +1430,17 @@ const llvm_targets = [_]LlvmTarget{	...	@@ -1362,13 +1430,17 @@ const llvm_targets = [_]LlvmTarget{
1362	},	1430	},
1363	.{	1431	.{
1364	.zig_name = "xcore",	1432	.zig_name = "xcore",
1365	.llvm_name = "XCore",	1433	.llvm = .{
1366	.td_name = "XCore.td",	1434	.name = "XCore",
		1435	.td_name = "XCore",
		1436	},
1367	},	1437	},
1368	.{	1438	.{
1369	.zig_name = "xtensa",	1439	.zig_name = "xtensa",
1370	.llvm_name = "Xtensa",	1440	.llvm = .{
1371	.td_name = "Xtensa.td",	1441	.name = "Xtensa",
		1442	.td_name = "Xtensa",
		1443	},
1372	},	1444	},
1373	};	1445	};
1374		1446
...	@@ -1413,33 +1485,33 @@ pub fn main() anyerror!void {	...	@@ -1413,33 +1485,33 @@ pub fn main() anyerror!void {
1413	var zig_src_dir = try fs.cwd().openDir(zig_src_root, .{});	1485	var zig_src_dir = try fs.cwd().openDir(zig_src_root, .{});
1414	defer zig_src_dir.close();	1486	defer zig_src_dir.close();
1415		1487
1416	const root_progress = std.Progress.start(.{ .estimated_total_items = llvm_targets.len });	1488	const root_progress = std.Progress.start(.{ .estimated_total_items = targets.len });
1417	defer root_progress.end();	1489	defer root_progress.end();
1418		1490
1419	if (builtin.single_threaded) {	1491	if (builtin.single_threaded) {
1420	for (llvm_targets) \|llvm_target\| {	1492	for (targets) \|target\| {
1421	if (filter) \|zig_name\| if (!std.mem.eql(u8, llvm_target.zig_name, zig_name)) continue;	1493	if (filter) \|zig_name\| if (!std.mem.eql(u8, target.zig_name, zig_name)) continue;
1422	try processOneTarget(.{	1494	try processOneTarget(.{
1423	.llvm_tblgen_exe = llvm_tblgen_exe,	1495	.llvm_tblgen_exe = llvm_tblgen_exe,
1424	.llvm_src_root = llvm_src_root,	1496	.llvm_src_root = llvm_src_root,
1425	.zig_src_dir = zig_src_dir,	1497	.zig_src_dir = zig_src_dir,
1426	.root_progress = root_progress,	1498	.root_progress = root_progress,
1427	.llvm_target = llvm_target,	1499	.target = target,
1428	});	1500	});
1429	}	1501	}
1430	} else {	1502	} else {
1431	var pool: std.Thread.Pool = undefined;	1503	var pool: std.Thread.Pool = undefined;
1432	try pool.init(.{ .allocator = arena, .n_jobs = llvm_targets.len });	1504	try pool.init(.{ .allocator = arena, .n_jobs = targets.len });
1433	defer pool.deinit();	1505	defer pool.deinit();
1434		1506
1435	for (llvm_targets) \|llvm_target\| {	1507	for (targets) \|target\| {
1436	if (filter) \|zig_name\| if (!std.mem.eql(u8, llvm_target.zig_name, zig_name)) continue;	1508	if (filter) \|zig_name\| if (!std.mem.eql(u8, target.zig_name, zig_name)) continue;
1437	const job = Job{	1509	const job = Job{
1438	.llvm_tblgen_exe = llvm_tblgen_exe,	1510	.llvm_tblgen_exe = llvm_tblgen_exe,
1439	.llvm_src_root = llvm_src_root,	1511	.llvm_src_root = llvm_src_root,
1440	.zig_src_dir = zig_src_dir,	1512	.zig_src_dir = zig_src_dir,
1441	.root_progress = root_progress,	1513	.root_progress = root_progress,
1442	.llvm_target = llvm_target,	1514	.target = target,
1443	};	1515	};
1444	try pool.spawn(processOneTarget, .{job});	1516	try pool.spawn(processOneTarget, .{job});
1445	}	1517	}
...	@@ -1451,162 +1523,147 @@ const Job = struct {	...	@@ -1451,162 +1523,147 @@ const Job = struct {
1451	llvm_src_root: []const u8,	1523	llvm_src_root: []const u8,
1452	zig_src_dir: std.fs.Dir,	1524	zig_src_dir: std.fs.Dir,
1453	root_progress: std.Progress.Node,	1525	root_progress: std.Progress.Node,
1454	llvm_target: LlvmTarget,	1526	target: ArchTarget,
1455	};	1527	};
1456		1528
1457	fn processOneTarget(job: Job) void {	1529	fn processOneTarget(job: Job) void {
1458	errdefer \|err\| std.debug.panic("panic: {s}", .{@errorName(err)});	1530	errdefer \|err\| std.debug.panic("panic: {s}", .{@errorName(err)});
1459	const llvm_target = job.llvm_target;	1531	const target = job.target;
1460		1532
1461	var arena_state = std.heap.ArenaAllocator.init(std.heap.page_allocator);	1533	var arena_state = std.heap.ArenaAllocator.init(std.heap.page_allocator);
1462	defer arena_state.deinit();	1534	defer arena_state.deinit();
1463	const arena = arena_state.allocator();	1535	const arena = arena_state.allocator();
1464		1536
1465	const progress_node = job.root_progress.start(llvm_target.zig_name, 3);	1537	const progress_node = job.root_progress.start(target.zig_name, 3);
1466	defer progress_node.end();	1538	defer progress_node.end();
1467		1539
1468	const tblgen_progress = progress_node.start("running llvm-tblgen", 0);	1540	var features_table = std.StringHashMap(Feature).init(arena);
1469		1541	var all_features = std.ArrayList(Feature).init(arena);
1470	const child_args = [_][]const u8{	1542	var all_cpus = std.ArrayList(Cpu).init(arena);
1471	job.llvm_tblgen_exe,
1472	"--dump-json",
1473	try std.fmt.allocPrint(arena, "{s}/llvm/lib/Target/{s}/{s}", .{
1474	job.llvm_src_root,
1475	llvm_target.llvm_name,
1476	llvm_target.td_name,
1477	}),
1478	try std.fmt.allocPrint(arena, "-I={s}/llvm/include", .{job.llvm_src_root}),
1479	try std.fmt.allocPrint(arena, "-I={s}/llvm/lib/Target/{s}", .{
1480	job.llvm_src_root, llvm_target.llvm_name,
1481	}),
1482	};
1483		1543
1484	const child_result = try std.process.Child.run(.{	1544	if (target.llvm) \|llvm\| {
1485	.allocator = arena,	1545	const tblgen_progress = progress_node.start("running llvm-tblgen", 0);
1486	.argv = &child_args,
1487	.max_output_bytes = 500 * 1024 * 1024,
1488	});
1489	tblgen_progress.end();
1490	if (child_result.stderr.len != 0) {
1491	std.debug.print("{s}\n", .{child_result.stderr});
1492	}
1493		1546
1494	const json_text = switch (child_result.term) {	1547	const child_args = [_][]const u8{
1495	.Exited => \|code\| if (code == 0) child_result.stdout else {	1548	job.llvm_tblgen_exe,
1496	std.debug.print("llvm-tblgen exited with code {d}\n", .{code});	1549	"--dump-json",
1497	std.process.exit(1);	1550	try std.fmt.allocPrint(arena, "{s}/llvm/lib/Target/{s}/{s}.td", .{
1498	},	1551	job.llvm_src_root,
1499	else => {	1552	llvm.name,
1500	std.debug.print("llvm-tblgen crashed\n", .{});	1553	llvm.td_name,
1501	std.process.exit(1);	1554	}),
1502	},	1555	try std.fmt.allocPrint(arena, "-I={s}/llvm/include", .{job.llvm_src_root}),
1503	};	1556	try std.fmt.allocPrint(arena, "-I={s}/llvm/lib/Target/{s}", .{
		1557	job.llvm_src_root, llvm.name,
		1558	}),
		1559	};
1504		1560
1505	const json_parse_progress = progress_node.start("parsing JSON", 0);	1561	const child_result = try std.process.Child.run(.{
		1562	.allocator = arena,
		1563	.argv = &child_args,
		1564	.max_output_bytes = 500 * 1024 * 1024,
		1565	});
		1566	tblgen_progress.end();
		1567	if (child_result.stderr.len != 0) {
		1568	std.debug.print("{s}\n", .{child_result.stderr});
		1569	}
1506		1570
1507	const parsed = try json.parseFromSlice(json.Value, arena, json_text, .{});	1571	const json_text = switch (child_result.term) {
1508	defer parsed.deinit();	1572	.Exited => \|code\| if (code == 0) child_result.stdout else {
1509	const root_map = &parsed.value.object;	1573	std.debug.print("llvm-tblgen exited with code {d}\n", .{code});
1510	json_parse_progress.end();	1574	std.process.exit(1);
		1575	},
		1576	else => {
		1577	std.debug.print("llvm-tblgen crashed\n", .{});
		1578	std.process.exit(1);
		1579	},
		1580	};
1511		1581
1512	const render_progress = progress_node.start("rendering Zig code", 0);	1582	const json_parse_progress = progress_node.start("parsing JSON", 0);
1513		1583
1514	// So far, LLVM only has a few aliases for the same CPU.	1584	const parsed = try json.parseFromSlice(json.Value, arena, json_text, .{});
1515	var cpu_aliases = std.StringHashMap(std.SegmentedList(struct {	1585	defer parsed.deinit();
1516	llvm: []const u8,	1586	const root_map = &parsed.value.object;
1517	zig: []const u8,	1587	json_parse_progress.end();
1518	}, 4)).init(arena);
1519		1588
1520	{	1589	const collate_progress = progress_node.start("collating LLVM data", 0);
1521	var it = root_map.iterator();	1590
1522	while (it.next()) \|kv\| {	1591	// So far, LLVM only has a few aliases for the same CPU.
1523	if (kv.key_ptr.len == 0) continue;	1592	var cpu_aliases = std.StringHashMap(std.SegmentedList(struct {
1524	if (kv.key_ptr.*[0] == '!') continue;	1593	llvm: []const u8,
1525	if (kv.value_ptr.* != .object) continue;	1594	zig: []const u8,
1526	if (hasSuperclass(&kv.value_ptr.object, "ProcessorAlias")) {	1595	}, 4)).init(arena);
1527	// Note that `Name` is actually the alias, while `Alias` is the name that will have	1596
1528	// a full `Processor` object defined.	1597	{
1529	const llvm_alias = kv.value_ptr.object.get("Name").?.string;	1598	var it = root_map.iterator();
1530	const llvm_name = kv.value_ptr.object.get("Alias").?.string;	1599	while (it.next()) \|kv\| {
1531		1600	if (kv.key_ptr.len == 0) continue;
1532	const gop = try cpu_aliases.getOrPut(try llvmNameToZigName(arena, llvm_name));	1601	if (kv.key_ptr.*[0] == '!') continue;
1533		1602	if (kv.value_ptr.* != .object) continue;
1534	if (!gop.found_existing) gop.value_ptr.* = .{};	1603	if (hasSuperclass(&kv.value_ptr.object, "ProcessorAlias")) {
1535		1604	// Note that `Name` is actually the alias, while `Alias` is the name that will have
1536	try gop.value_ptr.append(arena, .{	1605	// a full `Processor` object defined.
1537	.llvm = llvm_alias,	1606	const llvm_alias = kv.value_ptr.object.get("Name").?.string;
1538	.zig = try llvmNameToZigName(arena, llvm_alias),	1607	const llvm_name = kv.value_ptr.object.get("Alias").?.string;
1539	});	1608
		1609	const gop = try cpu_aliases.getOrPut(try llvmNameToZigName(arena, llvm_name));
		1610
		1611	if (!gop.found_existing) gop.value_ptr.* = .{};
		1612
		1613	try gop.value_ptr.append(arena, .{
		1614	.llvm = llvm_alias,
		1615	.zig = try llvmNameToZigName(arena, llvm_alias),
		1616	});
		1617	}
1540	}	1618	}
1541	}	1619	}
1542	}
1543		1620
1544	var features_table = std.StringHashMap(Feature).init(arena);	1621	{
1545	var all_features = std.ArrayList(Feature).init(arena);	1622	var it = root_map.iterator();
1546	var all_cpus = std.ArrayList(Cpu).init(arena);	1623	while (it.next()) \|kv\| {
1547	{	1624	if (kv.key_ptr.len == 0) continue;
1548	var it = root_map.iterator();	1625	if (kv.key_ptr.*[0] == '!') continue;
1549	while (it.next()) \|kv\| {	1626	if (kv.value_ptr.* != .object) continue;
1550	if (kv.key_ptr.len == 0) continue;	1627	if (hasSuperclass(&kv.value_ptr.object, "SubtargetFeature")) {
1551	if (kv.key_ptr.*[0] == '!') continue;	1628	const llvm_name = kv.value_ptr.object.get("Name").?.string;
1552	if (kv.value_ptr.* != .object) continue;	1629	if (llvm_name.len == 0) continue;
1553	if (hasSuperclass(&kv.value_ptr.object, "SubtargetFeature")) {	1630
1554	const llvm_name = kv.value_ptr.object.get("Name").?.string;	1631	var zig_name = try llvmNameToZigName(arena, llvm_name);
1555	if (llvm_name.len == 0) continue;	1632	var desc = kv.value_ptr.object.get("Desc").?.string;
1556		1633	var deps = std.ArrayList([]const u8).init(arena);
1557	var zig_name = try llvmNameToZigName(arena, llvm_name);	1634	var omit = false;
1558	var desc = kv.value_ptr.object.get("Desc").?.string;	1635	var flatten = false;
1559	var deps = std.ArrayList([]const u8).init(arena);	1636	var omit_deps: []const []const u8 = &.{};
1560	var omit = false;	1637	var extra_deps: []const []const u8 = &.{};
1561	var flatten = false;	1638	for (target.feature_overrides) \|feature_override\| {
1562	var omit_deps: []const []const u8 = &.{};	1639	if (mem.eql(u8, llvm_name, feature_override.llvm_name)) {
1563	var extra_deps: []const []const u8 = &.{};	1640	if (feature_override.omit) {
1564	for (llvm_target.feature_overrides) \|feature_override\| {	1641	// Still put the feature into the table so that we can
1565	if (mem.eql(u8, llvm_name, feature_override.llvm_name)) {	1642	// expand dependencies for the feature overrides marked `flatten`.
1566	if (feature_override.omit) {	1643	omit = true;
1567	// Still put the feature into the table so that we can	1644	}
1568	// expand dependencies for the feature overrides marked `flatten`.	1645	if (feature_override.flatten) {
1569	omit = true;	1646	flatten = true;
1570	}	1647	}
1571	if (feature_override.flatten) {	1648	if (feature_override.zig_name) \|override_name\| {
1572	flatten = true;	1649	zig_name = override_name;
1573	}	1650	}
1574	if (feature_override.zig_name) \|override_name\| {	1651	if (feature_override.desc) \|override_desc\| {
1575	zig_name = override_name;	1652	desc = override_desc;
1576	}	1653	}
1577	if (feature_override.desc) \|override_desc\| {	1654	omit_deps = feature_override.omit_deps;
1578	desc = override_desc;	1655	extra_deps = feature_override.extra_deps;
		1656	break;
1579	}	1657	}
1580	omit_deps = feature_override.omit_deps;
1581	extra_deps = feature_override.extra_deps;
1582	break;
1583	}	1658	}
1584	}	1659	const implies = kv.value_ptr.object.get("Implies").?.array;
1585	const implies = kv.value_ptr.object.get("Implies").?.array;	1660	for (implies.items) \|imply\| {
1586	for (implies.items) \|imply\| {	1661	const other_key = imply.object.get("def").?.string;
1587	const other_key = imply.object.get("def").?.string;
1588	const other_obj = root_map.get(other_key).?.object;
1589	const other_llvm_name = other_obj.get("Name").?.string;
1590	const other_zig_name = (try llvmFeatureNameToZigNameOmit(
1591	arena,
1592	llvm_target,
1593	other_llvm_name,
1594	)) orelse continue;
1595	for (omit_deps) \|omit_dep\| {
1596	if (mem.eql(u8, other_zig_name, omit_dep)) break;
1597	} else {
1598	try deps.append(other_zig_name);
1599	}
1600	}
1601	// This is used by AArch64.
1602	if (kv.value_ptr.object.get("DefaultExts")) \|exts_val\| {
1603	for (exts_val.array.items) \|ext\| {
1604	const other_key = ext.object.get("def").?.string;
1605	const other_obj = root_map.get(other_key).?.object;	1662	const other_obj = root_map.get(other_key).?.object;
1606	const other_llvm_name = other_obj.get("Name").?.string;	1663	const other_llvm_name = other_obj.get("Name").?.string;
1607	const other_zig_name = (try llvmFeatureNameToZigNameOmit(	1664	const other_zig_name = (try llvmFeatureNameToZigNameOmit(
1608	arena,	1665	arena,
1609	llvm_target,	1666	target,
1610	other_llvm_name,	1667	other_llvm_name,
1611	)) orelse continue;	1668	)) orelse continue;
1612	for (omit_deps) \|omit_dep\| {	1669	for (omit_deps) \|omit_dep\| {
...	@@ -1615,118 +1672,141 @@ fn processOneTarget(job: Job) void {	...	@@ -1615,118 +1672,141 @@ fn processOneTarget(job: Job) void {
1615	try deps.append(other_zig_name);	1672	try deps.append(other_zig_name);
1616	}	1673	}
1617	}	1674	}
		1675	// This is used by AArch64.
		1676	if (kv.value_ptr.object.get("DefaultExts")) \|exts_val\| {
		1677	for (exts_val.array.items) \|ext\| {
		1678	const other_key = ext.object.get("def").?.string;
		1679	const other_obj = root_map.get(other_key).?.object;
		1680	const other_llvm_name = other_obj.get("Name").?.string;
		1681	const other_zig_name = (try llvmFeatureNameToZigNameOmit(
		1682	arena,
		1683	target,
		1684	other_llvm_name,
		1685	)) orelse continue;
		1686	for (omit_deps) \|omit_dep\| {
		1687	if (mem.eql(u8, other_zig_name, omit_dep)) break;
		1688	} else {
		1689	try deps.append(other_zig_name);
		1690	}
		1691	}
		1692	}
		1693	for (extra_deps) \|extra_dep\| {
		1694	try deps.append(extra_dep);
		1695	}
		1696	const feature: Feature = .{
		1697	.llvm_name = llvm_name,
		1698	.zig_name = zig_name,
		1699	.desc = desc,
		1700	.deps = deps.items,
		1701	.flatten = flatten,
		1702	};
		1703	try features_table.put(zig_name, feature);
		1704	if (!omit and !flatten) {
		1705	try all_features.append(feature);
		1706	}
1618	}	1707	}
1619	for (extra_deps) \|extra_dep\| {	1708	if (hasSuperclass(&kv.value_ptr.object, "Processor")) {
1620	try deps.append(extra_dep);	1709	const llvm_name = kv.value_ptr.object.get("Name").?.string;
1621	}	1710	if (llvm_name.len == 0) continue;
1622	const feature: Feature = .{	1711	const omitted = for (target.omit_cpus) \|omit_cpu_name\| {
1623	.llvm_name = llvm_name,	1712	if (mem.eql(u8, omit_cpu_name, llvm_name)) break true;
1624	.zig_name = zig_name,	1713	} else false;
1625	.desc = desc,	1714	if (omitted) continue;
1626	.deps = deps.items,	1715
1627	.flatten = flatten,	1716	var zig_name = try llvmNameToZigName(arena, llvm_name);
1628	};	1717	var deps = std.ArrayList([]const u8).init(arena);
1629	try features_table.put(zig_name, feature);	1718	var omit_deps: []const []const u8 = &.{};
1630	if (!omit and !flatten) {	1719	var extra_deps: []const []const u8 = &.{};
1631	try all_features.append(feature);	1720	for (target.feature_overrides) \|feature_override\| {
1632	}	1721	if (mem.eql(u8, llvm_name, feature_override.llvm_name)) {
1633	}	1722	if (feature_override.omit) {
1634	if (hasSuperclass(&kv.value_ptr.object, "Processor")) {	1723	continue;
1635	const llvm_name = kv.value_ptr.object.get("Name").?.string;	1724	}
1636	if (llvm_name.len == 0) continue;	1725	if (feature_override.zig_name) \|override_name\| {
1637	const omitted = for (llvm_target.omit_cpus) \|omit_cpu_name\| {	1726	zig_name = override_name;
1638	if (mem.eql(u8, omit_cpu_name, llvm_name)) break true;	1727	}
1639	} else false;	1728	omit_deps = feature_override.omit_deps;
1640	if (omitted) continue;	1729	extra_deps = feature_override.extra_deps;
1641		1730	break;
1642	var zig_name = try llvmNameToZigName(arena, llvm_name);
1643	var deps = std.ArrayList([]const u8).init(arena);
1644	var omit_deps: []const []const u8 = &.{};
1645	var extra_deps: []const []const u8 = &.{};
1646	for (llvm_target.feature_overrides) \|feature_override\| {
1647	if (mem.eql(u8, llvm_name, feature_override.llvm_name)) {
1648	if (feature_override.omit) {
1649	continue;
1650	}	1731	}
1651	if (feature_override.zig_name) \|override_name\| {	1732	}
1652	zig_name = override_name;	1733	const features = kv.value_ptr.object.get("Features").?.array;
		1734	for (features.items) \|feature\| {
		1735	const feature_key = feature.object.get("def").?.string;
		1736	const feature_obj = root_map.get(feature_key).?.object;
		1737	const feature_llvm_name = feature_obj.get("Name").?.string;
		1738	if (feature_llvm_name.len == 0) continue;
		1739	const feature_zig_name = (try llvmFeatureNameToZigNameOmit(
		1740	arena,
		1741	target,
		1742	feature_llvm_name,
		1743	)) orelse continue;
		1744	for (omit_deps) \|omit_dep\| {
		1745	if (mem.eql(u8, feature_zig_name, omit_dep)) break;
		1746	} else {
		1747	try deps.append(feature_zig_name);
1653	}	1748	}
1654	omit_deps = feature_override.omit_deps;
1655	extra_deps = feature_override.extra_deps;
1656	break;
1657	}	1749	}
1658	}	1750	for (extra_deps) \|extra_dep\| {
1659	const features = kv.value_ptr.object.get("Features").?.array;	1751	try deps.append(extra_dep);
1660	for (features.items) \|feature\| {	1752	}
1661	const feature_key = feature.object.get("def").?.string;	1753	const tune_features = kv.value_ptr.object.get("TuneFeatures").?.array;
1662	const feature_obj = root_map.get(feature_key).?.object;	1754	for (tune_features.items) \|feature\| {
1663	const feature_llvm_name = feature_obj.get("Name").?.string;	1755	const feature_key = feature.object.get("def").?.string;
1664	if (feature_llvm_name.len == 0) continue;	1756	const feature_obj = root_map.get(feature_key).?.object;
1665	const feature_zig_name = (try llvmFeatureNameToZigNameOmit(	1757	const feature_llvm_name = feature_obj.get("Name").?.string;
1666	arena,	1758	if (feature_llvm_name.len == 0) continue;
1667	llvm_target,	1759	const feature_zig_name = (try llvmFeatureNameToZigNameOmit(
1668	feature_llvm_name,	1760	arena,
1669	)) orelse continue;	1761	target,
1670	for (omit_deps) \|omit_dep\| {	1762	feature_llvm_name,
1671	if (mem.eql(u8, feature_zig_name, omit_dep)) break;	1763	)) orelse continue;
1672	} else {
1673	try deps.append(feature_zig_name);	1764	try deps.append(feature_zig_name);
1674	}	1765	}
1675	}	1766	try all_cpus.append(.{
1676	for (extra_deps) \|extra_dep\| {	1767	.llvm_name = llvm_name,
1677	try deps.append(extra_dep);	1768	.zig_name = zig_name,
1678	}	1769	.features = deps.items,
1679	const tune_features = kv.value_ptr.object.get("TuneFeatures").?.array;	1770	});
1680	for (tune_features.items) \|feature\| {	1771
1681	const feature_key = feature.object.get("def").?.string;	1772	if (cpu_aliases.get(zig_name)) \|aliases\| {
1682	const feature_obj = root_map.get(feature_key).?.object;	1773	var alias_it = aliases.constIterator(0);
1683	const feature_llvm_name = feature_obj.get("Name").?.string;
1684	if (feature_llvm_name.len == 0) continue;
1685	const feature_zig_name = (try llvmFeatureNameToZigNameOmit(
1686	arena,
1687	llvm_target,
1688	feature_llvm_name,
1689	)) orelse continue;
1690	try deps.append(feature_zig_name);
1691	}
1692	try all_cpus.append(.{
1693	.llvm_name = llvm_name,
1694	.zig_name = zig_name,
1695	.features = deps.items,
1696	});
1697
1698	if (cpu_aliases.get(zig_name)) \|aliases\| {
1699	var alias_it = aliases.constIterator(0);
1700
1701	alias_it: while (alias_it.next()) \|alias\| {
1702	for (llvm_target.omit_cpus) \|omit_cpu_name\| {
1703	if (mem.eql(u8, omit_cpu_name, alias.llvm)) continue :alias_it;
1704	}
1705		1774
1706	try all_cpus.append(.{	1775	alias_it: while (alias_it.next()) \|alias\| {
1707	.llvm_name = alias.llvm,	1776	for (target.omit_cpus) \|omit_cpu_name\| {
1708	.zig_name = alias.zig,	1777	if (mem.eql(u8, omit_cpu_name, alias.llvm)) continue :alias_it;
1709	.features = deps.items,	1778	}
1710	});	1779
		1780	try all_cpus.append(.{
		1781	.llvm_name = alias.llvm,
		1782	.zig_name = alias.zig,
		1783	.features = deps.items,
		1784	});
		1785	}
1711	}	1786	}
1712	}	1787	}
1713	}	1788	}
1714	}	1789	}
		1790
		1791	collate_progress.end();
1715	}	1792	}
1716	for (llvm_target.extra_features) \|extra_feature\| {	1793
		1794	for (target.extra_features) \|extra_feature\| {
1717	try features_table.put(extra_feature.zig_name, extra_feature);	1795	try features_table.put(extra_feature.zig_name, extra_feature);
1718	try all_features.append(extra_feature);	1796	try all_features.append(extra_feature);
1719	}	1797	}
1720	for (llvm_target.extra_cpus) \|extra_cpu\| {	1798	for (target.extra_cpus) \|extra_cpu\| {
1721	try all_cpus.append(extra_cpu);	1799	try all_cpus.append(extra_cpu);
1722	}	1800	}
1723	mem.sort(Feature, all_features.items, {}, featureLessThan);	1801	mem.sort(Feature, all_features.items, {}, featureLessThan);
1724	mem.sort(Cpu, all_cpus.items, {}, cpuLessThan);	1802	mem.sort(Cpu, all_cpus.items, {}, cpuLessThan);
1725		1803
		1804	const render_progress = progress_node.start("rendering Zig code", 0);
		1805
1726	var target_dir = try job.zig_src_dir.openDir("lib/std/Target", .{});	1806	var target_dir = try job.zig_src_dir.openDir("lib/std/Target", .{});
1727	defer target_dir.close();	1807	defer target_dir.close();
1728		1808
1729	const zig_code_basename = try std.fmt.allocPrint(arena, "{s}.zig", .{llvm_target.zig_name});	1809	const zig_code_basename = try std.fmt.allocPrint(arena, "{s}.zig", .{target.zig_name});
1730	var zig_code_file = try target_dir.createFile(zig_code_basename, .{});	1810	var zig_code_file = try target_dir.createFile(zig_code_basename, .{});
1731	defer zig_code_file.close();	1811	defer zig_code_file.close();
1732		1812
...	@@ -1760,7 +1840,7 @@ fn processOneTarget(job: Job) void {	...	@@ -1760,7 +1840,7 @@ fn processOneTarget(job: Job) void {
1760	\\pub const all_features = blk: {	1840	\\pub const all_features = blk: {
1761	\\	1841	\\
1762	);	1842	);
1763	if (llvm_target.branch_quota) \|branch_quota\| {	1843	if (target.branch_quota) \|branch_quota\| {
1764	try w.print(" @setEvalBranchQuota({d});\n", .{branch_quota});	1844	try w.print(" @setEvalBranchQuota({d});\n", .{branch_quota});
1765	}	1845	}
1766	try w.writeAll(	1846	try w.writeAll(
...	@@ -1941,10 +2021,10 @@ fn llvmNameToZigName(arena: mem.Allocator, llvm_name: []const u8) ![]const u8 {	...	@@ -1941,10 +2021,10 @@ fn llvmNameToZigName(arena: mem.Allocator, llvm_name: []const u8) ![]const u8 {
1941		2021
1942	fn llvmFeatureNameToZigNameOmit(	2022	fn llvmFeatureNameToZigNameOmit(
1943	arena: mem.Allocator,	2023	arena: mem.Allocator,
1944	llvm_target: LlvmTarget,	2024	target: ArchTarget,
1945	llvm_name: []const u8,	2025	llvm_name: []const u8,
1946	) !?[]const u8 {	2026	) !?[]const u8 {
1947	for (llvm_target.feature_overrides) \|feature_override\| {	2027	for (target.feature_overrides) \|feature_override\| {
1948	if (mem.eql(u8, feature_override.llvm_name, llvm_name)) {	2028	if (mem.eql(u8, feature_override.llvm_name, llvm_name)) {
1949	if (feature_override.omit) return null;	2029	if (feature_override.omit) return null;
1950	return feature_override.zig_name orelse break;	2030	return feature_override.zig_name orelse break;

author	Alex Rønne Petersen <alex@alexrp.com> 2025-02-18 00:51:59+01:00
committer	GitHub <noreply@github.com> 2025-02-18 00:51:59+01:00
log	b732070fd36267fb055347e3aa8a1851e4054d50
tree	9851eb03564eff472bbb4a605e13e4058baed4c6
parent	55c46870b23ac16670beaa3ff1c082b703738307
parent	faccd79ca5debbe22fe168193b8de54393257604
signature	Signed by PGP key B5690EEEBB952194

...	@@ -27,7 +27,7 @@ pub fn discover(self: Linux, tc: Toolchain) !void {	...	@@ -27,7 +27,7 @@ pub fn discover(self: Linux, tc: Toolchain) !void {
27	fn buildExtraOpts(self: Linux, tc: const Toolchain) !void {	27	fn buildExtraOpts(self: Linux, tc: const Toolchain) !void {
28	const gpa = tc.driver.comp.gpa;	28	const gpa = tc.driver.comp.gpa;
29	const target = tc.getTarget();	29	const target = tc.getTarget();
30	const is_android = target.isAndroid();	30	const is_android = target.abi.isAndroid();
31	if (self.distro.isAlpine() or is_android) {	31	if (self.distro.isAlpine() or is_android) {
32	try self.extra_opts.ensureUnusedCapacity(gpa, 2);	32	try self.extra_opts.ensureUnusedCapacity(gpa, 2);
33	self.extra_opts.appendAssumeCapacity("-z");	33	self.extra_opts.appendAssumeCapacity("-z");
...	@@ -113,7 +113,7 @@ fn findPaths(self: Linux, tc: Toolchain) !void {	...	@@ -113,7 +113,7 @@ fn findPaths(self: Linux, tc: Toolchain) !void {
113	try tc.addPathIfExists(&.{ sysroot, "/lib", multiarch_triple }, .file);	113	try tc.addPathIfExists(&.{ sysroot, "/lib", multiarch_triple }, .file);
114	try tc.addPathIfExists(&.{ sysroot, "/lib", "..", os_lib_dir }, .file);	114	try tc.addPathIfExists(&.{ sysroot, "/lib", "..", os_lib_dir }, .file);
115		115
116	if (target.isAndroid()) {	116	if (target.abi.isAndroid()) {
117	// TODO	117	// TODO
118	}	118	}
119	try tc.addPathIfExists(&.{ sysroot, "/usr", "lib", multiarch_triple }, .file);	119	try tc.addPathIfExists(&.{ sysroot, "/usr", "lib", multiarch_triple }, .file);
...	@@ -156,7 +156,7 @@ fn getStatic(self: const Linux, d: const Driver) bool {	...	@@ -156,7 +156,7 @@ fn getStatic(self: const Linux, d: const Driver) bool {
156		156
157	pub fn getDefaultLinker(self: *const Linux, target: std.Target) []const u8 {	157	pub fn getDefaultLinker(self: *const Linux, target: std.Target) []const u8 {
158	_ = self;	158	_ = self;
159	if (target.isAndroid()) {	159	if (target.abi.isAndroid()) {
160	return "ld.lld";	160	return "ld.lld";
161	}	161	}
162	return "ld";	162	return "ld";
...	@@ -169,7 +169,7 @@ pub fn buildLinkerArgs(self: const Linux, tc: const Toolchain, argv: *std.Arra	...	@@ -169,7 +169,7 @@ pub fn buildLinkerArgs(self: const Linux, tc: const Toolchain, argv: *std.Arra
169	const is_pie = self.getPIE(d);	169	const is_pie = self.getPIE(d);
170	const is_static_pie = try self.getStaticPIE(d);	170	const is_static_pie = try self.getStaticPIE(d);
171	const is_static = self.getStatic(d);	171	const is_static = self.getStatic(d);
172	const is_android = target.isAndroid();	172	const is_android = target.abi.isAndroid();
173	const is_iamcu = target.os.tag == .elfiamcu;	173	const is_iamcu = target.os.tag == .elfiamcu;
174	const is_ve = target.cpu.arch == .ve;	174	const is_ve = target.cpu.arch == .ve;
175	const has_crt_begin_end_files = target.abi != .none; // TODO: clang checks for MIPS vendor	175	const has_crt_begin_end_files = target.abi != .none; // TODO: clang checks for MIPS vendor
...	@@ -326,7 +326,7 @@ pub fn buildLinkerArgs(self: const Linux, tc: const Toolchain, argv: *std.Arra	...	@@ -326,7 +326,7 @@ pub fn buildLinkerArgs(self: const Linux, tc: const Toolchain, argv: *std.Arra
326	}	326	}
327		327
328	fn getMultiarchTriple(target: std.Target) ?[]const u8 {	328	fn getMultiarchTriple(target: std.Target) ?[]const u8 {
329	const is_android = target.isAndroid();	329	const is_android = target.abi.isAndroid();
330	const is_mips_r6 = std.Target.mips.featureSetHas(target.cpu.features, .mips32r6);	330	const is_mips_r6 = std.Target.mips.featureSetHas(target.cpu.features, .mips32r6);
331	return switch (target.cpu.arch) {	331	return switch (target.cpu.arch) {
332	.arm, .thumb => if (is_android) "arm-linux-androideabi" else if (target.abi == .gnueabihf) "arm-linux-gnueabihf" else "arm-linux-gnueabi",	332	.arm, .thumb => if (is_android) "arm-linux-androideabi" else if (target.abi == .gnueabihf) "arm-linux-gnueabihf" else "arm-linux-gnueabi",
...	@@ -380,7 +380,7 @@ pub fn defineSystemIncludes(self: const Linux, tc: const Toolchain) !void {	...	@@ -380,7 +380,7 @@ pub fn defineSystemIncludes(self: const Linux, tc: const Toolchain) !void {
380		380
381	// musl prefers /usr/include before builtin includes, so musl targets will add builtins	381	// musl prefers /usr/include before builtin includes, so musl targets will add builtins
382	// at the end of this function (unless disabled with nostdlibinc)	382	// at the end of this function (unless disabled with nostdlibinc)
383	if (!tc.driver.nobuiltininc and (!target.isMusl() or tc.driver.nostdlibinc)) {	383	if (!tc.driver.nobuiltininc and (!target.abi.isMusl() or tc.driver.nostdlibinc)) {
384	try comp.addBuiltinIncludeDir(tc.driver.aro_name);	384	try comp.addBuiltinIncludeDir(tc.driver.aro_name);
385	}	385	}
386		386
...	@@ -411,7 +411,7 @@ pub fn defineSystemIncludes(self: const Linux, tc: const Toolchain) !void {	...	@@ -411,7 +411,7 @@ pub fn defineSystemIncludes(self: const Linux, tc: const Toolchain) !void {
411	try comp.addSystemIncludeDir("/usr/include");	411	try comp.addSystemIncludeDir("/usr/include");
412		412
413	std.debug.assert(!tc.driver.nostdlibinc);	413	std.debug.assert(!tc.driver.nostdlibinc);
414	if (!tc.driver.nobuiltininc and target.isMusl()) {	414	if (!tc.driver.nobuiltininc and target.abi.isMusl()) {
415	try comp.addBuiltinIncludeDir(tc.driver.aro_name);	415	try comp.addBuiltinIncludeDir(tc.driver.aro_name);
416	}	416	}
417	}	417	}

...	@@ -465,7 +465,7 @@ pub fn create(owner: std.Build, options: Options) Compile {	...	@@ -465,7 +465,7 @@ pub fn create(owner: std.Build, options: Options) Compile {
465	if (compile.linkage != null and compile.linkage.? == .static) {	465	if (compile.linkage != null and compile.linkage.? == .static) {
466	compile.out_lib_filename = compile.out_filename;	466	compile.out_lib_filename = compile.out_filename;
467	} else if (compile.version) \|version\| {	467	} else if (compile.version) \|version\| {
468	if (target.isDarwin()) {	468	if (target.os.tag.isDarwin()) {
469	compile.major_only_filename = owner.fmt("lib{s}.{d}.dylib", .{	469	compile.major_only_filename = owner.fmt("lib{s}.{d}.dylib", .{
470	compile.name,	470	compile.name,
471	version.major,	471	version.major,
...	@@ -480,7 +480,7 @@ pub fn create(owner: std.Build, options: Options) Compile {	...	@@ -480,7 +480,7 @@ pub fn create(owner: std.Build, options: Options) Compile {
480	compile.out_lib_filename = compile.out_filename;	480	compile.out_lib_filename = compile.out_filename;
481	}	481	}
482	} else {	482	} else {
483	if (target.isDarwin()) {	483	if (target.os.tag.isDarwin()) {
484	compile.out_lib_filename = compile.out_filename;	484	compile.out_lib_filename = compile.out_filename;
485	} else if (target.os.tag == .windows) {	485	} else if (target.os.tag == .windows) {
486	compile.out_lib_filename = owner.fmt("{s}.lib", .{compile.name});	486	compile.out_lib_filename = owner.fmt("{s}.lib", .{compile.name});
...	@@ -1524,7 +1524,7 @@ fn getZigArgs(compile: *Compile, fuzz: bool) ![][]const u8 {	...	@@ -1524,7 +1524,7 @@ fn getZigArgs(compile: *Compile, fuzz: bool) ![][]const u8 {
1524	try zig_args.append(b.fmt("{}", .{version}));	1524	try zig_args.append(b.fmt("{}", .{version}));
1525	}	1525	}
1526		1526
1527	if (compile.rootModuleTarget().isDarwin()) {	1527	if (compile.rootModuleTarget().os.tag.isDarwin()) {
1528	const install_name = compile.install_name orelse b.fmt("@rpath/{s}{s}{s}", .{	1528	const install_name = compile.install_name orelse b.fmt("@rpath/{s}{s}{s}", .{
1529	compile.rootModuleTarget().libPrefix(),	1529	compile.rootModuleTarget().libPrefix(),
1530	compile.name,	1530	compile.name,

...	@@ -292,7 +292,7 @@ pub fn dumpHexFallible(bytes: []const u8) !void {	...	@@ -292,7 +292,7 @@ pub fn dumpHexFallible(bytes: []const u8) !void {
292	/// TODO multithreaded awareness	292	/// TODO multithreaded awareness
293	pub fn dumpCurrentStackTrace(start_addr: ?usize) void {	293	pub fn dumpCurrentStackTrace(start_addr: ?usize) void {
294	nosuspend {	294	nosuspend {
295	if (builtin.target.isWasm()) {	295	if (builtin.target.cpu.arch.isWasm()) {
296	if (native_os == .wasi) {	296	if (native_os == .wasi) {
297	const stderr = io.getStdErr().writer();	297	const stderr = io.getStdErr().writer();
298	stderr.print("Unable to dump stack trace: not implemented for Wasm\n", .{}) catch return;	298	stderr.print("Unable to dump stack trace: not implemented for Wasm\n", .{}) catch return;
...	@@ -380,7 +380,7 @@ pub inline fn getContext(context: *ThreadContext) bool {	...	@@ -380,7 +380,7 @@ pub inline fn getContext(context: *ThreadContext) bool {
380	/// TODO multithreaded awareness	380	/// TODO multithreaded awareness
381	pub fn dumpStackTraceFromBase(context: *ThreadContext) void {	381	pub fn dumpStackTraceFromBase(context: *ThreadContext) void {
382	nosuspend {	382	nosuspend {
383	if (builtin.target.isWasm()) {	383	if (builtin.target.cpu.arch.isWasm()) {
384	if (native_os == .wasi) {	384	if (native_os == .wasi) {
385	const stderr = io.getStdErr().writer();	385	const stderr = io.getStdErr().writer();
386	stderr.print("Unable to dump stack trace: not implemented for Wasm\n", .{}) catch return;	386	stderr.print("Unable to dump stack trace: not implemented for Wasm\n", .{}) catch return;
...	@@ -478,7 +478,7 @@ pub fn captureStackTrace(first_address: ?usize, stack_trace: *std.builtin.StackT	...	@@ -478,7 +478,7 @@ pub fn captureStackTrace(first_address: ?usize, stack_trace: *std.builtin.StackT
478	/// TODO multithreaded awareness	478	/// TODO multithreaded awareness
479	pub fn dumpStackTrace(stack_trace: std.builtin.StackTrace) void {	479	pub fn dumpStackTrace(stack_trace: std.builtin.StackTrace) void {
480	nosuspend {	480	nosuspend {
481	if (builtin.target.isWasm()) {	481	if (builtin.target.cpu.arch.isWasm()) {
482	if (native_os == .wasi) {	482	if (native_os == .wasi) {
483	const stderr = io.getStdErr().writer();	483	const stderr = io.getStdErr().writer();
484	stderr.print("Unable to dump stack trace: not implemented for Wasm\n", .{}) catch return;	484	stderr.print("Unable to dump stack trace: not implemented for Wasm\n", .{}) catch return;
...	@@ -759,7 +759,7 @@ pub const StackIterator = struct {	...	@@ -759,7 +759,7 @@ pub const StackIterator = struct {
759	pub fn initWithContext(first_address: ?usize, debug_info: SelfInfo, context: posix.ucontext_t) !StackIterator {	759	pub fn initWithContext(first_address: ?usize, debug_info: SelfInfo, context: posix.ucontext_t) !StackIterator {
760	// The implementation of DWARF unwinding on aarch64-macos is not complete. However, Apple mandates that	760	// The implementation of DWARF unwinding on aarch64-macos is not complete. However, Apple mandates that
761	// the frame pointer register is always used, so on this platform we can safely use the FP-based unwinder.	761	// the frame pointer register is always used, so on this platform we can safely use the FP-based unwinder.
762	if (builtin.target.isDarwin() and native_arch == .aarch64)	762	if (builtin.target.os.tag.isDarwin() and native_arch == .aarch64)
763	return init(first_address, @truncate(context.mcontext.ss.fp));	763	return init(first_address, @truncate(context.mcontext.ss.fp));
764		764
765	if (SelfInfo.supports_unwinding) {	765	if (SelfInfo.supports_unwinding) {

...	@@ -121,13 +121,13 @@ pub fn deinit(self: *SelfInfo) void {	...	@@ -121,13 +121,13 @@ pub fn deinit(self: *SelfInfo) void {
121	}	121	}
122		122
123	pub fn getModuleForAddress(self: SelfInfo, address: usize) !Module {	123	pub fn getModuleForAddress(self: SelfInfo, address: usize) !Module {
124	if (builtin.target.isDarwin()) {	124	if (builtin.target.os.tag.isDarwin()) {
125	return self.lookupModuleDyld(address);	125	return self.lookupModuleDyld(address);
126	} else if (native_os == .windows) {	126	} else if (native_os == .windows) {
127	return self.lookupModuleWin32(address);	127	return self.lookupModuleWin32(address);
128	} else if (native_os == .haiku) {	128	} else if (native_os == .haiku) {
129	return self.lookupModuleHaiku(address);	129	return self.lookupModuleHaiku(address);
130	} else if (builtin.target.isWasm()) {	130	} else if (builtin.target.cpu.arch.isWasm()) {
131	return self.lookupModuleWasm(address);	131	return self.lookupModuleWasm(address);
132	} else {	132	} else {
133	return self.lookupModuleDl(address);	133	return self.lookupModuleDl(address);
...	@@ -138,13 +138,13 @@ pub fn getModuleForAddress(self: SelfInfo, address: usize) !Module {	...	@@ -138,13 +138,13 @@ pub fn getModuleForAddress(self: SelfInfo, address: usize) !Module {
138	// This can be called when getModuleForAddress fails, so implementations should provide	138	// This can be called when getModuleForAddress fails, so implementations should provide
139	// a path that doesn't rely on any side-effects of a prior successful module lookup.	139	// a path that doesn't rely on any side-effects of a prior successful module lookup.
140	pub fn getModuleNameForAddress(self: *SelfInfo, address: usize) ?[]const u8 {	140	pub fn getModuleNameForAddress(self: *SelfInfo, address: usize) ?[]const u8 {
141	if (builtin.target.isDarwin()) {	141	if (builtin.target.os.tag.isDarwin()) {
142	return self.lookupModuleNameDyld(address);	142	return self.lookupModuleNameDyld(address);
143	} else if (native_os == .windows) {	143	} else if (native_os == .windows) {
144	return self.lookupModuleNameWin32(address);	144	return self.lookupModuleNameWin32(address);
145	} else if (native_os == .haiku) {	145	} else if (native_os == .haiku) {
146	return null;	146	return null;
147	} else if (builtin.target.isWasm()) {	147	} else if (builtin.target.cpu.arch.isWasm()) {
148	return null;	148	return null;
149	} else {	149	} else {
150	return self.lookupModuleNameDl(address);	150	return self.lookupModuleNameDl(address);

...	@@ -127,7 +127,7 @@ fn detectFromInstallation(arena: Allocator, target: std.Target, lci: *const LibC	...	@@ -127,7 +127,7 @@ fn detectFromInstallation(arena: Allocator, target: std.Target, lci: *const LibC
127		127
128	var sysroot: ?[]const u8 = null;	128	var sysroot: ?[]const u8 = null;
129		129
130	if (target.isDarwin()) d: {	130	if (target.os.tag.isDarwin()) d: {
131	const down1 = std.fs.path.dirname(lci.sys_include_dir.?) orelse break :d;	131	const down1 = std.fs.path.dirname(lci.sys_include_dir.?) orelse break :d;
132	const down2 = std.fs.path.dirname(down1) orelse break :d;	132	const down2 = std.fs.path.dirname(down1) orelse break :d;
133	try framework_list.append(try std.fs.path.join(arena, &.{ down2, "System", "Library", "Frameworks" }));	133	try framework_list.append(try std.fs.path.join(arena, &.{ down2, "System", "Library", "Frameworks" }));
...	@@ -150,7 +150,7 @@ pub fn detectFromBuilding(	...	@@ -150,7 +150,7 @@ pub fn detectFromBuilding(
150	) !LibCDirs {	150	) !LibCDirs {
151	const s = std.fs.path.sep_str;	151	const s = std.fs.path.sep_str;
152		152
153	if (target.isDarwin()) {	153	if (target.os.tag.isDarwin()) {
154	const list = try arena.alloc([]const u8, 1);	154	const list = try arena.alloc([]const u8, 1);
155	list[0] = try std.fmt.allocPrint(	155	list[0] = try std.fmt.allocPrint(
156	arena,	156	arena,
...	@@ -187,7 +187,7 @@ pub fn detectFromBuilding(	...	@@ -187,7 +187,7 @@ pub fn detectFromBuilding(
187	"{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "generic-{s}",	187	"{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "generic-{s}",
188	.{ zig_lib_dir, generic_name },	188	.{ zig_lib_dir, generic_name },
189	);	189	);
190	const generic_arch_name = target.osArchName();	190	const generic_arch_name = std.zig.target.osArchName(target);
191	const arch_os_include_dir = try std.fmt.allocPrint(	191	const arch_os_include_dir = try std.fmt.allocPrint(
192	arena,	192	arena,
193	"{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "{s}-{s}-any",	193	"{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "{s}-{s}-any",

...	@@ -1766,11 +1766,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil	...	@@ -1766,11 +1766,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil
1766	if (comp.config.link_libc and is_exe_or_dyn_lib) {	1766	if (comp.config.link_libc and is_exe_or_dyn_lib) {
1767	// If the "is darwin" check is moved below the libc_installation check below,	1767	// If the "is darwin" check is moved below the libc_installation check below,
1768	// error.LibCInstallationMissingCrtDir is returned from lci.resolveCrtPaths().	1768	// error.LibCInstallationMissingCrtDir is returned from lci.resolveCrtPaths().
1769	if (target.isDarwin()) {	1769	if (target.isDarwinLibC()) {
1770	switch (target.abi) {
1771	.none, .simulator, .macabi => {},
1772	else => return error.LibCUnavailable,
1773	}
1774	// TODO delete logic from MachO flush() and queue up tasks here instead.	1770	// TODO delete logic from MachO flush() and queue up tasks here instead.
1775	} else if (comp.libc_installation) \|lci\| {	1771	} else if (comp.libc_installation) \|lci\| {
1776	const basenames = LibCInstallation.CrtBasenames.get(.{	1772	const basenames = LibCInstallation.CrtBasenames.get(.{
...	@@ -1793,7 +1789,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil	...	@@ -1793,7 +1789,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil
1793	// Loads the libraries provided by `target_util.libcFullLinkFlags(target)`.	1789	// Loads the libraries provided by `target_util.libcFullLinkFlags(target)`.
1794	comp.link_task_queue.shared.appendAssumeCapacity(.load_host_libc);	1790	comp.link_task_queue.shared.appendAssumeCapacity(.load_host_libc);
1795	comp.remaining_prelink_tasks += 1;	1791	comp.remaining_prelink_tasks += 1;
1796	} else if (target.isMusl() and !target.isWasm()) {	1792	} else if (target.isMuslLibC()) {
1797	if (!std.zig.target.canBuildLibC(target)) return error.LibCUnavailable;	1793	if (!std.zig.target.canBuildLibC(target)) return error.LibCUnavailable;
1798		1794
1799	if (musl.needsCrt0(comp.config.output_mode, comp.config.link_mode, comp.config.pie)) \|f\| {	1795	if (musl.needsCrt0(comp.config.output_mode, comp.config.link_mode, comp.config.pie)) \|f\| {
...	@@ -1817,7 +1813,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil	...	@@ -1817,7 +1813,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil
1817		1813
1818	comp.queued_jobs.glibc_crt_file[@intFromEnum(glibc.CrtFile.libc_nonshared_a)] = true;	1814	comp.queued_jobs.glibc_crt_file[@intFromEnum(glibc.CrtFile.libc_nonshared_a)] = true;
1819	comp.remaining_prelink_tasks += 1;	1815	comp.remaining_prelink_tasks += 1;
1820	} else if (target.isWasm() and target.os.tag == .wasi) {	1816	} else if (target.isWasiLibC()) {
1821	if (!std.zig.target.canBuildLibC(target)) return error.LibCUnavailable;	1817	if (!std.zig.target.canBuildLibC(target)) return error.LibCUnavailable;
1822		1818
1823	for (comp.wasi_emulated_libs) \|crt_file\| {	1819	for (comp.wasi_emulated_libs) \|crt_file\| {
...	@@ -1839,11 +1835,6 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil	...	@@ -1839,11 +1835,6 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil
1839	// When linking mingw-w64 there are some import libs we always need.	1835	// When linking mingw-w64 there are some import libs we always need.
1840	try comp.windows_libs.ensureUnusedCapacity(gpa, mingw.always_link_libs.len);	1836	try comp.windows_libs.ensureUnusedCapacity(gpa, mingw.always_link_libs.len);
1841	for (mingw.always_link_libs) \|name\| comp.windows_libs.putAssumeCapacity(name, {});	1837	for (mingw.always_link_libs) \|name\| comp.windows_libs.putAssumeCapacity(name, {});
1842	} else if (target.isDarwin()) {
1843	switch (target.abi) {
1844	.none, .simulator, .macabi => {},
1845	else => return error.LibCUnavailable,
1846	}
1847	} else if (target.os.tag == .freestanding and capable_of_building_zig_libc) {	1838	} else if (target.os.tag == .freestanding and capable_of_building_zig_libc) {
1848	comp.queued_jobs.zig_libc = true;	1839	comp.queued_jobs.zig_libc = true;
1849	comp.remaining_prelink_tasks += 1;	1840	comp.remaining_prelink_tasks += 1;
...	@@ -5545,7 +5536,7 @@ pub fn addCCArgs(	...	@@ -5545,7 +5536,7 @@ pub fn addCCArgs(
5545		5536
5546	// We might want to support -mfloat-abi=softfp for Arm and CSKY here in the future.	5537	// We might want to support -mfloat-abi=softfp for Arm and CSKY here in the future.
5547	if (target_util.clangSupportsFloatAbiArg(target)) {	5538	if (target_util.clangSupportsFloatAbiArg(target)) {
5548	const fabi = @tagName(target.floatAbi());	5539	const fabi = @tagName(target.abi.float());
5549		5540
5550	try argv.append(switch (target.cpu.arch) {	5541	try argv.append(switch (target.cpu.arch) {
5551	// For whatever reason, Clang doesn't support `-mfloat-abi` for s390x.	5542	// For whatever reason, Clang doesn't support `-mfloat-abi` for s390x.
...	@@ -5598,7 +5589,7 @@ pub fn addCCArgs(	...	@@ -5598,7 +5589,7 @@ pub fn addCCArgs(
5598	if (ext != .assembly) {	5589	if (ext != .assembly) {
5599	try argv.append(if (target.os.tag == .freestanding) "-ffreestanding" else "-fhosted");	5590	try argv.append(if (target.os.tag == .freestanding) "-ffreestanding" else "-fhosted");
5600		5591
5601	if (target_util.clangSupportsNoImplicitFloatArg(target) and target.floatAbi() == .soft) {	5592	if (target_util.clangSupportsNoImplicitFloatArg(target) and target.abi.float() == .soft) {
5602	try argv.append("-mno-implicit-float");	5593	try argv.append("-mno-implicit-float");
5603	}	5594	}
5604		5595
...	@@ -5646,7 +5637,7 @@ pub fn addCCArgs(	...	@@ -5646,7 +5637,7 @@ pub fn addCCArgs(
5646	// LLVM IR files don't support these flags.	5637	// LLVM IR files don't support these flags.
5647	if (ext != .ll and ext != .bc) {	5638	if (ext != .ll and ext != .bc) {
5648	// https://github.com/llvm/llvm-project/issues/105972	5639	// https://github.com/llvm/llvm-project/issues/105972
5649	if (target.cpu.arch.isPowerPC() and target.floatAbi() == .soft) {	5640	if (target.cpu.arch.isPowerPC() and target.abi.float() == .soft) {
5650	try argv.append("-D__NO_FPRS__");	5641	try argv.append("-D__NO_FPRS__");
5651	try argv.append("-D_SOFT_FLOAT");	5642	try argv.append("-D_SOFT_FLOAT");
5652	try argv.append("-D_SOFT_DOUBLE");	5643	try argv.append("-D_SOFT_DOUBLE");

...	@@ -1396,7 +1396,7 @@ fn resolveCallingConventionValues(	...	@@ -1396,7 +1396,7 @@ fn resolveCallingConventionValues(
1396	result.local_index += 1;	1396	result.local_index += 1;
1397	}	1397	}
1398	},	1398	},
1399	.wasm_watc => {	1399	.wasm_mvp => {
1400	for (fn_info.param_types.get(ip)) \|ty\| {	1400	for (fn_info.param_types.get(ip)) \|ty\| {
1401	const ty_classes = abi.classifyType(Type.fromInterned(ty), zcu);	1401	const ty_classes = abi.classifyType(Type.fromInterned(ty), zcu);
1402	for (ty_classes) \|class\| {	1402	for (ty_classes) \|class\| {
...	@@ -1421,7 +1421,7 @@ pub fn firstParamSRet(	...	@@ -1421,7 +1421,7 @@ pub fn firstParamSRet(
1421	switch (cc) {	1421	switch (cc) {
1422	.@"inline" => unreachable,	1422	.@"inline" => unreachable,
1423	.auto => return isByRef(return_type, zcu, target),	1423	.auto => return isByRef(return_type, zcu, target),
1424	.wasm_watc => {	1424	.wasm_mvp => {
1425	const ty_classes = abi.classifyType(return_type, zcu);	1425	const ty_classes = abi.classifyType(return_type, zcu);
1426	if (ty_classes[0] == .indirect) return true;	1426	if (ty_classes[0] == .indirect) return true;
1427	if (ty_classes[0] == .direct and ty_classes[1] == .direct) return true;	1427	if (ty_classes[0] == .direct and ty_classes[1] == .direct) return true;
...	@@ -1434,7 +1434,7 @@ pub fn firstParamSRet(	...	@@ -1434,7 +1434,7 @@ pub fn firstParamSRet(
1434	/// Lowers a Zig type and its value based on a given calling convention to ensure	1434	/// Lowers a Zig type and its value based on a given calling convention to ensure
1435	/// it matches the ABI.	1435	/// it matches the ABI.
1436	fn lowerArg(cg: *CodeGen, cc: std.builtin.CallingConvention, ty: Type, value: WValue) !void {	1436	fn lowerArg(cg: *CodeGen, cc: std.builtin.CallingConvention, ty: Type, value: WValue) !void {
1437	if (cc != .wasm_watc) {	1437	if (cc != .wasm_mvp) {
1438	return cg.lowerToStack(value);	1438	return cg.lowerToStack(value);
1439	}	1439	}
1440		1440
...	@@ -2124,7 +2124,7 @@ fn airRet(cg: *CodeGen, inst: Air.Inst.Index) InnerError!void {	...	@@ -2124,7 +2124,7 @@ fn airRet(cg: *CodeGen, inst: Air.Inst.Index) InnerError!void {
2124	// to the stack instead	2124	// to the stack instead
2125	if (cg.return_value != .none) {	2125	if (cg.return_value != .none) {
2126	try cg.store(cg.return_value, operand, ret_ty, 0);	2126	try cg.store(cg.return_value, operand, ret_ty, 0);
2127	} else if (fn_info.cc == .wasm_watc and ret_ty.hasRuntimeBitsIgnoreComptime(zcu)) {	2127	} else if (fn_info.cc == .wasm_mvp and ret_ty.hasRuntimeBitsIgnoreComptime(zcu)) {
2128	switch (ret_ty.zigTypeTag(zcu)) {	2128	switch (ret_ty.zigTypeTag(zcu)) {
2129	// Aggregate types can be lowered as a singular value	2129	// Aggregate types can be lowered as a singular value
2130	.@"struct", .@"union" => {	2130	.@"struct", .@"union" => {
...	@@ -2268,7 +2268,7 @@ fn airCall(cg: *CodeGen, inst: Air.Inst.Index, modifier: std.builtin.CallModifie	...	@@ -2268,7 +2268,7 @@ fn airCall(cg: *CodeGen, inst: Air.Inst.Index, modifier: std.builtin.CallModifie
2268	} else if (first_param_sret) {	2268	} else if (first_param_sret) {
2269	break :result_value sret;	2269	break :result_value sret;
2270	// TODO: Make this less fragile and optimize	2270	// TODO: Make this less fragile and optimize
2271	} else if (zcu.typeToFunc(fn_ty).?.cc == .wasm_watc and ret_ty.zigTypeTag(zcu) == .@"struct" or ret_ty.zigTypeTag(zcu) == .@"union") {	2271	} else if (zcu.typeToFunc(fn_ty).?.cc == .wasm_mvp and ret_ty.zigTypeTag(zcu) == .@"struct" or ret_ty.zigTypeTag(zcu) == .@"union") {
2272	const result_local = try cg.allocLocal(ret_ty);	2272	const result_local = try cg.allocLocal(ret_ty);
2273	try cg.addLocal(.local_set, result_local.local.value);	2273	try cg.addLocal(.local_set, result_local.local.value);
2274	const scalar_type = abi.scalarType(ret_ty, zcu);	2274	const scalar_type = abi.scalarType(ret_ty, zcu);
...	@@ -2546,7 +2546,7 @@ fn airArg(cg: *CodeGen, inst: Air.Inst.Index) InnerError!void {	...	@@ -2546,7 +2546,7 @@ fn airArg(cg: *CodeGen, inst: Air.Inst.Index) InnerError!void {
2546	const arg = cg.args[arg_index];	2546	const arg = cg.args[arg_index];
2547	const cc = zcu.typeToFunc(zcu.navValue(cg.owner_nav).typeOf(zcu)).?.cc;	2547	const cc = zcu.typeToFunc(zcu.navValue(cg.owner_nav).typeOf(zcu)).?.cc;
2548	const arg_ty = cg.typeOfIndex(inst);	2548	const arg_ty = cg.typeOfIndex(inst);
2549	if (cc == .wasm_watc) {	2549	if (cc == .wasm_mvp) {
2550	const arg_classes = abi.classifyType(arg_ty, zcu);	2550	const arg_classes = abi.classifyType(arg_ty, zcu);
2551	for (arg_classes) \|class\| {	2551	for (arg_classes) \|class\| {
2552	if (class != .none) {	2552	if (class != .none) {
...	@@ -7047,7 +7047,7 @@ fn callIntrinsic(	...	@@ -7047,7 +7047,7 @@ fn callIntrinsic(
7047		7047
7048	// Always pass over C-ABI	7048	// Always pass over C-ABI
7049		7049
7050	const want_sret_param = firstParamSRet(.{ .wasm_watc = .{} }, return_type, zcu, cg.target);	7050	const want_sret_param = firstParamSRet(.{ .wasm_mvp = .{} }, return_type, zcu, cg.target);
7051	// if we want return as first param, we allocate a pointer to stack,	7051	// if we want return as first param, we allocate a pointer to stack,
7052	// and emit it as our first argument	7052	// and emit it as our first argument
7053	const sret = if (want_sret_param) blk: {	7053	const sret = if (want_sret_param) blk: {
...	@@ -7060,7 +7060,7 @@ fn callIntrinsic(	...	@@ -7060,7 +7060,7 @@ fn callIntrinsic(
7060	for (args, 0..) \|arg, arg_i\| {	7060	for (args, 0..) \|arg, arg_i\| {
7061	assert(!(want_sret_param and arg == .stack));	7061	assert(!(want_sret_param and arg == .stack));
7062	assert(Type.fromInterned(param_types[arg_i]).hasRuntimeBitsIgnoreComptime(zcu));	7062	assert(Type.fromInterned(param_types[arg_i]).hasRuntimeBitsIgnoreComptime(zcu));
7063	try cg.lowerArg(.{ .wasm_watc = .{} }, Type.fromInterned(param_types[arg_i]), arg);	7063	try cg.lowerArg(.{ .wasm_mvp = .{} }, Type.fromInterned(param_types[arg_i]), arg);
7064	}	7064	}
7065		7065
7066	try cg.addInst(.{ .tag = .call_intrinsic, .data = .{ .intrinsic = intrinsic } });	7066	try cg.addInst(.{ .tag = .call_intrinsic, .data = .{ .intrinsic = intrinsic } });

...	@@ -4600,7 +4600,7 @@ fn convertZcuFnType(	...	@@ -4600,7 +4600,7 @@ fn convertZcuFnType(
4600	if (CodeGen.firstParamSRet(cc, return_type, zcu, target)) {	4600	if (CodeGen.firstParamSRet(cc, return_type, zcu, target)) {
4601	try params_buffer.append(gpa, .i32); // memory address is always a 32-bit handle	4601	try params_buffer.append(gpa, .i32); // memory address is always a 32-bit handle
4602	} else if (return_type.hasRuntimeBitsIgnoreComptime(zcu)) {	4602	} else if (return_type.hasRuntimeBitsIgnoreComptime(zcu)) {
4603	if (cc == .wasm_watc) {	4603	if (cc == .wasm_mvp) {
4604	const res_classes = abi.classifyType(return_type, zcu);	4604	const res_classes = abi.classifyType(return_type, zcu);
4605	assert(res_classes[0] == .direct and res_classes[1] == .none);	4605	assert(res_classes[0] == .direct and res_classes[1] == .none);
4606	const scalar_type = abi.scalarType(return_type, zcu);	4606	const scalar_type = abi.scalarType(return_type, zcu);
...	@@ -4618,7 +4618,7 @@ fn convertZcuFnType(	...	@@ -4618,7 +4618,7 @@ fn convertZcuFnType(
4618	if (!param_type.hasRuntimeBitsIgnoreComptime(zcu)) continue;	4618	if (!param_type.hasRuntimeBitsIgnoreComptime(zcu)) continue;
4619		4619
4620	switch (cc) {	4620	switch (cc) {
4621	.wasm_watc => {	4621	.wasm_mvp => {
4622	const param_classes = abi.classifyType(param_type, zcu);	4622	const param_classes = abi.classifyType(param_type, zcu);
4623	if (param_classes[1] == .none) {	4623	if (param_classes[1] == .none) {
4624	if (param_classes[0] == .direct) {	4624	if (param_classes[0] == .direct) {

...	@@ -1639,7 +1639,7 @@ test "NaN comparison" {	...	@@ -1639,7 +1639,7 @@ test "NaN comparison" {
1639	if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;	1639	if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
1640	if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;	1640	if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
1641	if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;	1641	if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
1642	if (builtin.cpu.arch.isArm() and builtin.target.floatAbi() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234	1642	if (builtin.cpu.arch.isArm() and builtin.target.abi.float() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234
1643		1643
1644	try testNanEqNan(f16);	1644	try testNanEqNan(f16);
1645	try testNanEqNan(f32);	1645	try testNanEqNan(f32);
...	@@ -1795,7 +1795,7 @@ test "runtime comparison to NaN is comptime-known" {	...	@@ -1795,7 +1795,7 @@ test "runtime comparison to NaN is comptime-known" {
1795	if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;	1795	if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
1796	if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;	1796	if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
1797	if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;	1797	if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
1798	if (builtin.cpu.arch.isArm() and builtin.target.floatAbi() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234	1798	if (builtin.cpu.arch.isArm() and builtin.target.abi.float() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234
1799		1799
1800	const S = struct {	1800	const S = struct {
1801	fn doTheTest(comptime F: type, x: F) void {	1801	fn doTheTest(comptime F: type, x: F) void {
...	@@ -1826,7 +1826,7 @@ test "runtime int comparison to inf is comptime-known" {	...	@@ -1826,7 +1826,7 @@ test "runtime int comparison to inf is comptime-known" {
1826	if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;	1826	if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
1827	if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;	1827	if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
1828	if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;	1828	if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
1829	if (builtin.cpu.arch.isArm() and builtin.target.floatAbi() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234	1829	if (builtin.cpu.arch.isArm() and builtin.target.abi.float() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234
1830		1830
1831	const S = struct {	1831	const S = struct {
1832	fn doTheTest(comptime F: type, x: u32) void {	1832	fn doTheTest(comptime F: type, x: u32) void {

Merge pull request #22589 from alexrp/target-changes