[uml] add upstream patch to fix linking failures on '__rela_iplt_end'
[openwrt/svn-archive/archive.git] / target / linux / uml / patches-2.6.30 / 006-uml_libc_link_errors.patch
1 diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
2 index 7fcad58..85babf5 100644
3 --- a/arch/um/kernel/dyn.lds.S
4 +++ b/arch/um/kernel/dyn.lds.S
5 @@ -50,8 +50,21 @@ SECTIONS
6 .rela.got : { *(.rela.got) }
7 .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
8 .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
9 - .rel.plt : { *(.rel.plt) }
10 - .rela.plt : { *(.rela.plt) }
11 + /* Deal with multilib libc */
12 + .rel.plt :
13 + {
14 + *(.rel.plt)
15 + PROVIDE_HIDDEN (__rel_iplt_start = .);
16 + *(.rel.iplt)
17 + PROVIDE_HIDDEN (__rel_iplt_end = .);
18 + }
19 + .rela.plt :
20 + {
21 + *(.rela.plt)
22 + PROVIDE_HIDDEN (__rela_iplt_start = .);
23 + *(.rela.iplt)
24 + PROVIDE_HIDDEN (__rela_iplt_end = .);
25 + }
26 .init : {
27 KEEP (*(.init))
28 } =0x90909090
29 diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
30 index e7a6cca..50d80e8 100644
31 --- a/arch/um/kernel/uml.lds.S
32 +++ b/arch/um/kernel/uml.lds.S
33 @@ -35,6 +35,21 @@ SECTIONS
34 *(.gnu.warning)
35 *(.gnu.linkonce.t*)
36 }
37 + /* Deal with multilib libc */
38 + .rel.plt :
39 + {
40 + *(.rel.plt)
41 + PROVIDE_HIDDEN (__rel_iplt_start = .);
42 + *(.rel.iplt)
43 + PROVIDE_HIDDEN (__rel_iplt_end = .);
44 + }
45 + .rela.plt :
46 + {
47 + *(.rela.plt)
48 + PROVIDE_HIDDEN (__rela_iplt_start = .);
49 + *(.rela.iplt)
50 + PROVIDE_HIDDEN (__rela_iplt_end = .);
51 + }
52
53 . = ALIGN(PAGE_SIZE);
54 .syscall_stub : {