From 307666be28db0d89cbdcfafd2cf0e0cf5bf386db Mon Sep 17 00:00:00 2001 From: Yao Zi Date: Sun, 27 Apr 2025 14:50:11 +0000 Subject: riscv: Access gd with inline assembly when building with LTO or Clang Similar to AArch64's case, Clang may wrongly fold accesses to gd pointer which is defined with register qualifier into constants, breaking various components. This patch defines gd as a macro when building with Clang or LTO, which expands to get_gd() that accesses gp pointer in assembly, making RISC-V ports function properly and preparing for introduction of LTO in the future. Board initialization code is also adapted for non-assignable gd. Reported-by: Nathaniel Hourt Signed-off-by: Yao Zi Reviewed-by: Leo Yu-Chi Liang --- common/board_r.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'common/board_r.c') diff --git a/common/board_r.c b/common/board_r.c index b90a4d9ff69..41c8dec8d49 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -815,7 +815,9 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) if (CONFIG_IS_ENABLED(X86_64) && !IS_ENABLED(CONFIG_EFI_APP)) arch_setup_gd(new_gd); -#if !defined(CONFIG_X86) && !defined(CONFIG_ARM) && !defined(CONFIG_ARM64) +#if defined(CONFIG_RISCV) + set_gd(new_gd); +#elif !defined(CONFIG_X86) && !defined(CONFIG_ARM) && !defined(CONFIG_ARM64) gd = new_gd; #endif gd->flags &= ~GD_FLG_LOG_READY; -- cgit v1.2.3