mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 21:30:54 +07:00
MN10300: Fix application of kernel module relocations
This fixes the MN10300 kernel module linking to match the toolchain. RELA relocs don't use the value at the location being relocated. This has been working because the tools always leave the value at the target location cleared. Signed-off-by: Mark Salter <msalter@redhat.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
026bde120a
commit
1122b19b8f
@ -1,6 +1,6 @@
|
||||
/* MN10300 Kernel module helper routines
|
||||
*
|
||||
* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
|
||||
* Copyright (C) 2007, 2008 Red Hat, Inc. All Rights Reserved.
|
||||
* Written by Mark Salter (msalter@redhat.com)
|
||||
* - Derived from arch/i386/kernel/module.c
|
||||
*
|
||||
@ -64,21 +64,6 @@ int module_frob_arch_sections(Elf_Ehdr *hdr,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static uint32_t reloc_get16(uint8_t *p)
|
||||
{
|
||||
return p[0] | (p[1] << 8);
|
||||
}
|
||||
|
||||
static uint32_t reloc_get24(uint8_t *p)
|
||||
{
|
||||
return reloc_get16(p) | (p[2] << 16);
|
||||
}
|
||||
|
||||
static uint32_t reloc_get32(uint8_t *p)
|
||||
{
|
||||
return reloc_get16(p) | (reloc_get16(p+2) << 16);
|
||||
}
|
||||
|
||||
static void reloc_put16(uint8_t *p, uint32_t val)
|
||||
{
|
||||
p[0] = val & 0xff;
|
||||
@ -144,25 +129,19 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
|
||||
relocation = sym->st_value + rel[i].r_addend;
|
||||
|
||||
switch (ELF32_R_TYPE(rel[i].r_info)) {
|
||||
/* for the first four relocation types, we add the
|
||||
* adjustment into the value at the location given */
|
||||
/* for the first four relocation types, we simply
|
||||
* store the adjustment at the location given */
|
||||
case R_MN10300_32:
|
||||
value = reloc_get32(location);
|
||||
value += relocation;
|
||||
reloc_put32(location, value);
|
||||
reloc_put32(location, relocation);
|
||||
break;
|
||||
case R_MN10300_24:
|
||||
value = reloc_get24(location);
|
||||
value += relocation;
|
||||
reloc_put24(location, value);
|
||||
reloc_put24(location, relocation);
|
||||
break;
|
||||
case R_MN10300_16:
|
||||
value = reloc_get16(location);
|
||||
value += relocation;
|
||||
reloc_put16(location, value);
|
||||
reloc_put16(location, relocation);
|
||||
break;
|
||||
case R_MN10300_8:
|
||||
*location += relocation;
|
||||
*location = relocation;
|
||||
break;
|
||||
|
||||
/* for the next three relocation types, we write the
|
||||
|
Loading…
Reference in New Issue
Block a user