| ... | ... | @@ -366,15 +366,18 @@ pub const GotSection = struct { |
| 366 | 366 | const apply_relocs = true; // TODO add user option for this |
| 367 | 367 | |
| 368 | 368 | for (got.entries.items) |entry| { |
| 369 | | const symbol = elf_file.symbol(entry.symbol_index); |
| 369 | const symbol = switch (entry.tag) { |
| 370 | .tlsld => null, |
| 371 | inline else => elf_file.symbol(entry.symbol_index), |
| 372 | }; |
| 370 | 373 | switch (entry.tag) { |
| 371 | 374 | .got => { |
| 372 | 375 | const value = blk: { |
| 373 | | const value = symbol.address(.{ .plt = false }, elf_file); |
| 374 | | if (symbol.flags.import) break :blk 0; |
| 375 | | if (symbol.isIFunc(elf_file)) |
| 376 | const value = symbol.?.address(.{ .plt = false }, elf_file); |
| 377 | if (symbol.?.flags.import) break :blk 0; |
| 378 | if (symbol.?.isIFunc(elf_file)) |
| 376 | 379 | break :blk if (apply_relocs) value else 0; |
| 377 | | if (elf_file.base.options.pic and !symbol.isAbs(elf_file)) |
| 380 | if (elf_file.base.options.pic and !symbol.?.isAbs(elf_file)) |
| 378 | 381 | break :blk if (apply_relocs) value else 0; |
| 379 | 382 | break :blk value; |
| 380 | 383 | }; |
| ... | ... | @@ -385,26 +388,26 @@ pub const GotSection = struct { |
| 385 | 388 | try writeInt(0, elf_file, writer); |
| 386 | 389 | }, |
| 387 | 390 | .tlsgd => { |
| 388 | | if (symbol.flags.import) { |
| 391 | if (symbol.?.flags.import) { |
| 389 | 392 | try writeInt(0, elf_file, writer); |
| 390 | 393 | try writeInt(0, elf_file, writer); |
| 391 | 394 | } else { |
| 392 | 395 | try writeInt(if (is_dyn_lib) @as(u64, 0) else 1, elf_file, writer); |
| 393 | | const offset = symbol.address(.{}, elf_file) - elf_file.dtpAddress(); |
| 396 | const offset = symbol.?.address(.{}, elf_file) - elf_file.dtpAddress(); |
| 394 | 397 | try writeInt(offset, elf_file, writer); |
| 395 | 398 | } |
| 396 | 399 | }, |
| 397 | 400 | .gottp => { |
| 398 | | if (symbol.flags.import) { |
| 401 | if (symbol.?.flags.import) { |
| 399 | 402 | try writeInt(0, elf_file, writer); |
| 400 | 403 | } else if (is_dyn_lib) { |
| 401 | 404 | const offset = if (apply_relocs) |
| 402 | | symbol.address(.{}, elf_file) - elf_file.tlsAddress() |
| 405 | symbol.?.address(.{}, elf_file) - elf_file.tlsAddress() |
| 403 | 406 | else |
| 404 | 407 | 0; |
| 405 | 408 | try writeInt(offset, elf_file, writer); |
| 406 | 409 | } else { |
| 407 | | const offset = @as(i64, @intCast(symbol.address(.{}, elf_file))) - |
| 410 | const offset = @as(i64, @intCast(symbol.?.address(.{}, elf_file))) - |
| 408 | 411 | @as(i64, @intCast(elf_file.tpAddress())); |
| 409 | 412 | try writeInt(offset, elf_file, writer); |
| 410 | 413 | } |
Jakub Konka <kubkon@jakubkonka.com> 2023-10-09 22:31:52+02:00
src