diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-07-31 11:41:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-07-31 11:41:07 +0200 |
| commit | f70494ac4c07bcd3c5d2d8af96591032c69d9d44 (patch) | |
| tree | 053cc4730ed3e999c1bea23dc23df168b5d856bc /scripts | |
| parent | edda9051e267b7390c7ce24b1b71434414ad156e (diff) | |
| parent | cc679d7a6303e84d769f2afcde1fc51c51f127cd (diff) | |
| download | linux-f70494ac4c07bcd3c5d2d8af96591032c69d9d44.tar.gz linux-f70494ac4c07bcd3c5d2d8af96591032c69d9d44.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@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; |