diff options
| author | Danilo Krummrich <dakr@kernel.org> | 2026-07-28 11:38:35 +0200 |
|---|---|---|
| committer | Danilo Krummrich <dakr@kernel.org> | 2026-07-28 11:38:35 +0200 |
| commit | 0755a4e3e809610a14befc9ad28d35e2e460da68 (patch) | |
| tree | ecc435df9b236c92cf9c708270a5ff89151a57ff /scripts | |
| parent | 93b9511a3bba7f31d95502e5f912f0a476b0cf4a (diff) | |
| parent | ea97ab2759506d9a818ffed1009bde01062b4091 (diff) | |
| download | linux-0755a4e3e809610a14befc9ad28d35e2e460da68.tar.gz linux-0755a4e3e809610a14befc9ad28d35e2e460da68.zip | |
Merge remote-tracking branch 'drm/drm-next' into drm-rust-next
Backmerge to pull in commit 21fcb222f0d1 ("drm: Remove DRIVER_GEM_GPUVA
feature flag"), which a Tyr patch series depends on.
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
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; |