svn commit: r214850 - in projects/binutils-2.17/sys/boot/ia64: efi ski

[Dimitry Andric]

Author: dim
Date: Fri Nov  5 20:58:18 2010
New Revision: 214850
URL: http://svn.freebsd.org/changeset/base/214850

Log:
  For sys/boot/ia64/efi and sys/boot/ia64/ski, modify their linker scripts
  to move the .IA_64.unwind and .IA_64.unwind_info input sections into
  separate output sections.
  
  Otherwise ld will complain about it (".data has both ordered
  [`.IA_64.unwind'] and unordered [`.IA_64.unwind_info'] sections").
  
  This makes ia64 buildworld run to full completion.

Modified:
  projects/binutils-2.17/sys/boot/ia64/efi/ldscript.ia64
  projects/binutils-2.17/sys/boot/ia64/ski/ldscript.ia64

Modified: projects/binutils-2.17/sys/boot/ia64/efi/ldscript.ia64
==============================================================================
--- projects/binutils-2.17/sys/boot/ia64/efi/ldscript.ia64	Fri Nov  5 20:24:26 2010	(r214849)
+++ projects/binutils-2.17/sys/boot/ia64/efi/ldscript.ia64	Fri Nov  5 20:58:18 2010	(r214850)
@@ -22,8 +22,6 @@ SECTIONS
     *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
     *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
     *(.opd)
-    *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*)
-    *(.IA_64.unwind* .gnu.linkonce.ia64unw.*)
     __start_set_Xcommand_set = .;
     *(set_Xcommand_set)
     __stop_set_Xcommand_set = .;
@@ -34,6 +32,8 @@ SECTIONS
     *(.bss .bss.* .gnu.linkonce.b.*)
     *(COMMON)
   }
+  .IA_64.unwind_info   : { *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) }
+  .IA_64.unwind   : { *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) }
   . = ALIGN(4096);
   __gp = .;
   .sdata	: {

Modified: projects/binutils-2.17/sys/boot/ia64/ski/ldscript.ia64
==============================================================================
--- projects/binutils-2.17/sys/boot/ia64/ski/ldscript.ia64	Fri Nov  5 20:24:26 2010	(r214849)
+++ projects/binutils-2.17/sys/boot/ia64/ski/ldscript.ia64	Fri Nov  5 20:58:18 2010	(r214850)
@@ -18,8 +18,6 @@ SECTIONS
     *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
     *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
     *(.opd)
-    *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*)
-    *(.IA_64.unwind* .gnu.linkonce.ia64unw.*)
     __start_set_Xcommand_set = .;
     *(set_Xcommand_set)
     __stop_set_Xcommand_set = .;
@@ -30,6 +28,8 @@ SECTIONS
     *(.bss .bss.* .gnu.linkonce.b.*)
     *(COMMON)
   }
+  .IA_64.unwind_info   : { *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) }
+  .IA_64.unwind   : { *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) }
   __gp = .;
   .sdata	: {
     *(.got.plt .got)