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

Commit dfa520af authored by Andreas Larsson's avatar Andreas Larsson Committed by David S. Miller
Browse files

sparc32: Enable the relocation target R_SPARC_DISP32 for sparc32 



GNU Binutils 2.20.1 generates .eh_frame sections that uses R_SPARC_DISP32.

Signed-off-by: default avatarAndreas Larsson <andreas@gaisler.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c46de226

arch/sparc/kernel/module.c

+4 −5
Original line number Diff line number Diff line
@@ -116,6 +116,10 @@ int apply_relocate_add(Elf_Shdr *sechdrs, 
		v = sym->st_value + rel[i].r_addend;



		switch (ELF_R_TYPE(rel[i].r_info) & 0xff) {

		case R_SPARC_DISP32:

			v -= (Elf_Addr) location;

			*loc32 = v;

			break;

#ifdef CONFIG_SPARC64

		case R_SPARC_64:

			location[0] = v >> 56;
@@ -128,11 +132,6 @@ int apply_relocate_add(Elf_Shdr *sechdrs, 
			location[7] = v >>  0;

			break;



		case R_SPARC_DISP32:

			v -= (Elf_Addr) location;

			*loc32 = v;

			break;



		case R_SPARC_WDISP19:

			v -= (Elf_Addr) location;

			*loc32 = (*loc32 & ~0x7ffff) |