mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
|
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
|
||
|
|
index a58378c..ce3b36e 100644
|
||
|
|
--- a/arch/arm/include/asm/elf.h
|
||
|
|
+++ b/arch/arm/include/asm/elf.h
|
||
|
|
@@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t;
|
||
|
|
#define R_ARM_ABS32 2
|
||
|
|
#define R_ARM_CALL 28
|
||
|
|
#define R_ARM_JUMP24 29
|
||
|
|
+#define R_ARM_V4BX 40
|
||
|
|
|
||
|
|
/*
|
||
|
|
* These are used to set parameters in the core dumps.
|
||
|
|
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
|
||
|
|
index dab48f2..9f509fd 100644
|
||
|
|
--- a/arch/arm/kernel/module.c
|
||
|
|
+++ b/arch/arm/kernel/module.c
|
||
|
|
@@ -132,6 +132,15 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
|
||
|
|
*(u32 *)loc |= offset & 0x00ffffff;
|
||
|
|
break;
|
||
|
|
|
||
|
|
+ case R_ARM_V4BX:
|
||
|
|
+ /* Preserve Rm and the condition code. Alter
|
||
|
|
+ * other bits to re-code instruction as
|
||
|
|
+ * MOV PC,Rm.
|
||
|
|
+ */
|
||
|
|
+ *(u32 *)loc &= 0xf000000f;
|
||
|
|
+ *(u32 *)loc |= 0x01a0f000;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
default:
|
||
|
|
printk(KERN_ERR "%s: unknown relocation: %u\n",
|
||
|
|
module->name, ELF32_R_TYPE(rel->r_info));
|
||
|
|
|