Date: Tue, 28 Dec 2010 21:40:20 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r216779 - in projects/binutils-2.17/sys/boot/ia64: efi ski Message-ID: <201012282140.oBSLeKgJ078032@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012282140.oBSLeKgJ078032>