Rearrange the link order of libraries to avoid out of bound relocations in thumb mode. I have no idea how to fix this for real.
Signed-off-by: Allen Martin amartin@nvidia.com --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile index ff04503..75d1c96 100644 --- a/Makefile +++ b/Makefile @@ -232,9 +232,6 @@ LIBS += lib/zlib/libz.o LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \ "board/$(VENDOR)/common/lib$(VENDOR).o"; fi) LIBS += $(CPUDIR)/lib$(CPU).o -ifdef SOC -LIBS += $(CPUDIR)/$(SOC)/lib$(SOC).o -endif ifeq ($(CPU),ixp) LIBS += arch/arm/cpu/ixp/npe/libnpe.o endif @@ -301,6 +298,9 @@ LIBS += common/libcommon.o LIBS += lib/libfdt/libfdt.o LIBS += api/libapi.o LIBS += post/libpost.o +ifdef SOC +LIBS += $(CPUDIR)/$(SOC)/lib$(SOC).o +endif
ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) LIBS += $(CPUDIR)/omap-common/libomap-common.o @@ -323,7 +323,7 @@ ifeq ($(SOC),tegra20) LIBS += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o endif
-LIBS := $(addprefix $(obj),$(sort $(LIBS))) +LIBS := $(addprefix $(obj),$(LIBS)) .PHONY : $(LIBS)
LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o