Skip to contentSkip to conversation

UML: UML libc linking error fix

PATCH New Matthew Ryan Maurer 1 participant 1 message Apr 27, 2010 User-mode Linux (UML)

lore
Share & tools
lore

Matthew Ryan Maurer

author
#0 lore raw

PATCH 1/1 UML: UML libc linking error fix

From: Matthew Maurer <[email protected]>

Fixes linking for UML against newer libcs by adding two hidden symbols which are now expected.

Signed-off-by Matthew Maurer <[email protected]>

---
Apologies ahead of time if I've missed something or if this has already been fixed somewhere I couldn't find it.

arch/um/kernel/dyn.lds.S +15 -2
index 7fcad58..85babf5 100644
@@ -50,8 +50,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
arch/um/kernel/uml.lds.S +15 -0
index e7a6cca..50d80e8 100644
@@ -35,6 +35,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 : {
Signed-off-by Matthew Maurer <[email protected]>