diff options
author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2024-06-12 15:17:09 +0100 |
---|---|---|
committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2024-06-25 11:07:51 +0100 |
commit | c9cf7bdfe53a5c8446f8dc6e6f1bafa4c3636f59 (patch) | |
tree | 8c49d3f4cb755bdb128fa3a660987a95f5decc65 /bfd | |
parent | bd54c881cd14af32f2347dab5ce51823ed631a88 (diff) | |
download | gdb-c9cf7bdfe53a5c8446f8dc6e6f1bafa4c3636f59.zip gdb-c9cf7bdfe53a5c8446f8dc6e6f1bafa4c3636f59.tar.gz gdb-c9cf7bdfe53a5c8446f8dc6e6f1bafa4c3636f59.tar.bz2 |
aarch64: Add DT_RELR support for ILP32 ABI
Extend the 64bit DT_RELR support to work on 32bit ELF too. For this
only a few changes were needed in the sizing and creation of the
relr relocations.
Diffstat (limited to 'bfd')
-rw-r--r-- | bfd/elfnn-aarch64.c | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 2221de0..0005646 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -9451,6 +9451,11 @@ sort_relr (struct bfd_link_info *info, return true; } +/* Size of a relr entry and a relocated location. */ +#define RELR_SZ (ARCH_SIZE / 8) +/* Number of consecutive locations a relr bitmap entry references. */ +#define RELR_N (ARCH_SIZE - 1) + /* Size .relr.dyn whenever the layout changes, the number of packed relocs are unchanged but the packed representation can. */ @@ -9473,19 +9478,19 @@ elfNN_aarch64_size_relative_relocs (struct bfd_link_info *info, { bfd_vma base = addr[i]; i++; - srelrdyn->size += 8; - base += 8; + srelrdyn->size += RELR_SZ; + base += RELR_SZ; for (;;) { bfd_size_type start_i = i; while (i < htab->relr_count - && addr[i] - base < 63 * 8 - && (addr[i] - base) % 8 == 0) + && addr[i] - base < RELR_N * RELR_SZ + && (addr[i] - base) % RELR_SZ == 0) i++; if (i == start_i) break; - srelrdyn->size += 8; - base += 63 * 8; + srelrdyn->size += RELR_SZ; + base += RELR_N * RELR_SZ; } } if (srelrdyn->size != oldsize) @@ -9522,25 +9527,25 @@ elfNN_aarch64_finish_relative_relocs (struct bfd_link_info *info) { bfd_vma base = addr[i]; i++; - bfd_put_64 (dynobj, base, loc); - loc += 8; - base += 8; + bfd_put_NN (dynobj, base, loc); + loc += RELR_SZ; + base += RELR_SZ; for (;;) { bfd_vma bits = 0; while (i < htab->relr_count) { bfd_vma delta = addr[i] - base; - if (delta >= 63 * 8 || delta % 8 != 0) + if (delta >= RELR_N * RELR_SZ || delta % RELR_SZ != 0) break; - bits |= (bfd_vma) 1 << (delta / 8); + bits |= (bfd_vma) 1 << (delta / RELR_SZ); i++; } if (bits == 0) break; - bfd_put_64 (dynobj, (bits << 1) | 1, loc); - loc += 8; - base += 63 * 8; + bfd_put_NN (dynobj, (bits << 1) | 1, loc); + loc += RELR_SZ; + base += RELR_N * RELR_SZ; } } free (addr); @@ -9548,8 +9553,8 @@ elfNN_aarch64_finish_relative_relocs (struct bfd_link_info *info) /* Pad any excess with 1's, a do-nothing encoding. */ while (loc < srelrdyn->contents + srelrdyn->size) { - bfd_put_64 (dynobj, 1, loc); - loc += 8; + bfd_put_NN (dynobj, 1, loc); + loc += RELR_SZ; } return true; } |