diff options
| author | Thierry Reding <treding@nvidia.com> | 2026-07-31 18:01:19 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2026-07-31 18:01:19 +0200 |
| commit | 48713e5ff96a2c04286071a2136455545e4c72a5 (patch) | |
| tree | ce566426d7b0853e6ea8e036e99321b224c27312 /scripts | |
| parent | 43b3ac46a3cbcbd878f4c47e7fdd9277dab96702 (diff) | |
| parent | 2aedc7afffc61449ddd44bf2a4b3195729cb46ac (diff) | |
| download | linux-next-48713e5ff96a2c04286071a2136455545e4c72a5.tar.gz linux-next-48713e5ff96a2c04286071a2136455545e4c72a5.zip | |
Merge branch for-7.3/arm64/dt into for-next
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/sorttable.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/sorttable.c b/scripts/sorttable.c index e8ed11c680c6..d8dc2a1b7c31 100644 --- a/scripts/sorttable.c +++ b/scripts/sorttable.c @@ -891,17 +891,22 @@ static int do_file(char const *const fname, void *addr) table_sort_t custom_sort = NULL; switch (elf_map_machine(ehdr)) { - case EM_AARCH64: #ifdef MCOUNT_SORT_ENABLED + case EM_AARCH64: + /* arm64 also needs RELA-based weak-function fixups. */ sort_reloc = true; rela_type = 0x403; - /* arm64 uses patchable function entry placing before function */ + /* fallthrough */ + case EM_RISCV: + /* arm64 and RISC-V place patchable entries before the function. */ before_func = 8; +#else + case EM_AARCH64: + case EM_RISCV: #endif /* fallthrough */ case EM_386: case EM_LOONGARCH: - case EM_RISCV: case EM_S390: case EM_X86_64: custom_sort = sort_relative_table_with_data; |