summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-15 17:43:22 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-15 17:43:22 +0000
commit20e1bdfc0cabb85462b701ae5c91c27e31f91e7c (patch)
treec1424b26e05b249a9ce57b35570cc33ba02295c7
parentUse "double" instead of "rtems_double". (diff)
downloadrtems-20e1bdfc0cabb85462b701ae5c91c27e31f91e7c.tar.bz2
2008-09-15 Joel Sherrill <joel.sherrill@oarcorp.com>
* 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.
Diffstat (limited to '')
-rw-r--r--c/src/make/ChangeLog6
-rw-r--r--c/src/make/leaf.cfg4
-rw-r--r--make/ChangeLog6
-rw-r--r--make/leaf.cfg4
4 files changed, 16 insertions, 4 deletions
diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog
index 5d6d380cf2..1b88cd8f0f 100644
--- a/c/src/make/ChangeLog
+++ b/c/src/make/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-15 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * 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 <joel.sherrill@OARcorp.com>
* 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 9d656b6e97..a08c68ba78 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-15 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * 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 <joel.sherrill@OARcorp.com>
* leaf.cfg, compilers/gcc-target-default.cfg, custom/bf537Stamp.cfg,
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