Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-21 19:29:18 +00:00
Code Issues Projects Releases Wiki Activity

x86: Fix section alignment for EFI binaries

Browse Source 
This patch fixes the section alignment specification in the linker script for
the Intel Quark X1000 SoC so that the UEFI GenFw program generates correct EFI
binaries.  See the added comment in quarkX1000.ld for details.
This commit is contained in:
Michael LeMay 2016-09-08 11:49:44 -07:00
parent fa6771f058
commit 24f23588dd
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cpu/x86/quarkX1000.ld
View File

@ -52,14 +52,26 @@ SECTIONS {
*/ */
. = 1M + 0x220; . = 1M + 0x220;
.text ALIGN (32) : .text : ALIGN (32)
{ {
KEEP(*(.multiboot)) KEEP(*(.multiboot))
*(.boot_text) *(.boot_text)
*(.text*) *(.text*)
} }
.rodata ALIGN (32) : /*
The alignment directive must be placed after the colon so that the desired
alignment is indicated in the ELF section metadata. This metadata is used
by the UEFI GenFw program. It is necessary to avoid specifying a smaller
alignment value in the ELF metadata for some section "B" that follows some
section "A" with an ending address that is not aligned on a 32-byte boundary.
In that case, GenFw may place section "B" at a lower starting address in the
EFI binary than section "B" had in the input ELF file. This may result in
incorrect program behavior. Note that this situation is not directly visible
in the EFI binary metadata, since GenFw combines the ELF .rodata, .data, and
.bss sections into a single .data section in the EFI binary.
*/
.rodata : ALIGN (32)
{ {
*(.rodata*) *(.rodata*)
@ -72,12 +84,12 @@ SECTIONS {
_edata_shared_isr = .; _edata_shared_isr = .;
} }
.data ALIGN (32) : .data : ALIGN (32)
{ {
*(.data*) *(.data*)
} }
.bss ALIGN (32) : .bss : ALIGN (32)
{ {
*(COMMON) *(COMMON)
*(.main_stack) *(.main_stack)