Skip to content

Commit 031b0d6

Browse files
committed
glibc: change library link order to prefer libc.so symbols
Also avoid resolving symbols in libraries that were later removed if possible. closes #24347
1 parent 328b121 commit 031b0d6

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

lib/libc/glibc/abilists

0 Bytes
Binary file not shown.

src/libs/glibc.zig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ pub const ABI = struct {
3737
// The order of the elements in this array defines the linking order.
3838
pub const libs = [_]Lib{
3939
.{ .name = "m", .sover = 6 },
40-
.{ .name = "pthread", .sover = 0, .removed_in = .{ .major = 2, .minor = 34, .patch = 0 } },
4140
.{ .name = "c", .sover = 6 },
41+
.{ .name = "ld", .sover = 2 },
42+
.{ .name = "resolv", .sover = 2 },
43+
.{ .name = "pthread", .sover = 0, .removed_in = .{ .major = 2, .minor = 34, .patch = 0 } },
4244
.{ .name = "dl", .sover = 2, .removed_in = .{ .major = 2, .minor = 34, .patch = 0 } },
4345
.{ .name = "rt", .sover = 1, .removed_in = .{ .major = 2, .minor = 34, .patch = 0 } },
44-
.{ .name = "ld", .sover = 2 },
4546
.{ .name = "util", .sover = 1, .removed_in = .{ .major = 2, .minor = 34, .patch = 0 } },
46-
.{ .name = "resolv", .sover = 2 },
4747
};
4848

4949
pub const LoadMetaDataError = error{

0 commit comments

Comments
 (0)