diff options
| author | Andi Shyti <andi.shyti@linux.intel.com> | 2026-07-14 13:12:12 +0200 |
|---|---|---|
| committer | Andi Shyti <andi.shyti@linux.intel.com> | 2026-07-14 13:12:12 +0200 |
| commit | 190161eb58a990c2b4201751215344bd6949ae15 (patch) | |
| tree | 605ebfce83a3355540a1f7b62a2948ee3ffb5d05 /scripts | |
| parent | 04e9bf1648f846976b543e91c1838a712433772a (diff) | |
| parent | a13c140cc289c0b7b3770bce5b3ad42ab35074aa (diff) | |
| download | linux-next-190161eb58a990c2b4201751215344bd6949ae15.tar.gz linux-next-190161eb58a990c2b4201751215344bd6949ae15.zip | |
Merge branch 'i2c/i2c-fixes' into i2c/i2c-next
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; |