summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--make/ChangeLog5
-rw-r--r--make/custom/erc32.cfg28
-rw-r--r--make/custom/erc32nfp.cfg41
3 files changed, 47 insertions, 27 deletions
diff --git a/make/ChangeLog b/make/ChangeLog
index 132edfd3f2..2ff00f7f16 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * custom/erc32.cfg: Remove erc32nfp support, GCC272.
+ * custom/erc32nfp.cfg: Merge in portions from erc32.cfg.
+
2001-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* custom/armulator.cfg: Remove make-target-options.
diff --git a/make/custom/erc32.cfg b/make/custom/erc32.cfg
index a0e6735861..203036dd74 100644
--- a/make/custom/erc32.cfg
+++ b/make/custom/erc32.cfg
@@ -8,26 +8,12 @@
include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU=sparc
-
-ifeq ($(RTEMS_CPU_MODEL),erc32nfp)
-MSOFT_FLOAT = -msoft-float
-else
RTEMS_CPU_MODEL=erc32
-endif
+
# This is the actual bsp directory used during the build process.
RTEMS_BSP_FAMILY=erc32
-# The -mflat avoids the use of save/restore instructions. It has
-# a negative impact on the performance of RTEMS and should not be used.
-
-ifeq ($(RTEMS_USE_GCC272),yes)
-# -mno-v8 says not to use v8 level instructions. i.e. use v7 only
-# FIXME: This known not to work with gcc's >= gcc-2.95
-CPU_CFLAGS = -mno-v8 -mcypress $(MSOFT_FLOAT)
-else
-# -mcpu=cypress says to optimize for a Cypress 60x chipset
-CPU_CFLAGS = -mcpu=cypress $(MSOFT_FLOAT)
-endif
+CPU_CFLAGS = -mcpu=cypress
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
@@ -56,20 +42,10 @@ endef
# 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.
-ifeq ($(RTEMS_USE_GCC272),yes)
-define make-exe
- $(LD) -u _sbrk $(LDFLAGS) -N -T $(LINKCMDS) -o $(basename $@).exe \
- $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
- $(NM) -g -n $(basename $@).exe > $(basename $@).num
- $(SIZE) $(basename $@).exe
-endef
-else
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
-endif
# Miscellaneous additions go here
-
diff --git a/make/custom/erc32nfp.cfg b/make/custom/erc32nfp.cfg
index 762f301b91..b6381e40e5 100644
--- a/make/custom/erc32nfp.cfg
+++ b/make/custom/erc32nfp.cfg
@@ -9,5 +9,44 @@
RTEMS_CPU_MODEL=erc32nfp
-include $(RTEMS_ROOT)/make/custom/erc32.cfg
+include $(RTEMS_ROOT)/make/custom/default.cfg
+# This is the actual bsp directory used during the build process.
+RTEMS_BSP_FAMILY=erc32
+
+CPU_CFLAGS = -mcpu=cypress -msoft-float
+
+# optimize flag: typically -0, could use -O4 or -fast
+# -O4 is ok for RTEMS
+CFLAGS_OPTIMIZE_V=-O4
+
+# This makes the target dependent options file
+
+# NO_TABLE_MOVE (SPARC PORT)
+# do not have a second trap table -- use the BSP's
+#
+# FPU_REVB (erc32_bsp)
+# If defined, enables work-around for bug 3.14 in FPU rev.B or rev.C
+#
+# CPU_U32_FIX (all) libchip/network/sonic.*
+# Needed to align received TCP/IP packets since SPARC does not
+# support unaligned memory access.
+#
+
+define make-target-options
+ @echo "#define NO_TABLE_MOVE 1" >>$@
+ @echo "/* #define FPU_REVB 1 */" >>$@
+ @echo "#define CPU_U32_FIX 1" >>$@
+endef
+
+# 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