From 470d7bea261a68129a90efaf7983a06e5c3fca53 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 19 Oct 2009 03:32:49 +0000 Subject: [PATCH] fix errors in unresolved weak symbols on arm git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18062 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../028-arm_module_unresolved_weak_sym.patch | 13 +++++++++++++ .../031-arm_module_unresolved_weak_sym.patch | 13 +++++++++++++ .../029-arm_module_unresolved_weak_sym.patch | 13 +++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 target/linux/generic-2.6/patches-2.6.28/028-arm_module_unresolved_weak_sym.patch create mode 100644 target/linux/generic-2.6/patches-2.6.30/031-arm_module_unresolved_weak_sym.patch create mode 100644 target/linux/generic-2.6/patches-2.6.31/029-arm_module_unresolved_weak_sym.patch 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 0000000000..57554b387d --- /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 0000000000..42d2dbd202 --- /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 0000000000..42d2dbd202 --- /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)) {