mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-18 04:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

compiler: Recognize libgcc_s regardless of target ABI.

Browse Source 
The real libgcc_s is a compiler-provided library; it works just fine with both
glibc and musl. There's no reason that I can see for this check to be limited to
glibc-based targets.
This commit is contained in:
Alex Rønne Petersen 2024-12-06 14:07:15 +01:00
parent f8372d030e
commit 37a34b54af
No known key found for this signature in database
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.zig
View File

@ -3832,7 +3832,7 @@ fn createModule(
create_module.opts.link_libcpp = true; create_module.opts.link_libcpp = true;
continue; continue;
} }
switch (target_util.classifyCompilerRtLibName(target, lib_name)) { switch (target_util.classifyCompilerRtLibName(lib_name)) {
.none => {}, .none => {},
.only_libunwind, .both => { .only_libunwind, .both => {
create_module.opts.link_libunwind = true; create_module.opts.link_libunwind = true;

4
src/target.zig
View File

@ -260,8 +260,8 @@ pub fn supportsReturnAddress(target: std.Target) bool {
pub const CompilerRtClassification = enum { none, only_compiler_rt, only_libunwind, both }; pub const CompilerRtClassification = enum { none, only_compiler_rt, only_libunwind, both };
pub fn classifyCompilerRtLibName(target: std.Target, name: []const u8) CompilerRtClassification { pub fn classifyCompilerRtLibName(name: []const u8) CompilerRtClassification {
if (target.abi.isGnu() and std.mem.eql(u8, name, "gcc_s")) { if (std.mem.eql(u8, name, "gcc_s")) {
// libgcc_s includes exception handling functions, so if linking this library // libgcc_s includes exception handling functions, so if linking this library
// is requested, zig needs to instead link libunwind. Otherwise we end up with // is requested, zig needs to instead link libunwind. Otherwise we end up with
// the linker unable to find `_Unwind_RaiseException` and other related symbols. // the linker unable to find `_Unwind_RaiseException` and other related symbols.