Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e75e73dd5f280b91f5bfc0a76a0fd09b6eba1c66

Authored by Alexey Brodkin
Committed by Tom Rini
1 parent 1dd6e3c2dd
Exists in v2017.01-smarct4x and in 40 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 2 changed files with 2 additions and 3 deletions Side-by-side Diff

... ... @@ -699,6 +699,7 @@
699 699 endif
700 700 PLATFORM_LIBS += $(PLATFORM_LIBGCC)
701 701 export PLATFORM_LIBS
  702 +export PLATFORM_LIBGCC
702 703  
703 704 # Special flags for CPP when processing the linker script.
704 705 # Pass the version down so we can handle backwards compatibility
examples/standalone/Makefile
Diff comments   View file @ e75e73d
... ... @@ -38,8 +38,6 @@
38 38 LIBOBJS := $(addprefix $(obj)/,$(LIBOBJS-y))
39 39 ELF := $(addprefix $(obj)/,$(ELF))
40 40  
41   -gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
42   -
43 41 # For PowerPC there's no need to compile standalone applications as a
44 42 # relocatable executable. The relocation data is not needed, and
45 43 # also causes the entry point of the standalone application to be
... ... @@ -63,7 +61,7 @@
63 61  
64 62 quiet_cmd_link_elf = LD $@
65 63 cmd_link_elf = $(LD) $(LDFLAGS) -g -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) \
66   - -o $@ -e $(SYM_PREFIX)$(@F) $< $(LIB) -L$(gcclibdir) -lgcc
  64 + -o $@ -e $(SYM_PREFIX)$(@F) $< $(LIB) $(PLATFORM_LIBGCC)
67 65  
68 66 $(ELF): $(obj)/%: $(obj)/%.o $(LIB) FORCE
69 67 $(call if_changed,link_elf)