dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-31 10:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

examples: select libgcc for non-default architecture

Browse Source 
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>
This commit is contained in:
Alexey Brodkin
2014-05-16 12:54:17 +04:00
committed by Tom Rini
parent 1dd6e3c2dd
commit e75e73dd5f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -699,6 +699,7 @@ PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(c_flags) -print-libgcc-file-name`
endif endif
PLATFORM_LIBS += $(PLATFORM_LIBGCC) PLATFORM_LIBS += $(PLATFORM_LIBGCC)
export PLATFORM_LIBS export PLATFORM_LIBS
export PLATFORM_LIBGCC
# Special flags for CPP when processing the linker script. # Special flags for CPP when processing the linker script.
# Pass the version down so we can handle backwards compatibility # Pass the version down so we can handle backwards compatibility

4
examples/standalone/Makefile
View File

@@ -38,8 +38,6 @@ targets += $(patsubst $(obj)/%,%,$(LIB)) $(COBJS) $(LIBOBJS-y)
LIBOBJS := $(addprefix $(obj)/,$(LIBOBJS-y)) LIBOBJS := $(addprefix $(obj)/,$(LIBOBJS-y))
ELF := $(addprefix $(obj)/,$(ELF)) ELF := $(addprefix $(obj)/,$(ELF))
gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
# For PowerPC there's no need to compile standalone applications as a # For PowerPC there's no need to compile standalone applications as a
# relocatable executable. The relocation data is not needed, and # relocatable executable. The relocation data is not needed, and
# also causes the entry point of the standalone application to be # also causes the entry point of the standalone application to be
@@ -63,7 +61,7 @@ $(LIB): $(LIBOBJS) FORCE
quiet_cmd_link_elf = LD $@ quiet_cmd_link_elf = LD $@
cmd_link_elf = $(LD) $(LDFLAGS) -g -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) \ 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 $(ELF): $(obj)/%: $(obj)/%.o $(LIB) FORCE
$(call if_changed,link_elf) $(call if_changed,link_elf)