From owner-svn-src-projects@FreeBSD.ORG  Tue Dec 28 21:40:20 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5853D106566C;
	Tue, 28 Dec 2010 21:40:20 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2CB588FC17;
	Tue, 28 Dec 2010 21:40:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBSLeKpj078035;
	Tue, 28 Dec 2010 21:40:20 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBSLeKgJ078032;
	Tue, 28 Dec 2010 21:40:20 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201012282140.oBSLeKgJ078032@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 28 Dec 2010 21:40:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216779 - in projects/binutils-2.17/sys/boot/ia64: efi
	ski
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Dec 2010 21:40:20 -0000

Author: marcel
Date: Tue Dec 28 21:40:19 2010
New Revision: 216779
URL: http://svn.freebsd.org/changeset/base/216779

Log:
  Fix a misalignment trap under EFI caused by accessing the linker set.

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	Tue Dec 28 21:27:08 2010	(r216778)
+++ projects/binutils-2.17/sys/boot/ia64/efi/ldscript.ia64	Tue Dec 28 21:40:19 2010	(r216779)
@@ -16,15 +16,15 @@ SECTIONS
     *(.plt)
   } =0x00300000010070000002000001000400
   . = ALIGN(4096);
+  __start_set_Xcommand_set = .;
+  set_Xcommand_set      : { *(set_Xcommand_set) }
+  __stop_set_Xcommand_set = .;
   .data		: {
     *(.rodata .rodata.* .gnu.linkonce.r.*)
     *(.rodata1)
     *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
     *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
     *(.opd)
-    __start_set_Xcommand_set = .;
-    *(set_Xcommand_set)
-    __stop_set_Xcommand_set = .;
     *(.data .data.* .gnu.linkonce.d.*)
     *(.data1)
     *(.plabel)
@@ -32,8 +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.*) }
+  .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	Tue Dec 28 21:27:08 2010	(r216778)
+++ projects/binutils-2.17/sys/boot/ia64/ski/ldscript.ia64	Tue Dec 28 21:40:19 2010	(r216779)
@@ -12,15 +12,15 @@ SECTIONS
     *(.gnu.warning)
     *(.plt)
   } =0x00300000010070000002000001000400
+  __start_set_Xcommand_set = .;
+  set_Xcommand_set      : { *(set_Xcommand_set) }
+  __stop_set_Xcommand_set = .;
   .data		: {
     *(.rodata .rodata.* .gnu.linkonce.r.*)
     *(.rodata1)
     *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
     *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
     *(.opd)
-    __start_set_Xcommand_set = .;
-    *(set_Xcommand_set)
-    __stop_set_Xcommand_set = .;
     *(.data .data.* .gnu.linkonce.d.*)
     *(.data1)
     *(.plabel)
@@ -28,8 +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.*) }
+  .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)