From b783b0c6e660e71629cd814f8e9dbb8e890c5c2d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 27 Sep 2022 15:05:12 -0400 Subject: USE_PRIVATE_LIBGCC: Filter out using libgcc as an alternative When we don't have USE_PRIVATE_LIBGCC enabled, do not fall back to trying to include libgcc. Signed-off-by: Tom Rini --- Makefile | 2 -- scripts/Makefile.spl | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c80b321..08db493 100644 --- a/Makefile +++ b/Makefile @@ -888,8 +888,6 @@ u-boot-main := $(libs-y) # Add GCC lib ifeq ($(CONFIG_USE_PRIVATE_LIBGCC),y) PLATFORM_LIBGCC = arch/$(ARCH)/lib/lib.a -else -PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(c_flags) -print-libgcc-file-name`) -lgcc endif PLATFORM_LIBS += $(PLATFORM_LIBGCC) diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 0b3a51d..b653b97 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -131,7 +131,7 @@ libs-y := $(patsubst %/, %/built-in.o, $(libs-y)) # Add GCC lib ifeq ($(CONFIG_USE_PRIVATE_LIBGCC),y) PLATFORM_LIBGCC = arch/$(ARCH)/lib/lib.a -PLATFORM_LIBS := $(filter-out %/lib.a, $(filter-out -lgcc, $(PLATFORM_LIBS))) $(PLATFORM_LIBGCC) +PLATFORM_LIBS := $(filter-out %/lib.a, $(PLATFORM_LIBS)) $(PLATFORM_LIBGCC) endif u-boot-spl-init := $(head-y) -- cgit v1.1