summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-08-11 18:38:37 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-08-11 18:38:37 +0000
commit77c5e9120d67ed3756a0a11d50f43b39dd4d3303 (patch)
tree5683ea9a30cb1dfead1e2d1998f94dce0dca0ae9
parent2008-08-11 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-77c5e9120d67ed3756a0a11d50f43b39dd4d3303.tar.bz2
2008-08-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* custom/rbtx4925.cfg, custom/rbtx4938.cfg: Fix so all C++ example code compiles and links.
-rw-r--r--make/ChangeLog5
-rw-r--r--make/custom/rbtx4925.cfg4
-rw-r--r--make/custom/rbtx4938.cfg4
3 files changed, 9 insertions, 4 deletions
diff --git a/make/ChangeLog b/make/ChangeLog
index 6e52fba81b..10315f8a29 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-11 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * custom/rbtx4925.cfg, custom/rbtx4938.cfg: Fix so all C++ example code
+ compiles and links.
+
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
* custom/mvme5500.cfg: Fix typo.
diff --git a/make/custom/rbtx4925.cfg b/make/custom/rbtx4925.cfg
index 07194fd016..7e853a01fd 100644
--- a/make/custom/rbtx4925.cfg
+++ b/make/custom/rbtx4925.cfg
@@ -22,8 +22,8 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer
# is currently required.
define make-exe
- $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
- -o $@ -Xlinker -Map -Xlinker $(basename $@).map $(LINK_OBJS) $(LINK_LIBS)
+ $(LINK.c) $(CPU_CFLAGS) $(CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
+ -o $@ $(LINK_OBJS) $(LINK_LIBS)
$(OBJCOPY) -O srec $@ $(basename $@).srec1
$(PACKHEX) < $(basename $@).srec1 > $(basename $@).srec
$(RM) $(basename $@).srec1
diff --git a/make/custom/rbtx4938.cfg b/make/custom/rbtx4938.cfg
index 6c9f51d02a..377de2d58a 100644
--- a/make/custom/rbtx4938.cfg
+++ b/make/custom/rbtx4938.cfg
@@ -22,8 +22,8 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer
# is currently required.
define make-exe
- $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
- -o $@ -Xlinker -Map -Xlinker $(basename $@).map $(LINK_OBJS) $(LINK_LIBS)
+ $(LINK.c) $(CPU_CFLAGS) $(CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
+ -o $@ $(LINK_OBJS) $(LINK_LIBS)
$(OBJCOPY) --srec-len=30 -O srec $@ $(basename $@).srec
endef