| author |  Jakub Konka <kubkon@jakubkonka.com> 2024-02-18 00:43:33+01:00 |
| committer |  GitHub <noreply@github.com> 2024-02-18 00:43:33+01:00 |
| log | f3bd177723293d11680f3cccaa2f5798a5625667 |
| tree | 179cb6435a2ec0d8b8707dee003c21e2b00a9c41 |
| parent | 3e8cb153ea44ad1f403fbf6d23a67c839df57925 |
| parent | 99584906bbdf0b2fdc69386546fb8c6d96ab09f5 |
| signature |  Signed by PGP key B5690EEEBB952194 |
Merge pull request #18976 from ziglang/elf-misc-fixes
elf: misc fixes2 files changed, 3 insertions(+), 2 deletions(-)
src- link
src/link/Elf/Atom.zig+1-1
| ... | @@ -881,7 +881,7 @@ const x86_64 = struct { | ... | @@ -881,7 +881,7 @@ const x86_64 = struct { |
| 881 | .@"32", | 881 | .@"32", |
| 882 | .@"32S", | 882 | .@"32S", |
| 883 | => { | 883 | => { |
| 884 | try atom.scanReloc(symbol, rel, dynAbsRelocAction(symbol, elf_file), elf_file); | 884 | try atom.scanReloc(symbol, rel, absRelocAction(symbol, elf_file), elf_file); |
| 885 | }, | 885 | }, |
| 886 | 886 | ||
| 887 | .GOT32, | 887 | .GOT32, |
src/link/Elf/relocation.zig+2-1
| ... | @@ -55,11 +55,12 @@ const aarch64_relocs = Table(10, elf.R_AARCH64, .{ | ... | @@ -55,11 +55,12 @@ const aarch64_relocs = Table(10, elf.R_AARCH64, .{ |
| 55 | .{ .tlsdesc, .TLSDESC }, | 55 | .{ .tlsdesc, .TLSDESC }, |
| 56 | }); | 56 | }); |
| 57 | 57 | ||
| 58 | const riscv64_relocs = Table(9, elf.R_RISCV, .{ | 58 | const riscv64_relocs = Table(10, elf.R_RISCV, .{ |
| 59 | .{ .abs, .@"64" }, | 59 | .{ .abs, .@"64" }, |
| 60 | .{ .copy, .COPY }, | 60 | .{ .copy, .COPY }, |
| 61 | .{ .rel, .RELATIVE }, | 61 | .{ .rel, .RELATIVE }, |
| 62 | .{ .irel, .IRELATIVE }, | 62 | .{ .irel, .IRELATIVE }, |
| 63 | .{ .glob_dat, .@"64" }, | ||
| 63 | .{ .jump_slot, .JUMP_SLOT }, | 64 | .{ .jump_slot, .JUMP_SLOT }, |
| 64 | .{ .dtpmod, .TLS_DTPMOD64 }, | 65 | .{ .dtpmod, .TLS_DTPMOD64 }, |
| 65 | .{ .dtpoff, .TLS_DTPREL64 }, | 66 | .{ .dtpoff, .TLS_DTPREL64 }, |