[RFC PATCH 07/12] scripts/sorttable: sort .lr_unwind_fde by start_offset
From: Dylan Hatch
Date: Mon Nov 16 2026 - 23:35:45 EST
Normalize the PC-relative start_offset word of each 8-byte struct lr_fde
entry in .lr_unwind_fde, qsort by virtual address, and denormalize back
to PC-relative offsets without modifying range_desc.
Signed-off-by: Dylan Hatch <dylanbhatch@xxxxxxxxxx>
---
scripts/sorttable.c | 50 ++++++++++++++++++++++++++++++++++-----------
1 file changed, 38 insertions(+), 12 deletions(-)
diff --git a/scripts/sorttable.c b/scripts/sorttable.c
index 88e49a5c42512..38495c39e404b 100644
--- a/scripts/sorttable.c
+++ b/scripts/sorttable.c
@@ -600,6 +600,37 @@ static void get_mcount_loc(struct elf_mcount_loc *emloc, Elf_Shdr *symtab_sec,
static inline int parse_symbols(const char *fname) { return 0; }
#endif
+static int compare_relative_table(const void *a, const void *b)
+{
+ int32_t av = (int32_t)elf_parser.r(a);
+ int32_t bv = (int32_t)elf_parser.r(b);
+
+ if (av < bv)
+ return -1;
+ if (av > bv)
+ return 1;
+ return 0;
+}
+
+static void sort_lr_unwind_fde(char *fde_image, int image_size)
+{
+ int i;
+
+ for (i = 0; i < image_size; i += 8) {
+ uint32_t *loc = (uint32_t *)(fde_image + i);
+
+ elf_parser.w(elf_parser.r(loc) + i, loc);
+ }
+
+ qsort(fde_image, image_size / 8, 8, compare_relative_table);
+
+ for (i = 0; i < image_size; i += 8) {
+ uint32_t *loc = (uint32_t *)(fde_image + i);
+
+ elf_parser.w(elf_parser.r(loc) - i, loc);
+ }
+}
+
static int do_sort(Elf_Ehdr *ehdr,
char const *const fname,
table_sort_t custom_sort)
@@ -609,6 +640,7 @@ static int do_sort(Elf_Ehdr *ehdr,
Elf_Shdr *strtab_sec = NULL;
Elf_Shdr *symtab_sec = NULL;
Elf_Shdr *extab_sec = NULL;
+ Elf_Shdr *lr_fde_sec = NULL;
Elf_Shdr *string_sec;
Elf_Sym *sym;
const Elf_Sym *symtab;
@@ -656,6 +688,8 @@ static int do_sort(Elf_Ehdr *ehdr,
idx = shdr_name(shdr);
if (!strcmp(secstrings + idx, "__ex_table"))
extab_sec = shdr;
+ if (!strcmp(secstrings + idx, ".lr_unwind_fde"))
+ lr_fde_sec = shdr;
if (!strcmp(secstrings + idx, ".symtab"))
symtab_sec = shdr;
if (!strcmp(secstrings + idx, ".strtab"))
@@ -759,6 +793,10 @@ static int do_sort(Elf_Ehdr *ehdr,
extable_ent_size, compare_extable);
}
+ if (lr_fde_sec)
+ sort_lr_unwind_fde((char *)ehdr + shdr_offset(lr_fde_sec),
+ shdr_size(lr_fde_sec));
+
/* find the flag main_extable_sort_needed */
sym_start = (void *)ehdr + shdr_offset(symtab_sec);
sym_end = sym_start + shdr_size(symtab_sec);
@@ -833,18 +871,6 @@ static int do_sort(Elf_Ehdr *ehdr,
return rc;
}
-static int compare_relative_table(const void *a, const void *b)
-{
- int32_t av = (int32_t)elf_parser.r(a);
- int32_t bv = (int32_t)elf_parser.r(b);
-
- if (av < bv)
- return -1;
- if (av > bv)
- return 1;
- return 0;
-}
-
static void sort_relative_table(char *extab_image, int image_size)
{
int i = 0;
--
2.56.0.679.gc527c65306-goog