From: Sathvika Vasireddy <sv@linux.ibm.com> To: linuxppc-dev@lists.ozlabs.org Cc: jpoimboe@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, aik@ozlabs.ru, mpe@ellerman.id.au, mingo@redhat.com, christophe.leroy@csgroup.eu, rostedt@goodmis.org, mbenes@suse.cz, npiggin@gmail.com, chenzhongjin@huawei.com, naveen.n.rao@linux.vnet.ibm.com, sv@linux.ibm.com Subject: [PATCH v6 13/16] objtool: Use macros to define arch specific reloc types Date: Mon, 14 Nov 2022 23:27:51 +0530 [thread overview] Message-ID: <20221114175754.1131267-14-sv@linux.ibm.com> (raw) In-Reply-To: <20221114175754.1131267-1-sv@linux.ibm.com> Make relocation types architecture specific. Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Reviewed-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Sathvika Vasireddy <sv@linux.ibm.com> --- tools/objtool/arch/x86/include/arch/elf.h | 2 ++ tools/objtool/check.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/objtool/arch/x86/include/arch/elf.h b/tools/objtool/arch/x86/include/arch/elf.h index 69cc4264b28a..ac14987cf687 100644 --- a/tools/objtool/arch/x86/include/arch/elf.h +++ b/tools/objtool/arch/x86/include/arch/elf.h @@ -2,5 +2,7 @@ #define _OBJTOOL_ARCH_ELF #define R_NONE R_X86_64_NONE +#define R_ABS64 R_X86_64_64 +#define R_ABS32 R_X86_64_32 #endif /* _OBJTOOL_ARCH_ELF */ diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 752a6ffd5c4c..2d7153b5d5d1 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -885,7 +885,7 @@ static int create_mcount_loc_sections(struct objtool_file *file) memset(loc, 0, addrsize); if (elf_add_reloc_to_insn(file->elf, sec, idx, - R_X86_64_64, + addrsize == sizeof(u64) ? R_ABS64 : R_ABS32, insn->sec, insn->offset)) return -1; -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Sathvika Vasireddy <sv@linux.ibm.com> To: linuxppc-dev@lists.ozlabs.org Cc: peterz@infradead.org, npiggin@gmail.com, linux-kernel@vger.kernel.org, aik@ozlabs.ru, mingo@redhat.com, sv@linux.ibm.com, rostedt@goodmis.org, jpoimboe@redhat.com, naveen.n.rao@linux.vnet.ibm.com, mbenes@suse.cz, chenzhongjin@huawei.com Subject: [PATCH v6 13/16] objtool: Use macros to define arch specific reloc types Date: Mon, 14 Nov 2022 23:27:51 +0530 [thread overview] Message-ID: <20221114175754.1131267-14-sv@linux.ibm.com> (raw) In-Reply-To: <20221114175754.1131267-1-sv@linux.ibm.com> Make relocation types architecture specific. Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Reviewed-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Sathvika Vasireddy <sv@linux.ibm.com> --- tools/objtool/arch/x86/include/arch/elf.h | 2 ++ tools/objtool/check.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/objtool/arch/x86/include/arch/elf.h b/tools/objtool/arch/x86/include/arch/elf.h index 69cc4264b28a..ac14987cf687 100644 --- a/tools/objtool/arch/x86/include/arch/elf.h +++ b/tools/objtool/arch/x86/include/arch/elf.h @@ -2,5 +2,7 @@ #define _OBJTOOL_ARCH_ELF #define R_NONE R_X86_64_NONE +#define R_ABS64 R_X86_64_64 +#define R_ABS32 R_X86_64_32 #endif /* _OBJTOOL_ARCH_ELF */ diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 752a6ffd5c4c..2d7153b5d5d1 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -885,7 +885,7 @@ static int create_mcount_loc_sections(struct objtool_file *file) memset(loc, 0, addrsize); if (elf_add_reloc_to_insn(file->elf, sec, idx, - R_X86_64_64, + addrsize == sizeof(u64) ? R_ABS64 : R_ABS32, insn->sec, insn->offset)) return -1; -- 2.31.1
next prev parent reply other threads:[~2022-11-14 18:01 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-14 17:57 [PATCH v6 00/16] objtool: Enable and implement --mcount option on powerpc Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 01/16] powerpc: Fix __WARN_FLAGS() for use with Objtool Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 02/16] powerpc: Override __ALIGN and __ALIGN_STR macros Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 03/16] powerpc: Fix objtool unannotated intra-function call warnings Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 04/16] powerpc: Curb " Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 05/16] powerpc: Skip objtool from running on drivers/crypto/vmx/aesp8-ppc.o Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 06/16] powerpc: Fix objtool unannotated intra-function call warnings on PPC32 Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 07/16] powerpc: Skip objtool from running on VDSO files Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 08/16] objtool: Fix SEGFAULT Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 09/16] objtool: Use target file endianness instead of a compiled constant Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 10/16] objtool: Use target file class size " Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 11/16] objtool: Add --mnop as an option to --mcount Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 12/16] objtool: Read special sections with alts only when specific options are selected Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy [this message] 2022-11-14 17:57 ` [PATCH v6 13/16] objtool: Use macros to define arch specific reloc types Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 14/16] objtool: Add arch specific function arch_ftrace_match() Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 15/16] objtool/powerpc: Enable objtool to be built on ppc Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-11-14 17:57 ` [PATCH v6 16/16] objtool/powerpc: Add --mcount specific implementation Sathvika Vasireddy 2022-11-14 17:57 ` Sathvika Vasireddy 2022-12-08 13:02 ` [PATCH v6 00/16] objtool: Enable and implement --mcount option on powerpc Michael Ellerman 2022-12-08 13:02 ` Michael Ellerman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221114175754.1131267-14-sv@linux.ibm.com \ --to=sv@linux.ibm.com \ --cc=aik@ozlabs.ru \ --cc=chenzhongjin@huawei.com \ --cc=christophe.leroy@csgroup.eu \ --cc=jpoimboe@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mbenes@suse.cz \ --cc=mingo@redhat.com \ --cc=mpe@ellerman.id.au \ --cc=naveen.n.rao@linux.vnet.ibm.com \ --cc=npiggin@gmail.com \ --cc=peterz@infradead.org \ --cc=rostedt@goodmis.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.