diff mbox series

u-boot: Ensure we use BFD as linker even if using GCC for it

Message ID 20240830004331.2856512-1-otavio@ossystems.com.br
State Accepted, archived
Commit d36ee7a87c0d89b2820eea4bfcdae342adc75019
Headers show
Series u-boot: Ensure we use BFD as linker even if using GCC for it | expand

Commit Message

Otavio Salvador Aug. 30, 2024, 12:43 a.m. UTC
If we are using 'ld-is-gold' as DISTRO_FEATURE, the U-Boot Makefile has
mechanisms to ensure that we use BFD as linker. However, this does not
work for the GCC when it is used as linking tool.

To support that, we added explicit BFD use whenever we have the
DISTRO_FEATURE feature enabled.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 meta/recipes-bsp/u-boot/u-boot.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Otavio Salvador Sept. 12, 2024, 2:39 p.m. UTC | #1
Steve,

How are you doing?

Em qui., 29 de ago. de 2024 às 21:43, Otavio Salvador <
otavio@ossystems.com.br> escreveu:

> If we are using 'ld-is-gold' as DISTRO_FEATURE, the U-Boot Makefile has
> mechanisms to ensure that we use BFD as linker. However, this does not
> work for the GCC when it is used as linking tool.
>
> To support that, we added explicit BFD use whenever we have the
> DISTRO_FEATURE feature enabled.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>

Please queue this patch as backward if possible. We are currently using a
local fix for this, but we would like to drop this when the fix lands in
the branch.
diff mbox series

Patch

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 5a7bd6703f..ed3822784e 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -9,7 +9,8 @@  inherit uboot-config uboot-extlinux-config uboot-sign deploy python3native kerne
 
 DEPENDS += "swig-native"
 
-EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${DEBUG_PREFIX_MAP}" V=1'
+EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} V=1'
+EXTRA_OEMAKE += 'CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)} ${DEBUG_PREFIX_MAP}"'
 EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
 EXTRA_OEMAKE += 'STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}'