Merge remote-tracking branch 'kraxel/usb.33' into staging

[qemu.git] / i386.ld

diff --git a/i386.ld b/i386.ld
index 9f4cb5b136caabd5d409e0b2d1ea3047e7d6a02c..cc3f160af07c21ceeb0fe62bf3772ad7b314ac41 100644 (file)
--- a/i386.ld
+++ b/i386.ld
@@ -3,7 +3,6 @@
  */
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
 OUTPUT_ARCH(i386)
-SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/alpha-unknown-linux-gnu/lib);
 ENTRY(_start)
 SECTIONS
 {
@@ -40,8 +39,20 @@ SECTIONS
   .rela.fini     : { *(.rela.fini)     }
   .rel.bss       : { *(.rel.bss)               }
   .rela.bss      : { *(.rela.bss)              }
-  .rel.plt       : { *(.rel.plt)               }
-  .rela.plt      : { *(.rela.plt)              }
+  .rel.plt      :
+  {
+    *(.rel.plt)
+    PROVIDE (__rel_iplt_start = .);
+    *(.rel.iplt)
+    PROVIDE (__rel_iplt_end = .);
+  }
+  .rela.plt       :
+  {
+    *(.rela.plt)
+    PROVIDE (__rela_iplt_start = .);
+    *(.rela.iplt)
+    PROVIDE (__rela_iplt_end = .);
+  }
   .init          : { *(.init)  } =0x47ff041f
   .text      :
   {