diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2024-02-18 00:43:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-18 00:43:33 +0100 |
| commit | f3bd177723293d11680f3cccaa2f5798a5625667 (patch) | |
| tree | 179cb6435a2ec0d8b8707dee003c21e2b00a9c41 | |
| parent | 3e8cb153ea44ad1f403fbf6d23a67c839df57925 (diff) | |
| parent | 99584906bbdf0b2fdc69386546fb8c6d96ab09f5 (diff) | |
| download | zig-f3bd177723293d11680f3cccaa2f5798a5625667.tar.gz zig-f3bd177723293d11680f3cccaa2f5798a5625667.zip | |
Merge pull request #18976 from ziglang/elf-misc-fixes
elf: misc fixes
| -rw-r--r-- | src/link/Elf/Atom.zig | 2 | ||||
| -rw-r--r-- | src/link/Elf/relocation.zig | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/link/Elf/Atom.zig b/src/link/Elf/Atom.zig index 3064fd6f74..0de33aaf28 100644 --- a/src/link/Elf/Atom.zig +++ b/src/link/Elf/Atom.zig @@ -881,7 +881,7 @@ const x86_64 = struct { .@"32", .@"32S", => { - try atom.scanReloc(symbol, rel, dynAbsRelocAction(symbol, elf_file), elf_file); + try atom.scanReloc(symbol, rel, absRelocAction(symbol, elf_file), elf_file); }, .GOT32, diff --git a/src/link/Elf/relocation.zig b/src/link/Elf/relocation.zig index a63187925f..7b0d42dc3d 100644 --- a/src/link/Elf/relocation.zig +++ b/src/link/Elf/relocation.zig @@ -55,11 +55,12 @@ const aarch64_relocs = Table(10, elf.R_AARCH64, .{ .{ .tlsdesc, .TLSDESC }, }); -const riscv64_relocs = Table(9, elf.R_RISCV, .{ +const riscv64_relocs = Table(10, elf.R_RISCV, .{ .{ .abs, .@"64" }, .{ .copy, .COPY }, .{ .rel, .RELATIVE }, .{ .irel, .IRELATIVE }, + .{ .glob_dat, .@"64" }, .{ .jump_slot, .JUMP_SLOT }, .{ .dtpmod, .TLS_DTPMOD64 }, .{ .dtpoff, .TLS_DTPREL64 }, |