From: Matt Helsley <mhelsley@vmware.com>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Steven Rostedt <rostedt@goodmis.org>,
Matt Helsley <mhelsley@vmware.com>
Subject: [PATCH v2 06/13] recordmcount: Kernel style formatting
Date: Tue, 11 Jun 2019 15:21:48 -0700 [thread overview]
Message-ID: <407b7c862a74da4a055c1fe0c8dade73a31cb44e.1560285597.git.mhelsley@vmware.com> (raw)
In-Reply-To: <cover.1560285597.git.mhelsley@vmware.com>
Fix up the whitespace irregularity in the ELF switch
blocks.
Swapping the initial value of gpfx allows us to
simplify all but one of the one-line switch cases even
further.
Signed-off-by: Matt Helsley <mhelsley@vmware.com>
---
scripts/recordmcount.c | 47 ++++++++++++++++++++++--------------------
1 file changed, 25 insertions(+), 22 deletions(-)
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 1c3599f07f9b..9ae975ccf2dc 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -487,15 +487,15 @@ static int do_file(char const *const fname)
push_bl_mcount_thumb = push_bl_mcount_thumb_be;
break;
} /* end switch */
- if (memcmp(ELFMAG, ehdr->e_ident, SELFMAG) != 0
- || w2(ehdr->e_type) != ET_REL
- || ehdr->e_ident[EI_VERSION] != EV_CURRENT) {
+ if (memcmp(ELFMAG, ehdr->e_ident, SELFMAG) != 0 ||
+ w2(ehdr->e_type) != ET_REL ||
+ ehdr->e_ident[EI_VERSION] != EV_CURRENT) {
fprintf(stderr, "unrecognized ET_REL file %s\n", fname);
cleanup();
goto out;
}
- gpfx = 0;
+ gpfx = '_';
switch (w2(ehdr->e_machine)) {
default:
fprintf(stderr, "unrecognized e_machine %u %s\n",
@@ -508,32 +508,35 @@ static int do_file(char const *const fname)
make_nop = make_nop_x86;
ideal_nop = ideal_nop5_x86_32;
mcount_adjust_32 = -1;
+ gpfx = 0;
+ break;
+ case EM_ARM:
+ reltype = R_ARM_ABS32;
+ altmcount = "__gnu_mcount_nc";
+ make_nop = make_nop_arm;
+ rel_type_nop = R_ARM_NONE;
+ gpfx = 0;
break;
- case EM_ARM: reltype = R_ARM_ABS32;
- altmcount = "__gnu_mcount_nc";
- make_nop = make_nop_arm;
- rel_type_nop = R_ARM_NONE;
- break;
case EM_AARCH64:
- reltype = R_AARCH64_ABS64;
- make_nop = make_nop_arm64;
- rel_type_nop = R_AARCH64_NONE;
- ideal_nop = ideal_nop4_arm64;
- gpfx = '_';
- break;
- case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break;
- case EM_MIPS: /* reltype: e_class */ gpfx = '_'; break;
- case EM_PPC: reltype = R_PPC_ADDR32; gpfx = '_'; break;
- case EM_PPC64: reltype = R_PPC64_ADDR64; gpfx = '_'; break;
- case EM_S390: /* reltype: e_class */ gpfx = '_'; break;
- case EM_SH: reltype = R_SH_DIR32; break;
- case EM_SPARCV9: reltype = R_SPARC_64; gpfx = '_'; break;
+ reltype = R_AARCH64_ABS64;
+ make_nop = make_nop_arm64;
+ rel_type_nop = R_AARCH64_NONE;
+ ideal_nop = ideal_nop4_arm64;
+ break;
+ case EM_IA_64: reltype = R_IA64_IMM64; break;
+ case EM_MIPS: /* reltype: e_class */ break;
+ case EM_PPC: reltype = R_PPC_ADDR32; break;
+ case EM_PPC64: reltype = R_PPC64_ADDR64; break;
+ case EM_S390: /* reltype: e_class */ break;
+ case EM_SH: reltype = R_SH_DIR32; gpfx = 0; break;
+ case EM_SPARCV9: reltype = R_SPARC_64; break;
case EM_X86_64:
make_nop = make_nop_x86;
ideal_nop = ideal_nop5_x86_64;
reltype = R_X86_64_64;
rel_type_nop = R_X86_64_NONE;
mcount_adjust_64 = -1;
+ gpfx = 0;
break;
} /* end switch */
--
2.20.1
next prev parent reply other threads:[~2019-06-11 22:22 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-11 22:21 [PATCH v2 00/13] Cleanup recordmcount and begin objtool conversion Matt Helsley
2019-06-11 22:21 ` [PATCH v2 01/13] recordmcount: Remove redundant strcmp Matt Helsley
2019-06-11 22:21 ` [PATCH v2 02/13] recordmcount: Remove uread() Matt Helsley
2019-06-11 22:21 ` [PATCH v2 03/13] recordmcount: Remove unused fd from uwrite() and ulseek() Matt Helsley
2019-06-11 22:21 ` [PATCH v2 04/13] recordmcount: Rewrite error/success handling Matt Helsley
2019-06-11 22:21 ` [PATCH v2 05/13] recordmcount: Kernel style function signature formatting Matt Helsley
2019-06-11 22:21 ` Matt Helsley [this message]
2019-06-11 22:21 ` [PATCH v2 07/13] recordmcount: Remove redundant cleanup() calls Matt Helsley
2019-06-11 22:21 ` [PATCH v2 08/13] recordmcount: Clarify what cleanup() does Matt Helsley
2019-06-11 22:21 ` [PATCH v2 09/13] objtool: Prepare to merge recordmcount Matt Helsley
2019-06-11 22:21 ` [PATCH v2 10/13] objtool: Make recordmcount into an objtool subcmd Matt Helsley
2019-06-11 22:21 ` [PATCH v2 11/13] objtool: recordmcount: Start using objtool's elf wrapper Matt Helsley
2019-06-11 22:21 ` [PATCH v2 12/13] objtool: recordmcount: Search for __mcount_loc before walking the sections Matt Helsley
2019-06-11 22:21 ` [PATCH v2 13/13] objtool: recordmcount: Convert do_func() relhdrs Matt Helsley
2019-07-10 17:09 ` [PATCH v2 00/13] Cleanup recordmcount and begin objtool conversion Steven Rostedt
2019-07-10 17:19 ` Josh Poimboeuf
2019-07-24 16:46 ` Steven Rostedt
2019-07-24 17:26 ` Matt Helsley
2019-07-24 17:29 ` Josh Poimboeuf
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=407b7c862a74da4a055c1fe0c8dade73a31cb44e.1560285597.git.mhelsley@vmware.com \
--to=mhelsley@vmware.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®