diff options
| author | Alexey Brodkin <Alexey.Brodkin@synopsys.com> | 2014-05-16 12:54:17 +0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-23 16:51:26 -0400 |
| commit | e75e73dd5f280b91f5bfc0a76a0fd09b6eba1c66 (patch) | |
| tree | 07391a81f1a7bfab88c1f4e9f2a31eeb81ee9448 | |
| parent | 1dd6e3c2dd8a136d5798a3ebda33032f18177612 (diff) | |
| download | talos-obmc-uboot-e75e73dd5f280b91f5bfc0a76a0fd09b6eba1c66.tar.gz talos-obmc-uboot-e75e73dd5f280b91f5bfc0a76a0fd09b6eba1c66.zip | |
examples: select libgcc for non-default architecture
In case of multilib-enabled toolchains if default architecture differ from
the one examples are being built for linker will fail to link example object
files with libgcc of another (non-compatible) architecture.
Interesting enough for years in main Makefile we used CFLAGS/c_flags for this
but not for examples.
So fixing it now.
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denx <wd@denx.de>
Acked-by: WOlfgang Denk <wd@denx.de>
Acked-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | examples/standalone/Makefile | 4 |
2 files changed, 2 insertions, 3 deletions
@@ -699,6 +699,7 @@ PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(c_flags) -print-libgcc-file-name` endif PLATFORM_LIBS += $(PLATFORM_LIBGCC) export PLATFORM_LIBS +export PLATFORM_LIBGCC # Special flags for CPP when processing the linker script. # Pass the version down so we can handle backwards compatibility diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile index 9ab5446c68..2dacba2eba 100644 --- a/examples/standalone/Makefile +++ b/examples/standalone/Makefile @@ -38,8 +38,6 @@ targets += $(patsubst $(obj)/%,%,$(LIB)) $(COBJS) $(LIBOBJS-y) LIBOBJS := $(addprefix $(obj)/,$(LIBOBJS-y)) ELF := $(addprefix $(obj)/,$(ELF)) -gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) - # For PowerPC there's no need to compile standalone applications as a # relocatable executable. The relocation data is not needed, and # also causes the entry point of the standalone application to be @@ -63,7 +61,7 @@ $(LIB): $(LIBOBJS) FORCE quiet_cmd_link_elf = LD $@ cmd_link_elf = $(LD) $(LDFLAGS) -g -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) \ - -o $@ -e $(SYM_PREFIX)$(@F) $< $(LIB) -L$(gcclibdir) -lgcc + -o $@ -e $(SYM_PREFIX)$(@F) $< $(LIB) $(PLATFORM_LIBGCC) $(ELF): $(obj)/%: $(obj)/%.o $(LIB) FORCE $(call if_changed,link_elf) |
