diff options
| author | emaste <emaste@FreeBSD.org> | 2016-01-20 18:35:43 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2016-01-20 18:35:43 +0000 |
| commit | a384961239845318a61886ecb10e35a0dcd8f8bb (patch) | |
| tree | 30dc4cc86b3d289ab594a383b084b8d6f6ef30b3 | |
| parent | 544edda669774b517c35b388c47a35cfb6f78502 (diff) | |
| download | FreeBSD-src-a384961239845318a61886ecb10e35a0dcd8f8bb.zip FreeBSD-src-a384961239845318a61886ecb10e35a0dcd8f8bb.tar.gz | |
Increase BERI boot components section alignment to 16
The .text, .bss, and .data sections claimed 16-byte alignment, but were
only aligned to 8 by the linker script.
Discovered with elfcopy(1) from elftoolchain, which performs validation
absent from the binutils strip(1). ELF tool chain ticket #512.
Reported by: brooks
Reviewed by: brooks
Sponsored by: DARPA, AFRL
| -rw-r--r-- | sys/boot/mips/beri/boot2/flashboot.ldscript | 6 | ||||
| -rw-r--r-- | sys/boot/mips/beri/boot2/jtagboot.ldscript | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/boot/mips/beri/boot2/flashboot.ldscript b/sys/boot/mips/beri/boot2/flashboot.ldscript index 0c820fa..4d61438 100644 --- a/sys/boot/mips/beri/boot2/flashboot.ldscript +++ b/sys/boot/mips/beri/boot2/flashboot.ldscript @@ -49,13 +49,13 @@ SECTIONS { . = __boot2_base_vaddr__; . += SIZEOF_HEADERS; - .text ALIGN(0x8): { + .text ALIGN(0x10): { relocate.o(.text) start.o(.text) *(EXCLUDE_FILE (relocate.o start.o) .text) } - .data ALIGN(0x8): { *(.data)} - .bss ALIGN(0x8): { *(.bss) } + .data ALIGN(0x10): { *(.data)} + .bss ALIGN(0x10): { *(.bss) } __heap = ALIGN(0x8); /* 64-bit aligned heap pointer */ __data_end = .; diff --git a/sys/boot/mips/beri/boot2/jtagboot.ldscript b/sys/boot/mips/beri/boot2/jtagboot.ldscript index 25fb61d..064c6e1 100644 --- a/sys/boot/mips/beri/boot2/jtagboot.ldscript +++ b/sys/boot/mips/beri/boot2/jtagboot.ldscript @@ -49,12 +49,12 @@ SECTIONS { . = __boot2_base_vaddr__; . += SIZEOF_HEADERS; - .text ALIGN(0x8): { + .text ALIGN(0x10): { start.o(.text) *(EXCLUDE_FILE (start.o) .text) } - .data ALIGN(0x8): { *(.data)} - .bss ALIGN(0x8): { *(.bss) } + .data ALIGN(0x10): { *(.data)} + .bss ALIGN(0x10): { *(.bss) } __heap = ALIGN(0x8); /* 64-bit aligned heap pointer */ __data_end = .; |
