authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-01-08 18:11:07+01:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-01-18 13:15:58+01:00
log332add7a65003a700c5513f153d8e1362009e35c
tree37e4c580ea8af190e8dc5f270df0326b418fa9a6
parentf38d7a92cc1ca8059ba909a82f2f944966b52296
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

libunwind: Build C files with -fexceptions.

See: https://github.com/llvm/llvm-project/pull/121819 This fixes LTO for libunwind, so also re-enable support for that. Closes #12828.

1 files changed, 8 insertions(+), 9 deletions(-)

src/libunwind.zig+8-9
......@@ -36,8 +36,7 @@ pub fn buildStaticLib(comp: *Compilation, prog_node: std.Progress.Node) BuildErr
3636 .root_optimize_mode = comp.compilerRtOptMode(),
3737 .root_strip = comp.compilerRtStrip(),
3838 .link_libc = true,
39 // Disable LTO to avoid https://github.com/llvm/llvm-project/issues/56825
40 .lto = .none,
39 .lto = comp.config.lto,
4140 }) catch |err| {
4241 comp.setMiscFailure(
4342 .libunwind,
......@@ -102,18 +101,18 @@ pub fn buildStaticLib(comp: *Compilation, prog_node: std.Progress.Node) BuildErr
102101
103102 switch (Compilation.classifyFileExt(unwind_src)) {
104103 .c => {
105 try cflags.append("-std=c17");
104 try cflags.appendSlice(&.{
105 "-std=c99",
106 "-fexceptions",
107 });
106108 },
107109 .cpp => {
108 try cflags.appendSlice(&[_][]const u8{
109 "-std=c++17",
110 "-fno-rtti",
111 });
110 try cflags.append("-fno-exceptions");
111 try cflags.append("-fno-rtti");
112112 },
113113 .assembly_with_cpp => {},
114 else => unreachable, // You can see the entire list of files just above.
114 else => unreachable, // See `unwind_src_list`.
115115 }
116 try cflags.append("-fno-exceptions");
117116 try cflags.append("-I");
118117 try cflags.append(try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libunwind", "include" }));
119118 try cflags.append("-D_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS");