summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-10-19 03:32:49 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-10-19 03:32:49 +0000
commit7a646a978cf3be6f640861a667ac00d736ec6f4e (patch)
treeff56beb208d08a6748da282c6ed270bbcada73d9 /target/linux
parent5b12db1589c1eca7646b775a8ecf0d30cd3a8f63 (diff)
fix errors in unresolved weak symbols on arm
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18062 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/028-arm_module_unresolved_weak_sym.patch13
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/031-arm_module_unresolved_weak_sym.patch13
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/029-arm_module_unresolved_weak_sym.patch13
3 files changed, 39 insertions, 0 deletions
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
index 000000000..57554b387
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.28/028-arm_module_unresolved_weak_sym.patch
@@ -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
index 000000000..42d2dbd20
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.30/031-arm_module_unresolved_weak_sym.patch
@@ -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
index 000000000..42d2dbd20
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.31/029-arm_module_unresolved_weak_sym.patch
@@ -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)) {