diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2026-08-24 15:42:22 +0200 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2026-08-24 15:42:22 +0200 |
| commit | 23e790697fd8ebbb53dcaa5222520fb4a704aacd (patch) | |
| tree | d19b4d8bfb576789b65b49880fdd8074484dbaf2 /scripts | |
| parent | 1476cca098f6d3a553fcec6fe9b7d86e15c00b59 (diff) | |
| parent | 04a19b35dc05354445f0096befad63af885bb77e (diff) | |
| download | linux-next-23e790697fd8ebbb53dcaa5222520fb4a704aacd.tar.gz linux-next-23e790697fd8ebbb53dcaa5222520fb4a704aacd.zip | |
Merge branch 'dma-mapping-coco' into dma-mapping-for-next
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.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; |