Update to 0.12.5, announce message is here:

	http://lists.gnu.org/archive/html/qemu-devel/2010-07/msg01402.html

3 files changed, 71 insertions, 31 deletions

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 7d31169e3a88..45ffebc36a9c 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.12.4
+PORTVERSION=	0.12.5
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}:release \
 		${MASTER_SITE_LOCAL}:snapshot \
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 269b23bddad8..3c48aeb55e82 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (qemu/qemu-0.12.4.tar.gz) = 93e6b134dff89b2799f57b7d9e0e0fc5
-SHA256 (qemu/qemu-0.12.4.tar.gz) = 1a29a5b5151162d1de035c4926d1a1dbffee4a145ef61ee865d6b82aaea0602e
-SIZE (qemu/qemu-0.12.4.tar.gz) = 4697077
+MD5 (qemu/qemu-0.12.5.tar.gz) = 1d02ee0a04dfae2894340273372c1de4
+SHA256 (qemu/qemu-0.12.5.tar.gz) = a6a7b30b53591e160b5c7fd9319985673174e9ea47b182dbe63bc99357741f58
+SIZE (qemu/qemu-0.12.5.tar.gz) = 4291741
diff --git a/emulators/qemu-devel/files/patch-bsd-user-ld b/emulators/qemu-devel/files/patch-bsd-user-ld
index 0528d68f8806..bf092894daf3 100644
--- a/emulators/qemu-devel/files/patch-bsd-user-ld
+++ b/emulators/qemu-devel/files/patch-bsd-user-ld
@@ -1,6 +1,27 @@
 --- a/x86_64.ld
 +++ b/x86_64.ld
-@@ -59,8 +59,6 @@
+@@ -38,16 +38,16 @@ SECTIONS
+   .rel.plt      :
+   {
+     *(.rel.plt)
+-    PROVIDE_HIDDEN (__rel_iplt_start = .);
++    PROVIDE (__rel_iplt_start = .);
+     *(.rel.iplt)
+-    PROVIDE_HIDDEN (__rel_iplt_end = .);
++    PROVIDE (__rel_iplt_end = .);
+   }
+   .rela.plt       :
+   {
+     *(.rela.plt)
+-    PROVIDE_HIDDEN (__rela_iplt_start = .);
++    PROVIDE (__rela_iplt_start = .);
+     *(.rela.iplt)
+-    PROVIDE_HIDDEN (__rela_iplt_end = .);
++    PROVIDE (__rela_iplt_end = .);
+   }
+   .init           :
+   {
+@@ -70,8 +70,6 @@ SECTIONS
    .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
    .rodata1        : { *(.rodata1) }
    .eh_frame_hdr : { *(.eh_frame_hdr) }
@@ -9,7 +30,7 @@
    /* Adjust the address for the data segment.  We want to adjust up to
       the same address within the page on the next page up.  */
    . = ALIGN (0x100000) - ((0x100000 - .) & (0x100000 - 1)); . = DATA_SEGMENT_ALIGN (0x100000, 0x1000);
-@@ -86,8 +84,8 @@
+@@ -97,8 +95,8 @@ SECTIONS
    .data1          : { *(.data1) }
    .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
    .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
@@ -22,7 +43,7 @@
    {
 --- a/i386.ld
 +++ b/i386.ld
-@@ -1,57 +1,76 @@
+@@ -1,69 +1,88 @@
 -/* ld script to make i386 Linux kernel
 - * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>;
 - */
@@ -66,10 +87,7 @@
 -  .rela.fini     : { *(.rela.fini)	}
 -  .rel.bss       : { *(.rel.bss)		}
 -  .rela.bss      : { *(.rela.bss)		}
--  .rel.plt       : { *(.rel.plt)		}
--  .rela.plt      : { *(.rela.plt)		}
--  .init          : { *(.init)	} =0x47ff041f
--  .text      :
+-  .rel.plt      :
 +  PROVIDE (__executable_start = 0x60000000); . = 0x60000000 + SIZEOF_HEADERS;
 +  .interp         : { *(.interp) }
 +  .hash           : { *(.hash) }
@@ -106,8 +124,26 @@
 +      *(.rela.got)
 +      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
 +    }
-+  .rel.plt        : { *(.rel.plt) }
-+  .rela.plt       : { *(.rela.plt) }
++  .rel.plt        :
+   {
+     *(.rel.plt)
+-    PROVIDE_HIDDEN (__rel_iplt_start = .);
++    PROVIDE (__rel_iplt_start = .);
+     *(.rel.iplt)
+-    PROVIDE_HIDDEN (__rel_iplt_end = .);
++    PROVIDE (__rel_iplt_end = .);
+   }
+   .rela.plt       :
+   {
+     *(.rela.plt)
+-    PROVIDE_HIDDEN (__rela_iplt_start = .);
++    PROVIDE (__rela_iplt_start = .);
+     *(.rela.iplt)
+-    PROVIDE_HIDDEN (__rela_iplt_end = .);
++    PROVIDE (__rela_iplt_end = .);
+   }
+-  .init          : { *(.init)	} =0x47ff041f
+-  .text      :
 +  .init           :
    {
 -    *(.text)
@@ -144,7 +180,7 @@
    . = ALIGN(32 / 8);
    PROVIDE (__preinit_array_start = .);
    .preinit_array     : { *(.preinit_array) }
-@@ -62,56 +81,71 @@
+@@ -74,56 +93,71 @@ SECTIONS
    PROVIDE (__fini_array_start = .);
    .fini_array     : { *(.fini_array) }
    PROVIDE (__fini_array_end = .);
@@ -167,6 +203,21 @@
    }
 -  .data1   : { *(.data1) }
 -  .ctors         :
+-  {
+-    *(.ctors)
+-  }
+-  .dtors         :
+-  {
+-    *(.dtors)
+-  }
+-  .plt      : { *(.plt)	}
+-  .got           : { *(.got.plt) *(.got) }
+-  .dynamic       : { *(.dynamic) }
+-  /* We want the small data sections together, so single-instruction offsets
+-     can access them all, and initialized data all before uninitialized, so
+-     we can shorten the on-disk segment size.  */
+-  .sdata     : { *(.sdata) }
+-  _edata  =  .;
 +  .data1          : { *(.data1) }
 +  .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
 +  .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
@@ -174,8 +225,7 @@
 +  .gcc_except_table   : { *(.gcc_except_table) }
 +  .dynamic        : { *(.dynamic) }
 +  .ctors          :
-   {
--    *(.ctors)
++  {
 +    /* gcc uses crtbegin.o to find the start of
 +       the constructors, so we make sure it is
 +       first.  Because this is a wildcard, it
@@ -193,24 +243,14 @@
 +    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
 +    KEEP (*(SORT(.ctors.*)))
 +    KEEP (*(.ctors))
-   }
--  .dtors         :
++  }
 +  .dtors          :
-   {
--    *(.dtors)
++  {
 +    KEEP (*crtbegin*.o(.dtors))
 +    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
 +    KEEP (*(SORT(.dtors.*)))
 +    KEEP (*(.dtors))
-   }
--  .plt      : { *(.plt)	}
--  .got           : { *(.got.plt) *(.got) }
--  .dynamic       : { *(.dynamic) }
--  /* We want the small data sections together, so single-instruction offsets
--     can access them all, and initialized data all before uninitialized, so
--     we can shorten the on-disk segment size.  */
--  .sdata     : { *(.sdata) }
--  _edata  =  .;
++  }
 +  .jcr            : { KEEP (*(.jcr)) }
 +  .got            : { *(.got.plt) *(.got) }
 +  _edata = .;
@@ -251,7 +291,7 @@
    /* DWARF debug sections.
       Symbols in the DWARF debugging sections are relative to the beginning
       of the section so we begin them at 0.  */
-@@ -125,7 +159,7 @@
+@@ -137,7 +171,7 @@ SECTIONS
    .debug_aranges  0 : { *(.debug_aranges) }
    .debug_pubnames 0 : { *(.debug_pubnames) }
    /* DWARF 2 */
@@ -260,7 +300,7 @@
    .debug_abbrev   0 : { *(.debug_abbrev) }
    .debug_line     0 : { *(.debug_line) }
    .debug_frame    0 : { *(.debug_frame) }
-@@ -137,5 +171,5 @@
+@@ -149,5 +183,5 @@ SECTIONS
    .debug_funcnames 0 : { *(.debug_funcnames) }
    .debug_typenames 0 : { *(.debug_typenames) }
    .debug_varnames  0 : { *(.debug_varnames) }