From: Tom Rini <trini@ti.com>
Date: Tue, 10 Sep 2013 13:51:44 +0000 (-0400)
Subject: Revert "standalone-examples: support custom GCC lib"
X-Git-Tag: v2013.10-rc3~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8386ca8bea7a6a8469c3b6a99313afb642e6cbeb;p=oweals%2Fu-boot.git

Revert "standalone-examples: support custom GCC lib"

After further testing, this patch has two problems.  First,
examples/standalone/Makefile was already inherting PLATFORM_LIBS from
the top-level Makefile so this lead to duplicating the private libgcc.
Second, currently the private libgcc has a reference to 'hang' that is
not being fulfilled.

This reverts commit 4412db46468d5965da736d06f84d13e68a6e0b51.

Signed-off-by: Tom Rini <trini@ti.com>
---

diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile
index 45b0fdc161..4afedea065 100644
--- a/examples/standalone/Makefile
+++ b/examples/standalone/Makefile
@@ -52,18 +52,7 @@ ELF	:= $(addprefix $(obj),$(ELF))
 BIN	:= $(addprefix $(obj),$(BIN))
 SREC	:= $(addprefix $(obj),$(SREC))
 
-# Add GCC lib
-ifdef USE_PRIVATE_LIBGCC
-ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
-PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/libgcc.o
-else
-PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc
-endif
-else
-PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
-endif
-PLATFORM_LIBS += $(PLATFORM_LIBGCC)
-export PLATFORM_LIBS
+gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
 
 CPPFLAGS += -I..
 
@@ -93,7 +82,7 @@ $(ELF):
 $(obj)%:	$(obj)%.o $(LIB)
 		$(LD) $(LDFLAGS) -g -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) \
 			-o $@ -e $(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \
-			$(PLATFORM_LIBS)
+			-L$(gcclibdir) -lgcc
 
 $(SREC):
 $(obj)%.srec:	$(obj)%