From da15e0bb2bbf930fb548d523c377e735b1d94524 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 3 May 2010 01:15:19 +0000
Subject: [PATCH] [backfire] merge r21267, r21282, r21291 & r21318

SVN-Revision: 21331
---
 package/base-files/Makefile                   |  6 ++-
 target/linux/uml/config/x86_64                |  3 +-
 .../006-uml_libc_link_errors.patch            | 50 +++++++++++++++++++
 3 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 target/linux/uml/patches-2.6.30/006-uml_libc_link_errors.patch

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c4717a78cc..260255ba91 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -434,8 +434,10 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
 		$(TOOLCHAIN_DIR)/lib/libuClibc-$(LIBC_SO_VERSION).so \
 		$(1)/lib/
 	for file in libcrypt libdl libm libnsl libresolv libutil; do \
-		$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
-		$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so $(1)/lib/; \
+		$(CP) \
+			$(TOOLCHAIN_DIR)/lib/$$$$file.so.* \
+			$(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so \
+			$(1)/lib/; \
 	done
   endef
 
diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64
index 6df42ff3ab..8ef700fe6e 100644
--- a/target/linux/uml/config/x86_64
+++ b/target/linux/uml/config/x86_64
@@ -54,8 +54,9 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_MATOM is not set
 CONFIG_MCONSOLE=y
-CONFIG_MCORE2=y
+# CONFIG_MCORE2 is not set
 # CONFIG_MINI_FO is not set
 # CONFIG_MMAPPER is not set
 CONFIG_MK8=y
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
new file mode 100644
index 0000000000..d729a05c2b
--- /dev/null
+++ b/target/linux/uml/patches-2.6.30/006-uml_libc_link_errors.patch
@@ -0,0 +1,50 @@
+--- a/arch/um/kernel/dyn.lds.S
++++ b/arch/um/kernel/dyn.lds.S
+@@ -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.*) }
+-  .rel.plt        : { *(.rel.plt) }
+-  .rela.plt       : { *(.rela.plt) }
++  /* Deal with multilib libc */
++  .rel.plt        :
++  {
++    *(.rel.plt)
++    PROVIDE_HIDDEN (__rel_iplt_start = .);
++    *(.rel.iplt)
++    PROVIDE_HIDDEN (__rel_iplt_end = .);
++  }
++  .rela.plt       :
++  {
++    *(.rela.plt)
++    PROVIDE_HIDDEN (__rela_iplt_start = .);
++    *(.rela.iplt)
++    PROVIDE_HIDDEN (__rela_iplt_end = .);
++  }
+   .init           : {
+     KEEP (*(.init))
+   } =0x90909090
+--- a/arch/um/kernel/uml.lds.S
++++ b/arch/um/kernel/uml.lds.S
+@@ -39,6 +39,21 @@ SECTIONS
+     *(.gnu.warning)
+     *(.gnu.linkonce.t*)
+   }
++  /* Deal with multilib libc */
++  .rel.plt        :
++  {
++    *(.rel.plt)
++    PROVIDE_HIDDEN (__rel_iplt_start = .);
++    *(.rel.iplt)
++    PROVIDE_HIDDEN (__rel_iplt_end = .);
++  }
++  .rela.plt       :
++  {
++    *(.rela.plt)
++    PROVIDE_HIDDEN (__rela_iplt_start = .);
++    *(.rela.iplt)
++    PROVIDE_HIDDEN (__rela_iplt_end = .);
++  }
+ 
+   . = ALIGN(PAGE_SIZE);
+   .syscall_stub : {
-- 
2.30.2