liyepan/openloongarch-linux-6.12
1
0
Fork 0
mirror of https://gitee.com/open-loongarch/linux-6.12.git synced 2026-10-25 20:47:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

objtool: Handle various symbol types of rodata

Browse Source 
In the relocation section ".rela.rodata" of each .o file compiled with
LoongArch toolchain, there are various symbol types such as STT_NOTYPE,
STT_OBJECT, STT_FUNC in addition to the usual STT_SECTION, it needs to
use reloc symbol offset instead of reloc addend to find the destination
instruction in find_jump_table() and add_jump_table().

This is preparation for later patch on LoongArch, there is no effect for
the other archs with this patch.

Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: michael <michael5hzg@gmail.com>
Signed-off-by: maoxiaochuan <maoxiaochuan@loongson.cn>
This commit is contained in:
Tiezhu Yang
2025-02-13 14:26:40 +08:00
committed by maoxiaochuan
parent 8b074cffbf
commit 15a2bee1ab
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/objtool/check.c
+22 -4
View File
@@ -2079,6 +2079,7 @@ static int add_jump_table(struct objtool_file *file, struct instruction *insn,
unsigned int prev_offset = 0;
struct reloc *reloc = table;
struct alternative *alt;
unsigned long offset;
/*
* Each @reloc is a switch table relocation which points to the target
@@ -2094,12 +2095,19 @@ static int add_jump_table(struct objtool_file *file, struct instruction *insn,
if (prev_offset && reloc_offset(reloc) != prev_offset + 8)
break;
if (reloc->sym->type == STT_SECTION) {
/* Addend field in the relocation entry associated with the symbol */
offset = reloc_addend(reloc);
} else {
/* The address of the symbol in the relocation entry */
offset = reloc->sym->offset;
}
/* Detect function pointers from contiguous objects: */
if (reloc->sym->sec == pfunc->sec &&
reloc_addend(reloc) == pfunc->offset)
if (reloc->sym->sec == pfunc->sec && offset == pfunc->offset)
break;
dest_insn = find_insn(file, reloc->sym->sec, reloc_addend(reloc));
dest_insn = find_insn(file, reloc->sym->sec, offset);
if (!dest_insn)
break;
@@ -2137,6 +2145,7 @@ static struct reloc *find_jump_table(struct objtool_file *file,
{
struct reloc *table_reloc;
struct instruction *dest_insn, *orig_insn = insn;
unsigned long offset;
/*
* Backward search using the @first_jump_src links, these help avoid
@@ -2160,7 +2169,16 @@ static struct reloc *find_jump_table(struct objtool_file *file,
table_reloc = arch_find_switch_table(file, insn);
if (!table_reloc)
continue;
dest_insn = find_insn(file, table_reloc->sym->sec, reloc_addend(table_reloc));
if (table_reloc->sym->type == STT_SECTION) {
/* Addend field in the relocation entry associated with the symbol */
offset = reloc_addend(table_reloc);
} else {
/* The address of the symbol in the relocation entry */
offset = table_reloc->sym->offset;
}
dest_insn = find_insn(file, table_reloc->sym->sec, offset);
if (!dest_insn || !insn_func(dest_insn) || insn_func(dest_insn)->pfunc != func)
continue;