diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2026-07-08 13:00:55 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2026-07-08 13:00:55 +0200 |
| commit | e7743a6b0334dcaa9eca3a4103f74963664ff563 (patch) | |
| tree | d936ff994cf5f96da054e64872c54e4ccffc0d32 /scripts | |
| parent | cdd12b8d71246a11b885f65a024accd232aca658 (diff) | |
| parent | 0461ba9a7994a9bfa2ceefe730e2c87759edc267 (diff) | |
| download | linux-e7743a6b0334dcaa9eca3a4103f74963664ff563.tar.gz linux-e7743a6b0334dcaa9eca3a4103f74963664ff563.zip | |
Merge drm/drm-next into drm-misc-next
Backmerging to get updates from v7.2-rc2 into drm-misc-next.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
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; |