[PATCH v1 6/6] objtool/LoongArch: Add support for goto table

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



If find_reloc_by_table_annotate() failed, it means that there
is no relocation info of switch table address in the section
".rela.discard.tablejump_annotate", then objtool can find the
relocation against the nearest instruction before the jump
instruction with find_reloc_by_dest_range(), which points to
the goto table.

Signed-off-by: Tiezhu Yang <yangtiezhu@xxxxxxxxxxx>
---
 tools/objtool/arch/loongarch/special.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/objtool/arch/loongarch/special.c b/tools/objtool/arch/loongarch/special.c
index 65b1ed297d57..d2a6071d772f 100644
--- a/tools/objtool/arch/loongarch/special.c
+++ b/tools/objtool/arch/loongarch/special.c
@@ -47,8 +47,18 @@ struct reloc *arch_find_switch_table(struct objtool_file *file,
 	unsigned long table_offset;
 
 	annotate_reloc = find_reloc_by_table_annotate(file, insn);
-	if (!annotate_reloc)
-		return NULL;
+	if (!annotate_reloc) {
+		annotate_reloc = find_reloc_by_dest_range(file->elf, insn->sec,
+							  insn->offset, insn->len);
+		if (!annotate_reloc)
+			return NULL;
+
+		if (!annotate_reloc->sym->sec->rodata)
+			return NULL;
+
+		if (reloc_type(annotate_reloc) != R_LARCH_NONE)
+			return NULL;
+	}
 
 	table_sec = annotate_reloc->sym->sec;
 	table_offset = annotate_reloc->sym->offset;
-- 
2.42.0





[Index of Archives]     [Linux Samsung SoC]     [Linux Rockchip SoC]     [Linux Actions SoC]     [Linux for Synopsys ARC Processors]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]


  Powered by Linux