mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 03:32:25 +02:00
add the R_ARM_V4BX relocation to the ARM kernel module loader
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15208 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
83b4c4420d
commit
dedbbd4ca2
@ -0,0 +1,33 @@
|
||||
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));
|
||||
|
Loading…
Reference in New Issue
Block a user