diff options
author | dim <dim@FreeBSD.org> | 2010-11-05 20:58:18 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2010-11-05 20:58:18 +0000 |
commit | 3609f4e7f9fade8563b059f272388e975d4a39cc (patch) | |
tree | 0416ecb9ee1d62f5d36382039355309d684d528d /sys | |
parent | 6c5b70c7f64ff14b8ac630e4f7bfefcbe094a3b6 (diff) | |
download | FreeBSD-src-3609f4e7f9fade8563b059f272388e975d4a39cc.zip FreeBSD-src-3609f4e7f9fade8563b059f272388e975d4a39cc.tar.gz |
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.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/boot/ia64/efi/ldscript.ia64 | 4 | ||||
-rw-r--r-- | sys/boot/ia64/ski/ldscript.ia64 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/boot/ia64/efi/ldscript.ia64 b/sys/boot/ia64/efi/ldscript.ia64 index 0f79b67..8c3a891 100644 --- a/sys/boot/ia64/efi/ldscript.ia64 +++ b/sys/boot/ia64/efi/ldscript.ia64 @@ -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 : { diff --git a/sys/boot/ia64/ski/ldscript.ia64 b/sys/boot/ia64/ski/ldscript.ia64 index e4e1dad..973b0af 100644 --- a/sys/boot/ia64/ski/ldscript.ia64 +++ b/sys/boot/ia64/ski/ldscript.ia64 @@ -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) |