From d3320bb7cfea8028194eb4dc383b81018cebc589 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 15 Sep 2008 17:43:44 +0000 Subject: 2008-09-15 Joel Sherrill * leaf.cfg: LINK.c and LINK.cc include LDFLAGS so do not include it in make-exe and make-cxx-exe definitions. This was resulting in the linker script being processed twice and breaking some BSPs. --- c/src/make/ChangeLog | 6 ++++++ c/src/make/leaf.cfg | 4 ++-- make/ChangeLog | 6 ++++++ make/leaf.cfg | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog index 5d6d380cf2..a2b3810d9a 100644 --- a/c/src/make/ChangeLog +++ b/c/src/make/ChangeLog @@ -1,3 +1,9 @@ +2008-09-15 Joel Sherrill + + * leaf.cfg: LINK.c and LINK.cc include LDFLAGS so do not include it in + make-exe and make-cxx-exe definitions. This was resulting in the + linker script being processed twice and breaking some BSPs. + 2008-09-09 Joel Sherrill * leaf.cfg, compilers/gcc-target-default.cfg: Remove use of AM_LDFLAGS. diff --git a/c/src/make/leaf.cfg b/c/src/make/leaf.cfg index 2e9b102323..1e5f0cbbd5 100644 --- a/c/src/make/leaf.cfg +++ b/c/src/make/leaf.cfg @@ -66,12 +66,12 @@ endif DOWNEXT=.ralf define bsp-link-c - $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) endef define bsp-link-cxx - $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) endef diff --git a/make/ChangeLog b/make/ChangeLog index 1a55c9c6d0..c4cd4b253a 100644 --- a/make/ChangeLog +++ b/make/ChangeLog @@ -1,3 +1,9 @@ +2008-09-15 Joel Sherrill + + * leaf.cfg: LINK.c and LINK.cc include LDFLAGS so do not include it in + make-exe and make-cxx-exe definitions. This was resulting in the + linker script being processed twice and breaking some BSPs. + 2008-09-10 Ralf Corsépius * custom/nios2_iss.cfg: Remove. diff --git a/make/leaf.cfg b/make/leaf.cfg index 4515951bc8..218dcdc4cc 100644 --- a/make/leaf.cfg +++ b/make/leaf.cfg @@ -117,12 +117,12 @@ endif DOWNEXT=.ralf define bsp-link-c - $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) endef define bsp-link-cxx - $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) endef -- cgit v1.2.3