fix errors in unresolved weak symbols on arm
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 19 Oct 2009 03:32:49 +0000 (03:32 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 19 Oct 2009 03:32:49 +0000 (03:32 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18062 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/generic-2.6/patches-2.6.28/028-arm_module_unresolved_weak_sym.patch [new file with mode: 0644]
target/linux/generic-2.6/patches-2.6.30/031-arm_module_unresolved_weak_sym.patch [new file with mode: 0644]
target/linux/generic-2.6/patches-2.6.31/029-arm_module_unresolved_weak_sym.patch [new file with mode: 0644]

diff --git a/target/linux/generic-2.6/patches-2.6.28/028-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.28/028-arm_module_unresolved_weak_sym.patch
new file mode 100644 (file)
index 0000000..57554b3
--- /dev/null
@@ -0,0 +1,13 @@
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -101,6 +101,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+                       return -ENOEXEC;
+               }
++              if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
++                  ELF_ST_BIND(sym->st_info) == STB_WEAK)
++                      continue;
++
+               loc = dstsec->sh_addr + rel->r_offset;
+               switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic-2.6/patches-2.6.30/031-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.30/031-arm_module_unresolved_weak_sym.patch
new file mode 100644 (file)
index 0000000..42d2dbd
--- /dev/null
@@ -0,0 +1,13 @@
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -120,6 +120,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+                       return -ENOEXEC;
+               }
++              if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
++                  ELF_ST_BIND(sym->st_info) == STB_WEAK)
++                      continue;
++
+               loc = dstsec->sh_addr + rel->r_offset;
+               switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic-2.6/patches-2.6.31/029-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.31/029-arm_module_unresolved_weak_sym.patch
new file mode 100644 (file)
index 0000000..42d2dbd
--- /dev/null
@@ -0,0 +1,13 @@
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -120,6 +120,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+                       return -ENOEXEC;
+               }
++              if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
++                  ELF_ST_BIND(sym->st_info) == STB_WEAK)
++                      continue;
++
+               loc = dstsec->sh_addr + rel->r_offset;
+               switch (ELF32_R_TYPE(rel->r_info)) {