mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 12:59:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

elf: only allocate __dso_handle symbol if not found in any object

Browse Source
This commit is contained in:
Jakub Konka 2024-09-23 07:01:30 +02:00
parent 6929a5f440
commit 7c2abff1e1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/link/Elf/LinkerDefined.zig
View File

@ -47,7 +47,7 @@ fn newSymbolAssumeCapacity(self: *LinkerDefined, name_off: u32, elf_file: *Elf)
const esym = self.symtab.addOneAssumeCapacity();
esym.* = .{
.st_name = name_off,
.st_info = elf.STB_GLOBAL << 4,
.st_info = elf.STB_WEAK << 4,
.st_other = @intFromEnum(elf.STV.HIDDEN),
.st_shndx = elf.SHN_ABS,
.st_value = 0,
@ -255,8 +255,10 @@ pub fn allocateSymbols(self: *LinkerDefined, elf_file: *Elf) void {
// __dso_handle
if (self.dso_handle_index) |index| {
const shdr = shdrs[1];
allocSymbol(self, index, shdr.sh_addr, 0, elf_file);
if (self.resolveSymbol(index, elf_file).file == self.index) {
const shdr = shdrs[1];
allocSymbol(self, index, shdr.sh_addr, 0, elf_file);
}
}
// __GNU_EH_FRAME_HDR