Skip to content

Commit d073a57

Browse files
SiFiveHollandpalmer-dabbelt
authored andcommitted
asm-generic: Always define Elf_Rel and Elf_Rela
These definitions are useful for relocating the kernel image as well, regardless of the type of relocations used for modules. Signed-off-by: Samuel Holland <samuel.holland@sifive.com> Link: https://lore.kernel.org/r/20241026171441.3047904-5-samuel.holland@sifive.com Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent 51b766c commit d073a57

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

include/asm-generic/module.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@ struct mod_arch_specific
1919
#define Elf_Dyn Elf64_Dyn
2020
#define Elf_Ehdr Elf64_Ehdr
2121
#define Elf_Addr Elf64_Addr
22-
#ifdef CONFIG_MODULES_USE_ELF_REL
2322
#define Elf_Rel Elf64_Rel
24-
#endif
25-
#ifdef CONFIG_MODULES_USE_ELF_RELA
2623
#define Elf_Rela Elf64_Rela
27-
#endif
2824
#define ELF_R_TYPE(X) ELF64_R_TYPE(X)
2925
#define ELF_R_SYM(X) ELF64_R_SYM(X)
3026

@@ -36,12 +32,8 @@ struct mod_arch_specific
3632
#define Elf_Dyn Elf32_Dyn
3733
#define Elf_Ehdr Elf32_Ehdr
3834
#define Elf_Addr Elf32_Addr
39-
#ifdef CONFIG_MODULES_USE_ELF_REL
4035
#define Elf_Rel Elf32_Rel
41-
#endif
42-
#ifdef CONFIG_MODULES_USE_ELF_RELA
4336
#define Elf_Rela Elf32_Rela
44-
#endif
4537
#define ELF_R_TYPE(X) ELF32_R_TYPE(X)
4638
#define ELF_R_SYM(X) ELF32_R_SYM(X)
4739
#endif

0 commit comments

Comments
 (0)