3 files changed, 30 insertions, 8 deletions
diff --git a/make/ChangeLog b/make/ChangeLog
index b6b4a73e5c..d7dc004ccf 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-18	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* custom/c3xsim.cfg, custom/c4xsim.cfg: Expand files.
+
 2004-09-29	Joel Sherrill <joel@OARcorp.com>
 
 	* custom/h8sim.cfg: i960 obsoleted.
diff --git a/make/custom/c3xsim.cfg b/make/custom/c3xsim.cfg
index 51541a9df6..2967b8d5fd 100644
--- a/make/custom/c3xsim.cfg
+++ b/make/custom/c3xsim.cfg
@@ -4,9 +4,33 @@
 #  $Id$
 #
 
-RTEMS_BSP=c3xsim
+include $(RTEMS_ROOT)/make/custom/default.cfg
+
 RTEMS_CPU_MODEL=c32
 CPU_CFLAGS = -mcpu=32
 
-include $(RTEMS_ROOT)/make/custom/c4xsim.cfg
+# This is the actual bsp directory used during the build process.
+RTEMS_BSP_FAMILY=c4xsim
+
+# optimize flag: typically -0, could use -O4 or -fast
+# -O4 is ok for RTEMS
+# -O4 is broken for the moment on the C4x gcc
+#CFLAGS_OPTIMIZE_V=-O4 
+CFLAGS_OPTIMIZE_V=-O1
+
+# this target has no start file
+START_BASE=
+
+# The following are definitions of make-exe which will work using ld as
+# is currently required.  It is expected that as of gcc 2.8, the end user
+# will be able to override parts of the compilers specs and link using gcc.
+
+define make-exe
+	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
+	    $(LDLIBS) -o $@ \
+	    $(LINK_OBJS) $(LINK_LIBS)
+	$(NM) -g -n $@ > $(basename $@).num
+	$(SIZE) $@
+endef
 
+# Miscellaneous additions go here
diff --git a/make/custom/c4xsim.cfg b/make/custom/c4xsim.cfg
index da9f7711e7..eeb2fb3527 100644
--- a/make/custom/c4xsim.cfg
+++ b/make/custom/c4xsim.cfg
@@ -6,14 +6,8 @@
 
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
-ifeq ($(RTEMS_CPU_MODEL),)
-RTEMS_BSP=c4xsim
 RTEMS_CPU_MODEL=c40
 CPU_CFLAGS=-mcpu=40 #-msmall
-endif
-
-# XXX add this temporarily until c4x-rtems target defines this. 
-CPU_CFLAGS += -D__rtems__
 
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=c4xsim