diff options
| author | Tom Rini <trini@ti.com> | 2013-09-10 09:51:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-09-12 10:27:29 -0400 |
| commit | 8386ca8bea7a6a8469c3b6a99313afb642e6cbeb (patch) | |
| tree | 26a28dca3d39f6bfdcbe9c493fec8c4d77d2d9dd /examples/standalone | |
| parent | 27af930e9a5c91365ca639ada580b338eabe4989 (diff) | |
| download | olio-uboot-2014.01-8386ca8bea7a6a8469c3b6a99313afb642e6cbeb.tar.xz olio-uboot-2014.01-8386ca8bea7a6a8469c3b6a99313afb642e6cbeb.zip | |
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>
Diffstat (limited to 'examples/standalone')
| -rw-r--r-- | examples/standalone/Makefile | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile index 45b0fdc16..4afedea06 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)% |