From c7eeab25e0d2776c645482e6eab90df53fd3908d Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 9 Jan 2006 15:09:55 +0000
Subject: Merger from rtems-4-6-branch.

---
 make/custom/leon1.cfg |  1 -
 make/custom/leon2.cfg | 12 ++++--------
 make/custom/leon3.cfg | 40 ++++++++++++++++++++++++++++++++++++++++
 make/custom/sis.cfg   |  8 ++++++++
 4 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 make/custom/leon3.cfg
 create mode 100644 make/custom/sis.cfg

diff --git a/make/custom/leon1.cfg b/make/custom/leon1.cfg
index 39614e3b3f..a9822eefcb 100644
--- a/make/custom/leon1.cfg
+++ b/make/custom/leon1.cfg
@@ -9,4 +9,3 @@
 RTEMS_CPU_MODEL=leon1
 
 include $(RTEMS_ROOT)/make/custom/leon2.cfg
-
diff --git a/make/custom/leon2.cfg b/make/custom/leon2.cfg
index 28a6719d74..67507e350b 100644
--- a/make/custom/leon2.cfg
+++ b/make/custom/leon2.cfg
@@ -7,14 +7,9 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sparc
-
-ifeq ($(RTEMS_CPU_MODEL),leon1)
-MSOFT_FLOAT = -msoft-float
-else
 RTEMS_CPU_MODEL=leon2
-endif
 # This is the actual bsp directory used during the build process.
-RTEMS_BSP_FAMILY=leon
+RTEMS_BSP_FAMILY=leon2
 
 #   The -mflat avoids the use of save/restore instructions.  It has
 #   a negative impact on the performance of RTEMS and should not be used.
@@ -22,11 +17,12 @@ RTEMS_BSP_FAMILY=leon
 # This had been used with gcc-2.7.2
 # CPU_CFLAGS = -mno-v8 -mcypress $(MSOFT_FLOAT)
 #     -mcpu=cypress says to optimize for a Cypress 60x chipset
-CPU_CFLAGS = -mcpu=cypress $(MSOFT_FLOAT)
+#CPU_CFLAGS = -mcpu=cypress $(MSOFT_FLOAT)
+CPU_CFLAGS = -mcpu=cypress -msoft-float
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
-CFLAGS_OPTIMIZE_V=-O4
+CFLAGS_OPTIMIZE_V=-O2
 
 # 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
diff --git a/make/custom/leon3.cfg b/make/custom/leon3.cfg
new file mode 100644
index 0000000000..563a0e9199
--- /dev/null
+++ b/make/custom/leon3.cfg
@@ -0,0 +1,40 @@
+#
+#  Config file for the European Space Agency ERC32 SPARC processor.
+#
+#  $Id$
+#
+
+include $(RTEMS_ROOT)/make/custom/default.cfg
+
+RTEMS_CPU=sparc
+
+RTEMS_CPU_MODEL=leon3
+
+# This is the actual bsp directory used during the build process.
+RTEMS_BSP_FAMILY=leon3
+
+#   The -mflat avoids the use of save/restore instructions.  It has
+#   a negative impact on the performance of RTEMS and should not be used.
+
+# This had been used with gcc-2.7.2
+# CPU_CFLAGS = -mno-v8 -mcypress $(MSOFT_FLOAT)
+#     -mcpu=cypress says to optimize for a Cypress 60x chipset
+#CPU_CFLAGS = -mcpu=cypress $(MSOFT_FLOAT)
+CPU_CFLAGS = -mcpu=cypress -msoft-float
+
+# optimize flag: typically -0, could use -O4 or -fast
+# -O4 is ok for RTEMS
+CFLAGS_OPTIMIZE_V=-O2
+
+# 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) -o $(basename $@).exe \
+           $(LINK_OBJS) $(LINK_LIBS)
+	$(NM) -g -n $(basename $@).exe > $(basename $@).num
+	$(SIZE) $(basename $@).exe
+endef
+# Miscellaneous additions go here
+
diff --git a/make/custom/sis.cfg b/make/custom/sis.cfg
new file mode 100644
index 0000000000..1c33252e81
--- /dev/null
+++ b/make/custom/sis.cfg
@@ -0,0 +1,8 @@
+#
+#  Configuration file for the SPARC/ERC32 Simulator SIS
+#
+#  $Id$
+#
+
+include $(RTEMS_ROOT)/make/custom/erc32.cfg
+
-- 
cgit v1.2.3