authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-01-19 06:46:24+01:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-01-19 06:46:24+01:00
log0ead0beb8398176b47add9461d317c4777f2a2e9
tree4ef766d6d00c406097b5231ff9674034800f78fb
parent8ee80d61f6b2355f590de9722172b93a55c4f563
parent332add7a65003a700c5513f153d8e1362009e35c
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #22524 from alexrp/libunwind-exceptions

`libunwind`: Build C files with `-fexceptions`.

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...@@ -36,8 +36,7 @@ pub fn buildStaticLib(comp: *Compilation, prog_node: std.Progress.Node) BuildErr
36 .root_optimize_mode = comp.compilerRtOptMode(),36 .root_optimize_mode = comp.compilerRtOptMode(),
37 .root_strip = comp.compilerRtStrip(),37 .root_strip = comp.compilerRtStrip(),
38 .link_libc = true,38 .link_libc = true,
39 // Disable LTO to avoid https://github.com/llvm/llvm-project/issues/5682539 .lto = comp.config.lto,
40 .lto = .none,
41 }) catch |err| {40 }) catch |err| {
42 comp.setMiscFailure(41 comp.setMiscFailure(
43 .libunwind,42 .libunwind,
...@@ -102,18 +101,18 @@ pub fn buildStaticLib(comp: *Compilation, prog_node: std.Progress.Node) BuildErr...@@ -102,18 +101,18 @@ pub fn buildStaticLib(comp: *Compilation, prog_node: std.Progress.Node) BuildErr
102101
103 switch (Compilation.classifyFileExt(unwind_src)) {102 switch (Compilation.classifyFileExt(unwind_src)) {
104 .c => {103 .c => {
105 try cflags.append("-std=c17");104 try cflags.appendSlice(&.{
105 "-std=c99",
106 "-fexceptions",
107 });
106 },108 },
107 .cpp => {109 .cpp => {
108 try cflags.appendSlice(&[_][]const u8{110 try cflags.append("-fno-exceptions");
109 "-std=c++17",111 try cflags.append("-fno-rtti");
110 "-fno-rtti",
111 });
112 },112 },
113 .assembly_with_cpp => {},113 .assembly_with_cpp => {},
114 else => unreachable, // You can see the entire list of files just above.114 else => unreachable, // See `unwind_src_list`.
115 }115 }
116 try cflags.append("-fno-exceptions");
117 try cflags.append("-I");116 try cflags.append("-I");
118 try cflags.append(try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libunwind", "include" }));117 try cflags.append(try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libunwind", "include" }));
119 try cflags.append("-D_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS");118 try cflags.append("-D_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS");