diff options
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/efi/ldscript.amd64 | 2 | ||||
| -rw-r--r-- | sys/boot/ia64/efi/ldscript.ia64 | 12 | ||||
| -rw-r--r-- | sys/boot/ia64/ski/ldscript.ia64 | 12 | ||||
| -rw-r--r-- | sys/boot/powerpc/boot1.chrp/boot1.c | 1 | ||||
| -rw-r--r-- | sys/boot/powerpc/ofw/start.c | 1 |
5 files changed, 15 insertions, 13 deletions
diff --git a/sys/boot/i386/efi/ldscript.amd64 b/sys/boot/i386/efi/ldscript.amd64 index 9c5a29b..f99e730 100644 --- a/sys/boot/i386/efi/ldscript.amd64 +++ b/sys/boot/i386/efi/ldscript.amd64 @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") +OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd") OUTPUT_ARCH(i386:x86-64) ENTRY(_start) SECTIONS diff --git a/sys/boot/ia64/efi/ldscript.ia64 b/sys/boot/ia64/efi/ldscript.ia64 index 0f79b67..0d7901f 100644 --- a/sys/boot/ia64/efi/ldscript.ia64 +++ b/sys/boot/ia64/efi/ldscript.ia64 @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") +OUTPUT_FORMAT("elf64-ia64-freebsd", "elf64-ia64-freebsd", "elf64-ia64-freebsd") OUTPUT_ARCH(ia64) ENTRY(_start_plabel) SECTIONS @@ -16,17 +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) - *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) - *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) - __start_set_Xcommand_set = .; - *(set_Xcommand_set) - __stop_set_Xcommand_set = .; *(.data .data.* .gnu.linkonce.d.*) *(.data1) *(.plabel) @@ -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..e7a303f 100644 --- a/sys/boot/ia64/ski/ldscript.ia64 +++ b/sys/boot/ia64/ski/ldscript.ia64 @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") +OUTPUT_FORMAT("elf64-ia64-freebsd", "elf64-ia64-freebsd", "elf64-ia64-freebsd") OUTPUT_ARCH(ia64) ENTRY(_start) SECTIONS @@ -12,17 +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) - *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) - *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) - __start_set_Xcommand_set = .; - *(set_Xcommand_set) - __stop_set_Xcommand_set = .; *(.data .data.* .gnu.linkonce.d.*) *(.data1) *(.plabel) @@ -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) diff --git a/sys/boot/powerpc/boot1.chrp/boot1.c b/sys/boot/powerpc/boot1.chrp/boot1.c index 6a6ad07..f5bc4d5 100644 --- a/sys/boot/powerpc/boot1.chrp/boot1.c +++ b/sys/boot/powerpc/boot1.chrp/boot1.c @@ -103,6 +103,7 @@ ofwh_t stdinh, stdouth; __asm(" \n\ .data \n\ + .align 4 \n\ stack: \n\ .space 16384 \n\ \n\ diff --git a/sys/boot/powerpc/ofw/start.c b/sys/boot/powerpc/ofw/start.c index 1988b3c..911a2ec 100644 --- a/sys/boot/powerpc/ofw/start.c +++ b/sys/boot/powerpc/ofw/start.c @@ -40,6 +40,7 @@ void startup(void *, int, int (*)(void *), char *, int); __asm(" \n\ .data \n\ + .align 4 \n\ stack: \n\ .space 16388 \n\ \n\ |
