]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Makefile: apply dynamic relocations for LLD
authorNick Desaulniers <ndesaulniers@google.com>
Mon, 26 Sep 2022 20:47:40 +0000 (20:47 +0000)
committerTom Rini <trini@konsulko.com>
Mon, 10 Oct 2022 22:01:23 +0000 (18:01 -0400)
It seems that for aarch64, unless we apply dynamic relocations to the
location being relocated, we fail to boot.

As Fangrui notes:
  For dynamic relocations using the RELA format (readelf -Wr), GNU ld
  sets the initial content to r_addend; ld.lld doesn't do that by
  default (needs --apply-dynamic-relocs).

Otherwise .rodata appears to be full of NUL-bytes before relocation,
causing crashes when trying to invoke the function pointers in
init_sequence_f from initcall_run_list().

Link: https://reviews.llvm.org/D42797
Suggested-by: Fangrui Song <maskray@google.com>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Alistair Delva <adelva@google.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Makefile

index 45f10759a1371613ceda5bd33b81c691dda93cb0..3866cc62f9a088bb32b14428c2e383ae8359e09a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1023,7 +1023,7 @@ LDFLAGS_u-boot += $(LDFLAGS_FINAL)
 LDFLAGS_u-boot += $(call ld-option, --no-dynamic-linker)
 
 # ld.lld support
-LDFLAGS_u-boot += -z notext
+LDFLAGS_u-boot += -z notext $(call ld-option,--apply-dynamic-relocs)
 
 LDFLAGS_u-boot += --build-id=none