Fix to support multilib toolchains (David Müller <d.mueller@elsoft.ch>)

diff --git a/CHANGELOG b/CHANGELOG
index 91c421f4e9dfd30a2763903670bed40e104c8782..ab5a9ee5792b48b38fdd7f006e8f8329772775a7 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Recent changes
 ======================================================================
 
+* Fix to support multilib toolchains (David Müller <d.mueller@elsoft.ch>)
+
 * Added support for ARM9 CPUs (Gary Jennejohn <gj@denx.de>)
 
 ======================================================================

diff --git a/Makefile b/Makefile
index 174080300cc73f340237171c7e21659449e45efa..b6bc5e985b47e1c1e732d088eb20f62aa95b7409 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,10 @@ HOSTARCH := $(shell uname -m | \
            -e s/arm.*/arm/ \
            -e s/sa110/arm/)
 
+CPU = 
+BOARD =
+VENDOR =
+
 ifndef CROSS_COMPILE
 ifeq ($(HOSTARCH),arm)
 CROSS_COMPILE =

diff --git a/config.mk b/config.mk
index ebd6e0289f91aaf795abcbe25dac720d581c44af..2e87823015e951bae5de608e79dc8db707393b02 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -80,8 +80,8 @@ CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS)                       \
 CFLAGS   := $(CPPFLAGS) -Wall -Wstrict-prototypes
 AFLAGS   := -D__ASSEMBLY__ $(CPPFLAGS)
 
-LIBGCC   := $(shell $(CC) -print-libgcc-file-name)
-LDFLAGS  += -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE)
+LIBGCC   := $(shell $(CC) -msoft-float -print-libgcc-file-name)
+LDFLAGS  += -nostdlib -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE)
 
 # Location of a usable BFD library, where we define "usable" as
 # "built for ${HOST}, supports ${TARGET}".  Sensible values are