authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-01-27 00:37:18-08:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-01-27 17:07:56-08:00
log37037b269e4484702d12a3c8c909d4b8ed5895f1
tree3aeb088d4cd8124d3ff7b9d4111515a619b80c16
parent884b1423a4e33323b28d97b7458bade9a36acce9

frontend: use main Compilation code_model when building libxx

as well as libtsan, libunwind, and libc files

4 files changed, 5 insertions(+), 0 deletions(-)

src/Compilation.zig+1
...@@ -6611,6 +6611,7 @@ pub fn build_crt_file(...@@ -6611,6 +6611,7 @@ pub fn build_crt_file(
6611 .structured_cfg = comp.root_mod.structured_cfg,6611 .structured_cfg = comp.root_mod.structured_cfg,
6612 // Some libcs (e.g. musl) are opinionated about -fno-builtin.6612 // Some libcs (e.g. musl) are opinionated about -fno-builtin.
6613 .no_builtin = options.no_builtin orelse comp.root_mod.no_builtin,6613 .no_builtin = options.no_builtin orelse comp.root_mod.no_builtin,
6614 .code_model = comp.root_mod.code_model,
6614 },6615 },
6615 .global = config,6616 .global = config,
6616 .cc_argv = &.{},6617 .cc_argv = &.{},
src/libcxx.zig+2
...@@ -196,6 +196,7 @@ pub fn buildLibCxx(comp: *Compilation, prog_node: std.Progress.Node) BuildError!...@@ -196,6 +196,7 @@ pub fn buildLibCxx(comp: *Compilation, prog_node: std.Progress.Node) BuildError!
196 .optimize_mode = optimize_mode,196 .optimize_mode = optimize_mode,
197 .structured_cfg = comp.root_mod.structured_cfg,197 .structured_cfg = comp.root_mod.structured_cfg,
198 .pic = if (target_util.supports_fpic(target)) true else null,198 .pic = if (target_util.supports_fpic(target)) true else null,
199 .code_model = comp.root_mod.code_model,
199 },200 },
200 .global = config,201 .global = config,
201 .cc_argv = &.{},202 .cc_argv = &.{},
...@@ -445,6 +446,7 @@ pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildErr...@@ -445,6 +446,7 @@ pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildErr
445 .structured_cfg = comp.root_mod.structured_cfg,446 .structured_cfg = comp.root_mod.structured_cfg,
446 .unwind_tables = unwind_tables,447 .unwind_tables = unwind_tables,
447 .pic = comp.root_mod.pic,448 .pic = comp.root_mod.pic,
449 .code_model = comp.root_mod.code_model,
448 },450 },
449 .global = config,451 .global = config,
450 .cc_argv = &.{},452 .cc_argv = &.{},
src/libtsan.zig+1
...@@ -105,6 +105,7 @@ pub fn buildTsan(comp: *Compilation, prog_node: std.Progress.Node) BuildError!vo...@@ -105,6 +105,7 @@ pub fn buildTsan(comp: *Compilation, prog_node: std.Progress.Node) BuildError!vo
105 .structured_cfg = comp.root_mod.structured_cfg,105 .structured_cfg = comp.root_mod.structured_cfg,
106 .pic = true,106 .pic = true,
107 .no_builtin = true,107 .no_builtin = true,
108 .code_model = comp.root_mod.code_model,
108 },109 },
109 .global = config,110 .global = config,
110 .cc_argv = &common_flags,111 .cc_argv = &common_flags,
src/libunwind.zig+1
...@@ -71,6 +71,7 @@ pub fn buildStaticLib(comp: *Compilation, prog_node: std.Progress.Node) BuildErr...@@ -71,6 +71,7 @@ pub fn buildStaticLib(comp: *Compilation, prog_node: std.Progress.Node) BuildErr
71 .unwind_tables = unwind_tables,71 .unwind_tables = unwind_tables,
72 .pic = if (target_util.supports_fpic(target)) true else null,72 .pic = if (target_util.supports_fpic(target)) true else null,
73 .optimize_mode = comp.compilerRtOptMode(),73 .optimize_mode = comp.compilerRtOptMode(),
74 .code_model = comp.root_mod.code_model,
74 },75 },
75 .global = config,76 .global = config,
76 .cc_argv = &.{},77 .cc_argv = &.{},