From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Mon, 24 Feb 2014 11:44:14 +0000 (+0900)
Subject: kbuild: fix SPL link bug when USE_PRIVATE_LIBGCC is "yes"
X-Git-Tag: v2014.04-rc2~99
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6445262ca8d0400def05c4ef8e2b8e8424929599;p=u-boot

kbuild: fix SPL link bug when USE_PRIVATE_LIBGCC is "yes"

Commit 6825a95 (kbuild: use Linux Kernel build scripts)
changed the behavior of linkage when USE_PRIAVATE_LIBGCC
is defined as "yes".
(It dropped arch/arm/lib/eabi_compat.o from the
target library.)

Affected boards are all Tegra boards.

This commit gets back the same behavior as before Kbuild series.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Tom Rini <trini@ti.com>
---

diff --git a/spl/Makefile b/spl/Makefile
index bf980249eb..9d3d1822f1 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -133,7 +133,8 @@ libs-y := $(patsubst %/, %/built-in.o, $(libs-y))
 
 # Add GCC lib
 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
-PLATFORM_LIBS := $(SPLTREE)/arch/$(ARCH)/lib/lib.a
+PLATFORM_LIBGCC = $(SPLTREE)/arch/$(ARCH)/lib/lib.a
+PLATFORM_LIBS := $(filter-out %/lib.a, $(filter-out -lgcc, $(PLATFORM_LIBS))) $(PLATFORM_LIBGCC)
 endif
 
 u-boot-spl-init := $(head-y)