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

elf: improve Symbol to handle emitting relocatable object files

Browse Source
This commit is contained in:
Jakub Konka 2023-11-01 23:08:50 +01:00
parent ec2671d16b
commit 3606b5df3f
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/link/Elf.zig
View File

@ -1943,7 +1943,7 @@ fn scanRelocs(self: *Elf) !void {
for (self.symbols.items, 0..) |*sym, i| {
const index = @as(u32, @intCast(i));
if (!sym.isLocal() and !sym.flags.has_dynamic) {
if (!sym.isLocal(self) and !sym.flags.has_dynamic) {
log.debug("'{s}' is non-local", .{sym.name(self)});
try self.dynsym.addSymbol(index, self);
}

5
src/link/Elf/Symbol.zig
View File

@ -42,7 +42,8 @@ pub fn outputShndx(symbol: Symbol) ?u16 {
return symbol.output_section_index;
}
pub fn isLocal(symbol: Symbol) bool {
pub fn isLocal(symbol: Symbol, elf_file: *Elf) bool {
if (elf_file.isObject()) return symbol.elfSym(elf_file).st_bind() == elf.STB_LOCAL;
return !(symbol.flags.import or symbol.flags.@"export");
}
@ -208,7 +209,7 @@ pub fn setOutputSym(symbol: Symbol, elf_file: *Elf, out: *elf.Elf64_Sym) void {
const esym = symbol.elfSym(elf_file);
const st_type = symbol.type(elf_file);
const st_bind: u8 = blk: {
if (symbol.isLocal()) break :blk 0;
if (symbol.isLocal(elf_file)) break :blk 0;
if (symbol.flags.weak) break :blk elf.STB_WEAK;
if (file_ptr == .shared_object) break :blk elf.STB_GLOBAL;
break :blk esym.st_bind();

1
src/link/Elf/ZigObject.zig
View File

@ -1192,6 +1192,7 @@ pub fn updateExports(
global_esym.st_shndx = esym.st_shndx;
global_esym.st_info = (stb_bits << 4) | stt_bits;
global_esym.st_name = name_off;
global_esym.st_size = esym.st_size;
self.global_esyms.items(.shndx)[actual_esym_index] = esym_shndx;
}
}

4
src/link/Elf/file.zig
View File

@ -150,7 +150,7 @@ pub const File = union(enum) {
if (file_ptr.index() != file.index()) continue;
if (global.atom(elf_file)) |atom| if (!atom.flags.alive) continue;
global.flags.output_symtab = true;
if (global.isLocal()) {
if (global.isLocal(elf_file)) {
output_symtab_size.nlocals += 1;
} else {
output_symtab_size.nglobals += 1;
@ -181,7 +181,7 @@ pub const File = union(enum) {
const st_name = @as(u32, @intCast(elf_file.strtab.items.len));
elf_file.strtab.appendSliceAssumeCapacity(global.name(elf_file));
elf_file.strtab.appendAssumeCapacity(0);
if (global.isLocal()) {
if (global.isLocal(elf_file)) {
const out_sym = &elf_file.symtab.items[ilocal];
out_sym.st_name = st_name;
global.setOutputSym(elf_file, out_sym);