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

Commit 94f4fb08 authored by Vineet Gupta's avatar Vineet Gupta
Browse files

ARC: module: support R_ARC_32_PCREL relocation 



Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
parent e0d5321f

arch/arc/include/asm/elf.h

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ 
/* ARC Relocations (kernel Modules only) */

#define  R_ARC_32		0x4

#define  R_ARC_32_ME		0x1B

#define  R_ARC_S25H_PCREL	0x10

#define  R_ARC_S25W_PCREL	0x11

#define  R_ARC_32_PCREL		0x31



/*to set parameters in the core dumps */

#define ELF_ARCH		EM_ARCOMPACT

arch/arc/kernel/module.c

+4 −2
Original line number Diff line number Diff line
@@ -106,10 +106,12 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, 
		 */

		relo_type = ELF32_R_TYPE(rel_entry[i].r_info);



		if (likely(R_ARC_32_ME == relo_type))

		if (likely(R_ARC_32_ME == relo_type))	/* ME ( S + A ) */

			arc_write_me((unsigned short *)location, relocation);

		else if (R_ARC_32 == relo_type)

		else if (R_ARC_32 == relo_type)		/* ( S + A ) */

			*((Elf32_Addr *) location) = relocation;

		else if (R_ARC_32_PCREL == relo_type)	/* ( S + A ) - PDATA ) */

			*((Elf32_Addr *) location) = relocation - location;

		else

			goto relo_err;