From 37037b269e4484702d12a3c8c909d4b8ed5895f1 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 27 Jan 2025 00:37:18 -0800 Subject: [PATCH] frontend: use main Compilation code_model when building libxx as well as libtsan, libunwind, and libc files --- src/Compilation.zig | 1 + src/libcxx.zig | 2 ++ src/libtsan.zig | 1 + src/libunwind.zig | 1 + 4 files changed, 5 insertions(+) diff --git a/src/Compilation.zig b/src/Compilation.zig index 22bd0f1d5958674765e137aacf405bdf63b2ea07..1362b16cc9924971f6b3a6e046cf542f92fad926 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -6611,6 +6611,7 @@ pub fn build_crt_file( .structured_cfg = comp.root_mod.structured_cfg, // Some libcs (e.g. musl) are opinionated about -fno-builtin. .no_builtin = options.no_builtin orelse comp.root_mod.no_builtin, + .code_model = comp.root_mod.code_model, }, .global = config, .cc_argv = &.{}, diff --git a/src/libcxx.zig b/src/libcxx.zig index 06890531bcb977dd2f922d9813b76b163ed61d35..5668e3916608d88a209a0197eaa3487615db1364 100644 --- a/src/libcxx.zig +++ b/src/libcxx.zig @@ -196,6 +196,7 @@ pub fn buildLibCxx(comp: *Compilation, prog_node: std.Progress.Node) BuildError! .optimize_mode = optimize_mode, .structured_cfg = comp.root_mod.structured_cfg, .pic = if (target_util.supports_fpic(target)) true else null, + .code_model = comp.root_mod.code_model, }, .global = config, .cc_argv = &.{}, @@ -445,6 +446,7 @@ pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildErr .structured_cfg = comp.root_mod.structured_cfg, .unwind_tables = unwind_tables, .pic = comp.root_mod.pic, + .code_model = comp.root_mod.code_model, }, .global = config, .cc_argv = &.{}, diff --git a/src/libtsan.zig b/src/libtsan.zig index cd28b8694a55a73b990f5861e3307b0e1b4bc584..fc1bfc4a366b0c54c0142c64982cc8b814f8662e 100644 --- a/src/libtsan.zig +++ b/src/libtsan.zig @@ -105,6 +105,7 @@ pub fn buildTsan(comp: *Compilation, prog_node: std.Progress.Node) BuildError!vo .structured_cfg = comp.root_mod.structured_cfg, .pic = true, .no_builtin = true, + .code_model = comp.root_mod.code_model, }, .global = config, .cc_argv = &common_flags, diff --git a/src/libunwind.zig b/src/libunwind.zig index c7753b95878b07b923b47d96d184ff58bec54ceb..75b573b520ebc1fa3f072413419ecbc1ad4c18c7 100644 --- a/src/libunwind.zig +++ b/src/libunwind.zig @@ -71,6 +71,7 @@ pub fn buildStaticLib(comp: *Compilation, prog_node: std.Progress.Node) BuildErr .unwind_tables = unwind_tables, .pic = if (target_util.supports_fpic(target)) true else null, .optimize_mode = comp.compilerRtOptMode(), + .code_model = comp.root_mod.code_model, }, .global = config, .cc_argv = &.{}, -- 2.54.0