Message ID | 20120214011228.GM1426@atomide.com |
---|---|
State | New |
Headers | show |
* Tony Lindgren <tony@atomide.com> [120213 16:41]: > * Rusty Russell <rusty@rustcorp.com.au> [120213 16:07]: > > On Mon, 13 Feb 2012 22:51:18 +0000, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > > > On Mon, Feb 13, 2012 at 11:26:52PM +0100, Uwe Kleine-König wrote: > > > > On Mon, Feb 13, 2012 at 01:24:01PM -0800, Tony Lindgren wrote: > > > > Maybe: > > > > > > > > #ifndef R_ARM_CALL > > > > #warning "you're elf.h include is outdated" > > > > > > "You are elf.h include is outdated" does not make sense. > > > > > > Why are you calling Tony an elf.h include? > > > > Because he knew it would attract the attention of pedants to the patch? > > :) > > I've been called worse than that :) > > > Just do the #ifndef, and skip the warning. There's not much the poor > > user receiving the warning can do about it. > > OK > > > Acked-by: Rusty Russell <rusty@rustcorp.com.au> > > Assuming your ack applies for this patch below, let me know if that's > not the case. This is now in Russell's patch tracking system as patch 7324/1. Tony
--- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1494,6 +1494,13 @@ static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) return 0; } +#ifndef R_ARM_CALL +#define R_ARM_CALL 28 +#endif +#ifndef R_ARM_JUMP24 +#define R_ARM_JUMP24 29 +#endif + static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) { unsigned int r_typ = ELF_R_TYPE(r->r_info); @@ -1505,6 +1512,8 @@ static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) (elf->symtab_start + ELF_R_SYM(r->r_info)); break; case R_ARM_PC24: + case R_ARM_CALL: + case R_ARM_JUMP24: /* From ARM ABI: ((S + A) | T) - P */ r->r_addend = (int)(long)(elf->hdr + sechdr->sh_offset +