pkg/45018: QEMU fails to build because of the i386 linker script

[kojiro%hello-channel.com@localhost]

>Number:         45018
>Category:       pkg
>Synopsis:       QEMU fails to build because of the i386 linker script
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jun 04 00:15:00 +0000 2011
>Originator:     Daniel Loffgren
>Release:        current
>Organization:
>Environment:
NetBSD Koharu 5.99.15 NetBSD 5.99.15 (GENERIC) #0: Sun Aug  2 05:53:27 UTC 2009 
 
builds%b7.netbsd.org@localhost:/home/builds/ab/HEAD/i386/200908020000Z-obj/home/builds/ab/HEAD/src/sys/arch/i386/compile/GENERIC
 i386

>Description:
On build, qemu will fail to build with:

ld:/usr/pkgsrc/emulators/qemu/work/qemu-0.13.0/i386.ld:45: parse error
gmake[1]: *** [qemu-sparc] Error 1
gmake: *** [subdir-sparc-bsd-user] Error 2
gmake: *** Waiting for unfinished jobs....
>How-To-Repeat:
Attempt to build the latest qemu from pkgsrc
>Fix:
This is caused by the addition of some linker script code that was added to 
x86_64 that were also added to the i386 linker scripts, but aren't used. My 
patch below fixes the build.

--- i386.ld.orig        2010-10-15 15:56:09.000000000 -0500
+++ i386.ld     2011-06-03 19:10:07.000000000 -0500
@@ -39,20 +39,8 @@
   .rela.fini     : { *(.rela.fini)     }
   .rel.bss       : { *(.rel.bss)               }
   .rela.bss      : { *(.rela.bss)              }
-  .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 = .);
-  }
+  .rel.plt       : { *(.rel.plt)       }
+  .rela.plt      : { *(.rela.plt)      }
   .init          : { *(.init)  } =0x47ff041f
   .text      :
   {