[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <0d0d88eefe95c90a4fa0bb08cccb15303d2a089d.1591125127.git.mhelsley@vmware.com>
Date: Tue, 2 Jun 2020 12:50:05 -0700
From: Matt Helsley <mhelsley@...are.com>
To: <linux-kernel@...r.kernel.org>
CC: Josh Poimboeuf <jpoimboe@...hat.com>,
Peter Zijlstra <peterz@...radead.org>,
Steven Rostedt <rostedt@...dmis.org>,
Sami Tolvanen <samitolvanen@...gle.com>,
Julien Thierry <jthierry@...hat.com>,
Kamalesh Babulal <kamalesh@...ux.vnet.ibm.com>,
Matt Helsley <mhelsley@...are.com>
Subject: [RFC][PATCH v4 12/32] objtool: mcount: Replace MIPS offset types
Replace MIPS is_fake_mcount code using Elf_Addr with
unsigned long for the offsets. This is consistent with the way
that objtool more generally treats offsets and removes the
last use of the Elf_Addr wrapper.
Signed-off-by: Matt Helsley <mhelsley@...are.com>
---
tools/objtool/recordmcount.h | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index a3fb62e88450..1a39f7acac11 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -28,7 +28,6 @@
#undef has_rel_mcount
#undef tot_relsize
#undef do_func
-#undef Elf_Addr
#undef Elf_Ehdr
#undef Elf_Shdr
#undef Elf_Rel
@@ -53,7 +52,6 @@
# define fn_is_fake_mcount fn_is_fake_mcount64
# define MIPS_is_fake_mcount MIPS64_is_fake_mcount
# define mcount_adjust mcount_adjust_64
-# define Elf_Addr Elf64_Addr
# define Elf_Ehdr Elf64_Ehdr
# define Elf_Shdr Elf64_Shdr
# define Elf_Rel Elf64_Rel
@@ -77,7 +75,6 @@
# define fn_is_fake_mcount fn_is_fake_mcount32
# define MIPS_is_fake_mcount MIPS32_is_fake_mcount
# define mcount_adjust mcount_adjust_32
-# define Elf_Addr Elf32_Addr
# define Elf_Ehdr Elf32_Ehdr
# define Elf_Shdr Elf32_Shdr
# define Elf_Rel Elf32_Rel
@@ -129,11 +126,11 @@ static int mcount_adjust = 0;
static int MIPS_is_fake_mcount(struct reloc const *reloc)
{
- static Elf_Addr old_r_offset = ~(Elf_Addr)0;
- Elf_Addr current_r_offset = reloc->offset;
+ static unsigned long old_r_offset = ~0UL;
+ unsigned long current_r_offset = reloc->offset;
int is_fake;
- is_fake = (old_r_offset != ~(Elf_Addr)0) &&
+ is_fake = (old_r_offset != ~0UL) &&
(current_r_offset - old_r_offset == MIPS_FAKEMCOUNT_OFFSET);
old_r_offset = current_r_offset;
--
2.20.1
Powered by blists - more mailing lists