These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / roms / ipxe / src / arch / i386 / scripts / i386.lds

diff --git a/qemu/roms/ipxe/src/arch/i386/scripts/i386.lds b/qemu/roms/ipxe/src/arch/i386/scripts/i386.lds
index 98f95cb..38c89e1 100644 (file)
--- a/qemu/roms/ipxe/src/arch/i386/scripts/i386.lds
+++ b/qemu/roms/ipxe/src/arch/i386/scripts/i386.lds
@@ -26,6 +26,13 @@ SECTIONS {
 
     PROVIDE ( _max_align = 16 );
 
+    /*
+     * Allow decompressor to require a minimum amount of temporary stack
+     * space.
+     *
+     */
+    PROVIDE ( _min_decompress_stack = 0 );
+
     /*
      * The prefix
      *
@@ -34,6 +41,7 @@ SECTIONS {
     .prefix 0x0 : AT ( _prefix_lma ) {
        _prefix = .;
        *(.prefix)
+       *(SORT(.pci_devlist.*))
        *(.prefix.*)
        _mprefix = .;
     } .bss.prefix (NOLOAD) : AT ( _end_lma ) {
@@ -87,6 +95,7 @@ SECTIONS {
        *(.bss16.*)
        *(.stack16)
        *(.stack16.*)
+       . = MAX ( ., _mdata16 + _min_decompress_stack );
        _edata16 = .;
     }
     _data16_filesz     = ABSOLUTE ( _mdata16 ) - ABSOLUTE ( _data16 );