Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e63152b authored by Matt Helsley's avatar Matt Helsley Committed by Steven Rostedt (VMware)
Browse files

recordmcount: Kernel style formatting 

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.

Link: http://lkml.kernel.org/r/647f21f43723d3e831cedd3238c893db03eea6f0.1564596289.git.mhelsley@vmware.com



Signed-off-by: default avatarMatt Helsley <mhelsley@vmware.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 3aec8638

scripts/recordmcount.c

+25 −22
Original line number Diff line number Diff line
@@ -489,15 +489,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",
@@ -510,32 +510,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;

	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_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;

	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 */