From bb7a43490f29cbe98974ba66ebd274bceb694acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Sun, 18 Jan 2026 11:55:14 +0100 Subject: [PATCH] compiler: let LLVM set the x32 feature from the target triple on x86 targets --- src/Compilation.zig | 1 + src/Package/Module.zig | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/Compilation.zig b/src/Compilation.zig index 0b906594f9ec7b0a4937666f99b81815266c36c9..0ed0e9f78b7ac95753ab9f815d7857fba8a537cb 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -6808,6 +6808,7 @@ pub fn addCCArgs( // We communicate these to Clang through the dedicated options. if (std.mem.startsWith(u8, llvm_name, "soft-float") or std.mem.startsWith(u8, llvm_name, "hard-float") or + (target.cpu.arch.isX86() and std.mem.startsWith(u8, llvm_name, "x32")) or (target.cpu.arch == .s390x and std.mem.eql(u8, llvm_name, "backchain"))) continue; diff --git a/src/Package/Module.zig b/src/Package/Module.zig index d6ec7f8aafb232d7e619944c4891829d154e55df..3c4f36f15159b13f82dbfeaf6237f2a4a6e352d8 100644 --- a/src/Package/Module.zig +++ b/src/Package/Module.zig @@ -347,6 +347,8 @@ pub fn create(arena: Allocator, options: CreateOptions) !*Package.Module { // See https://github.com/ziglang/zig/issues/23539 if (target_util.isDynamicAMDGCNFeature(target, feature)) continue; + if (target.cpu.arch.isX86() and @as(std.Target.x86.Feature, @enumFromInt(feature.index)) == .x32) continue; + var is_enabled = target.cpu.features.isEnabled(feature.index); if (target.cpu.arch == .s390x and @as(std.Target.s390x.Feature, @enumFromInt(feature.index)) == .backchain) { is_enabled = !omit_frame_pointer; -- 2.54.0