Patchwork [U-Boot,v11,15/16] spl: fix SPL build of private libgcc

login
register
mail settings
Submitter Allen Martin
Date Aug. 31, 2012, 6:30 p.m.
Message ID <1346437815-3186-16-git-send-email-amartin@nvidia.com>
Download mbox | patch
Permalink /patch/181034/
State Accepted
Delegated to: Marek Vasut
Headers show

Comments

Allen Martin - Aug. 31, 2012, 6:30 p.m.
This fixes the SPL build to link with the SPL version of libgcc if
USE_PRIVATE_LIBGCC is set to "yes".  Previously it was linking with
the libgcc from the normal u-boot build because it gets set in
PLATFORM_LIBS and passed down the to the SPL build.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Tested-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
---
 spl/Makefile |    6 ++++++
 1 file changed, 6 insertions(+)

Patch

diff --git a/spl/Makefile b/spl/Makefile
index 8946d82..476a5e6 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -65,6 +65,12 @@  ifeq ($(SOC),tegra20)
 LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o
 endif
 
+# Add GCC lib
+ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
+PLATFORM_LIBGCC = $(SPLTREE)/arch/$(ARCH)/lib/libgcc.o
+PLATFORM_LIBS := $(filter-out %/libgcc.o, $(filter-out -lgcc, $(PLATFORM_LIBS))) $(PLATFORM_LIBGCC)
+endif
+
 START := $(addprefix $(SPLTREE)/,$(START))
 LIBS := $(addprefix $(SPLTREE)/,$(sort $(LIBS-y)))