aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-05-02 02:40:21 +0000
committerNicolas Thill <nico@openwrt.org>2010-05-02 02:40:21 +0000
commit2e66d9c01317dc57705f759cc5a83d205da0b146 (patch)
treeda7959a21f057e31fd1e8483f54463ea8aa2e580
parent734e6e5fd394cf923081b63a632753c97a3f3a5f (diff)
downloadupstream-2e66d9c01317dc57705f759cc5a83d205da0b146.tar.gz
upstream-2e66d9c01317dc57705f759cc5a83d205da0b146.tar.bz2
upstream-2e66d9c01317dc57705f759cc5a83d205da0b146.zip
target/uml: refresh 2.6.30 patches
SVN-Revision: 21291
-rw-r--r--target/linux/uml/patches-2.6.30/006-uml_libc_link_errors.patch10
1 files changed, 3 insertions, 7 deletions
diff --git a/target/linux/uml/patches-2.6.30/006-uml_libc_link_errors.patch b/target/linux/uml/patches-2.6.30/006-uml_libc_link_errors.patch
index 340a5f2668..d729a05c2b 100644
--- a/target/linux/uml/patches-2.6.30/006-uml_libc_link_errors.patch
+++ b/target/linux/uml/patches-2.6.30/006-uml_libc_link_errors.patch
@@ -1,8 +1,6 @@
-diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
-index 7fcad58..85babf5 100644
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
-@@ -50,8 +50,21 @@ SECTIONS
+@@ -54,8 +54,21 @@ SECTIONS
.rela.got : { *(.rela.got) }
.rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
.rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
@@ -26,11 +24,9 @@ index 7fcad58..85babf5 100644
.init : {
KEEP (*(.init))
} =0x90909090
-diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
-index e7a6cca..50d80e8 100644
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
-@@ -35,6 +35,21 @@ SECTIONS
+@@ -39,6 +39,21 @@ SECTIONS
*(.gnu.warning)
*(.gnu.linkonce.t*)
}
@@ -49,6 +45,6 @@ index e7a6cca..50d80e8 100644
+ *(.rela.iplt)
+ PROVIDE_HIDDEN (__rela_iplt_end = .);
+ }
-
+
. = ALIGN(PAGE_SIZE);
.syscall_stub : {