motiejus/zig
1
Fork 0
Code Releases Activity

Merge pull request #22167 from alexrp/compiler-rt-names

Browse Source 
compiler: Classify various compiler-rt and libunwind names accurately and satisfy them
This commit is contained in:
Andrew Kelley
2024-12-06 19:04:39 -05:00
committed by GitHub
parent ca069244b2 8f27fc6c07
commit eb9c9a38f2
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/std/zig/target.zig
View File

@@ -263,7 +263,8 @@ pub fn isLibCxxLibName(target: std.Target, name: []const u8) bool {
return eqlIgnoreCase(ignore_case, name, "c++") or
eqlIgnoreCase(ignore_case, name, "stdc++") or
eqlIgnoreCase(ignore_case, name, "c++abi");
eqlIgnoreCase(ignore_case, name, "c++abi") or
eqlIgnoreCase(ignore_case, name, "supc++");
}
fn eqlIgnoreCase(ignore_case: bool, a: []const u8, b: []const u8) bool {

7
src/main.zig
View File

@@ -3832,16 +3832,13 @@ fn createModule(
create_module.opts.link_libcpp = true;
continue;
}
switch (target_util.classifyCompilerRtLibName(target, lib_name)) {
switch (target_util.classifyCompilerRtLibName(lib_name)) {
.none => {},
.only_libunwind, .both => {
create_module.opts.link_libunwind = true;
continue;
},
.only_compiler_rt => {
warn("ignoring superfluous library '{s}': this dependency is fulfilled instead by compiler-rt which zig unconditionally provides", .{lib_name});
continue;
},
.only_compiler_rt => continue,
}
if (target.isMinGW()) {

14
src/target.zig
View File

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