[PATCH v2 12/15] efi_loader: Move .dynamic out of .text in EFI

[Heinrich Schuchardt]

On 3/15/25 23:18, Sam Edwards wrote:
> EFI applications need to be relocatable. Ordinarily, this is achieved
> through a PE-format .reloc section, but since that requires toolchain
> tricks to achieve, U-Boot's EFI applications instead embed ELF-flavored
> relocation information and use it for self-relocation; thus, the
> .dynamic section needs to be preserved.
> 
> Before this patch, it was tacked on to the end of .text, but this was
> not proper: A .text section is SHT_PROGBITS, while the .dynamic section
> is SHT_DYNAMIC. Attempting to combine them like this creates a section
> type mismatch. While GNU ld doesn't seem to complain, LLVM's lld
> considers this a fatal linking error.
> 
> This patch moves .dynamic out to its own section, so that the output ELF
> has the correct types. (They're all mashed together when converting to
> binary anyway, so this patch causes no change in the final .efi output.)
> 
> Signed-off-by: Sam Edwards <CFSworks at gmail.com>
> Cc: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>

Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>

> ---
>   lib/efi_loader/elf_efi.ldsi | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/efi_loader/elf_efi.ldsi b/lib/efi_loader/elf_efi.ldsi
> index 190a88fb69e..4fa5ca43872 100644
> --- a/lib/efi_loader/elf_efi.ldsi
> +++ b/lib/efi_loader/elf_efi.ldsi
> @@ -21,10 +21,10 @@ SECTIONS
>   		*(.gnu.linkonce.t.*)
>   		*(.srodata)
>   		*(.rodata*)
> -		. = ALIGN(16);
> -		*(.dynamic);
> -		. = ALIGN(512);
>   	}
> +	. = ALIGN(16);
> +	.dynamic : { *(.dynamic) }
> +	. = ALIGN(512);
>   	.rela.dyn : { *(.rela.dyn) }
>   	.rela.plt : { *(.rela.plt) }
>   	.rela.got : { *(.rela.got) }