diff options
| author | Namhyung Kim <namhyung@kernel.org> | 2026-07-28 22:11:23 -0700 |
|---|---|---|
| committer | Namhyung Kim <namhyung@kernel.org> | 2026-07-28 22:11:23 -0700 |
| commit | b56de9f26245c45bb5cb140fefd287b371b7e28d (patch) | |
| tree | 994214b735002c56f641071fc437601a33a1a0b9 /scripts | |
| parent | 0d40fedcd1b9e809f966c97d40f32943fb89e0d4 (diff) | |
| parent | fac520e43a60230b24026f462a2b63e4d170566e (diff) | |
| download | linux-b56de9f26245c45bb5cb140fefd287b371b7e28d.tar.gz linux-b56de9f26245c45bb5cb140fefd287b371b7e28d.zip | |
Merge tag 'perf-tools-fixes-for-v7.2-1-2026-07-25' into perf-tools-next
perf tools fixes for v7.2.
- Update header copies of kernel headers, including const.h, fs.h,
perf_event.h, gfp_types.h, kvm.h, cpufeatures.h, rtnetlink.hp,
msr-index.h, drm.h and socket.h.
- Add some build files related to BPF skels to .gitignore.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Namhyung Kim <namhyung@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; |