Commit 8386ca8bea7a6a8469c3b6a99313afb642e6cbeb
1 parent
27af930e9a
Exists in
master
and in
56 other branches
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>
Showing 1 changed file with 2 additions and 13 deletions Side-by-side Diff
examples/standalone/Makefile
| ... | ... | @@ -52,18 +52,7 @@ |
| 52 | 52 | BIN := $(addprefix $(obj),$(BIN)) |
| 53 | 53 | SREC := $(addprefix $(obj),$(SREC)) |
| 54 | 54 | |
| 55 | -# Add GCC lib | |
| 56 | -ifdef USE_PRIVATE_LIBGCC | |
| 57 | -ifeq ("$(USE_PRIVATE_LIBGCC)", "yes") | |
| 58 | -PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/libgcc.o | |
| 59 | -else | |
| 60 | -PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc | |
| 61 | -endif | |
| 62 | -else | |
| 63 | -PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc | |
| 64 | -endif | |
| 65 | -PLATFORM_LIBS += $(PLATFORM_LIBGCC) | |
| 66 | -export PLATFORM_LIBS | |
| 55 | +gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) | |
| 67 | 56 | |
| 68 | 57 | CPPFLAGS += -I.. |
| 69 | 58 | |
| ... | ... | @@ -93,7 +82,7 @@ |
| 93 | 82 | $(obj)%: $(obj)%.o $(LIB) |
| 94 | 83 | $(LD) $(LDFLAGS) -g -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) \ |
| 95 | 84 | -o $@ -e $(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \ |
| 96 | - $(PLATFORM_LIBS) | |
| 85 | + -L$(gcclibdir) -lgcc | |
| 97 | 86 | |
| 98 | 87 | $(SREC): |
| 99 | 88 | $(obj)%.srec: $(obj)% |