From c51004a089461e6f10106a7edf03a82b537b7795 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Thu, 18 Jan 2007 08:28:54 +0000
Subject: Misc cleanups.

---
 make/custom/Linux-posix.cfg   |  2 ++
 make/custom/Solaris-posix.cfg |  2 ++
 make/custom/bare.cfg          |  2 ++
 make/custom/c3xsim.cfg        |  3 +++
 make/custom/c4xsim.cfg        |  3 +++
 make/custom/csb360.cfg        |  9 +++------
 make/custom/erc32.cfg         |  2 ++
 make/custom/erc32nfp.cfg      |  2 ++
 make/custom/gen68340.cfg      | 16 ++--------------
 make/custom/gen68360.cfg      |  5 ++---
 make/custom/leon2.cfg         |  7 ++-----
 make/custom/leon3.cfg         |  6 ++----
 make/custom/mcf5206elite.cfg  |  5 ++---
 make/custom/mvme147.cfg       |  3 ++-
 make/custom/nios2_iss.cfg     |  5 ++---
 make/custom/no_bsp.cfg        |  8 --------
 make/custom/pc386dx.cfg       |  3 +++
 make/custom/pc486.cfg         |  8 +++-----
 make/custom/pc586.cfg         |  8 +++-----
 make/custom/pc686.cfg         |  8 +++-----
 make/custom/pck6.cfg          |  6 +++---
 make/custom/sim68000.cfg      |  3 +++
 make/custom/simcpu32.cfg      |  3 +++
 23 files changed, 54 insertions(+), 65 deletions(-)

(limited to 'make')

diff --git a/make/custom/Linux-posix.cfg b/make/custom/Linux-posix.cfg
index 5c9279ecc7..91e21283df 100644
--- a/make/custom/Linux-posix.cfg
+++ b/make/custom/Linux-posix.cfg
@@ -14,6 +14,8 @@ RTEMS_BSP_FAMILY=posix
 
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
+# This contains the compiler options necessary to select the CPU model
+# and (hopefully) optimize for it.
 CPU_CFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE
 
 # optimize flag: typically -O2
diff --git a/make/custom/Solaris-posix.cfg b/make/custom/Solaris-posix.cfg
index 9ebe4cddb4..96d5d5e6ab 100644
--- a/make/custom/Solaris-posix.cfg
+++ b/make/custom/Solaris-posix.cfg
@@ -14,6 +14,8 @@ RTEMS_BSP_FAMILY=posix
 
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS += -Dsolaris2 -D__EXTENSIONS__
 
 # optimize flag: typically -O2
diff --git a/make/custom/bare.cfg b/make/custom/bare.cfg
index f359005d5d..da33ae34a1 100644
--- a/make/custom/bare.cfg
+++ b/make/custom/bare.cfg
@@ -11,6 +11,8 @@ RTEMS_BSP=bare
 
 RTEMS_CPU_MODEL=$(BARE_CPU_MODEL)
 
+# This contains the compiler options necessary to select the CPU model
+# and (hopefully) optimize for it.
 CPU_CFLAGS =$(BARE_CPU_CFLAGS)
 
 include $(RTEMS_ROOT)/make/custom/default.cfg
diff --git a/make/custom/c3xsim.cfg b/make/custom/c3xsim.cfg
index 1fa5cfe722..22c41daf43 100644
--- a/make/custom/c3xsim.cfg
+++ b/make/custom/c3xsim.cfg
@@ -7,6 +7,9 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU_MODEL=c32
+
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -mcpu=32
 
 # This is the actual bsp directory used during the build process.
diff --git a/make/custom/c4xsim.cfg b/make/custom/c4xsim.cfg
index 51f656d277..0a91abea1c 100644
--- a/make/custom/c4xsim.cfg
+++ b/make/custom/c4xsim.cfg
@@ -7,6 +7,9 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU_MODEL=c40
+
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -mcpu=40 #-msmall
 
 # This is the actual bsp directory used during the build process.
diff --git a/make/custom/csb360.cfg b/make/custom/csb360.cfg
index 9cb9bd7c5f..e3c118dcab 100644
--- a/make/custom/csb360.cfg
+++ b/make/custom/csb360.cfg
@@ -14,15 +14,12 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=csb360
 
-#
-# You must use versions of gcc and gas that support the -m5200 option.
-#
+# This contains the compiler options necessary to select the CPU model
+# and (hopefully) optimize for it.
 CPU_CFLAGS = -m5200
 
 # optimize flag: typically -O2
-# It looks like any optimization level > 0 causes problems 
-# with gcc-3.4.0. Until they are fixed, we'll use -O0
-CFLAGS_OPTIMIZE_V = -O0 -fomit-frame-pointer
+CFLAGS_OPTIMIZE_V = -O2 -fomit-frame-pointer
 
 # The following are definitions of make-exe which will work using ld as
 # is currently required.
diff --git a/make/custom/erc32.cfg b/make/custom/erc32.cfg
index 99990454a0..4d99ebbcfb 100644
--- a/make/custom/erc32.cfg
+++ b/make/custom/erc32.cfg
@@ -13,6 +13,8 @@ RTEMS_CPU_MODEL=erc32
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=erc32
 
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -mcpu=cypress
 
 # optimize flag: typically -O2
diff --git a/make/custom/erc32nfp.cfg b/make/custom/erc32nfp.cfg
index 01acc1e412..0b33524b0f 100644
--- a/make/custom/erc32nfp.cfg
+++ b/make/custom/erc32nfp.cfg
@@ -14,6 +14,8 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=erc32
 
+# This contains the compiler options necessary to select the CPU model
+# and (hopefully) optimize for it.
 CPU_CFLAGS = -mcpu=cypress -msoft-float
 
 # optimize flag: typically -O2
diff --git a/make/custom/gen68340.cfg b/make/custom/gen68340.cfg
index 92eb447ae0..1f75bd9fbc 100644
--- a/make/custom/gen68340.cfg
+++ b/make/custom/gen68340.cfg
@@ -13,6 +13,8 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=gen68340
 
+# This contains the compiler options necessary to select the CPU model
+# and (hopefully) optimize for it.
 CPU_CFLAGS = -mcpu32
 
 # optimize flag: typically -O2
@@ -27,19 +29,5 @@ define make-exe
 	$(NM) -g -n $@ > $(basename $@).num
 	$(SIZE) $@
 endef
-#	 if you want to make a prom image
-#	 m68k-rtems-objcopy --adjust-section-vma \
-#	  .data=`m68k-rtems-objdump --section-headers $(basename $@).exe | \
-#	  awk 'function h2d(x) { x=toupper(x); digits=length(x); s=0 ; \
-#	       for (p=digits; p>0; p--) \
-#	       s += (16^(p-1)) * ( index("0123456789ABCDEF",\
-#	        substr(x,1+digits-p,1)) -1 );\
-#	        return s } ;\
-#	        /\.text/ { base = $$4 ; size = $$3 };\
-#	        END { printf("0x%x", h2d(base) + h2d(size)) }'\
-#	       ` $(basename $@).exe
-#	 if you want to convert it to ieee
-#	 m68k-rtems-objcopy --output-target=ieee --debugging \
-#	       $(basename $@).exe $(basename $@).ieee
 
 # Miscellaneous additions go here
diff --git a/make/custom/gen68360.cfg b/make/custom/gen68360.cfg
index ca947d3bfa..60d24c8478 100644
--- a/make/custom/gen68360.cfg
+++ b/make/custom/gen68360.cfg
@@ -17,9 +17,8 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=gen68360
 
-#
-# You must use versions of gcc and gas that support the -mcpu32 option.
-#
+# This contains the compiler options necessary to select the CPU model
+# and (hopefully) optimize for it.
 ifeq ($(RTEMS_GEN68360_COMPANION_MODE),yes)
 CPU_CFLAGS = -m68040
 else
diff --git a/make/custom/leon2.cfg b/make/custom/leon2.cfg
index 0b0922ee2f..e53ca06c06 100644
--- a/make/custom/leon2.cfg
+++ b/make/custom/leon2.cfg
@@ -11,10 +11,8 @@ RTEMS_CPU_MODEL=leon2
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=leon2
 
-# 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)
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -mcpu=cypress -msoft-float
 
 # optimize flag: typically -O2
@@ -30,4 +28,3 @@ define make-exe
 	$(SIZE) $(basename $@).exe
 endef
 # Miscellaneous additions go here
-
diff --git a/make/custom/leon3.cfg b/make/custom/leon3.cfg
index e24e8ec468..73a14d10cd 100644
--- a/make/custom/leon3.cfg
+++ b/make/custom/leon3.cfg
@@ -13,10 +13,8 @@ RTEMS_CPU_MODEL=leon3
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=leon3
 
-# 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)
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -mcpu=cypress -msoft-float
 
 # optimize flag: typically -O2
diff --git a/make/custom/mcf5206elite.cfg b/make/custom/mcf5206elite.cfg
index 42c297bcfe..2f5c61328e 100644
--- a/make/custom/mcf5206elite.cfg
+++ b/make/custom/mcf5206elite.cfg
@@ -14,9 +14,8 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=mcf5206elite
 
-#
-# You must use versions of gcc and gas that support the -m5200 option.
-#
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -m5200
 
 # optimize flag: typically -O2
diff --git a/make/custom/mvme147.cfg b/make/custom/mvme147.cfg
index dc1fd05237..c578a83bd2 100644
--- a/make/custom/mvme147.cfg
+++ b/make/custom/mvme147.cfg
@@ -12,7 +12,8 @@ RTEMS_CPU_MODEL=m68030
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=mvme147
 
-# default flags
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS =
 
 # optimize flag: typically -O2
diff --git a/make/custom/nios2_iss.cfg b/make/custom/nios2_iss.cfg
index c5e450f7fd..72cfc45f43 100644
--- a/make/custom/nios2_iss.cfg
+++ b/make/custom/nios2_iss.cfg
@@ -15,9 +15,8 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY = nios2_iss
 
-#  "-Gx" tells gcc to put objects of up to x bytes into sections sdata/sbss
-#  where they could be addressed using the global pointer gp. -G0 effectively
-#  disables the use of gp.
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -mno-hw-mul -mno-hw-div
 
 # optimize flag: typically -O2
diff --git a/make/custom/no_bsp.cfg b/make/custom/no_bsp.cfg
index 3c196d8861..82f7434513 100644
--- a/make/custom/no_bsp.cfg
+++ b/make/custom/no_bsp.cfg
@@ -12,12 +12,4 @@ RTEMS_CPU_MODEL=no_cpu_model
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=no_bsp
 
-# Define this to yes if C++ is included in the development environment.
-# This requires that at least the GNU C++ compiler and libg++ be installed.
-#
-#  Need "main" in BSP so can't link C++ sample test or you will get
-#     duplicate symbol errors for main
-#
-HAS_CPLUSPLUS=no
-
 # Miscellaneous additions go here
diff --git a/make/custom/pc386dx.cfg b/make/custom/pc386dx.cfg
index c74732afb4..2268eaecb2 100644
--- a/make/custom/pc386dx.cfg
+++ b/make/custom/pc386dx.cfg
@@ -5,6 +5,9 @@
 #
 
 RTEMS_CPU_MODEL=i386dx
+
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -msoft-float -mno-fp-ret-in-387
 
 include $(RTEMS_ROOT)/make/custom/pc386.cfg
diff --git a/make/custom/pc486.cfg b/make/custom/pc486.cfg
index 43ec7896c0..e62187b180 100644
--- a/make/custom/pc486.cfg
+++ b/make/custom/pc486.cfg
@@ -5,11 +5,9 @@
 #
 
 RTEMS_CPU_MODEL=i486dx
-# gcc 2.95.x and 3.0
-#CPU_CFLAGS = -m486
-# gcc 3.1 and newer
-# CPU_CFLAGS = -mcpu=i486
-# gcc 4.0 and newer
+
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -mtune=i486
 
 include $(RTEMS_ROOT)/make/custom/pc386.cfg
diff --git a/make/custom/pc586.cfg b/make/custom/pc586.cfg
index 9c64f708a9..0959a4c3c0 100644
--- a/make/custom/pc586.cfg
+++ b/make/custom/pc586.cfg
@@ -5,11 +5,9 @@
 #
 
 RTEMS_CPU_MODEL=pentium
-# gcc 2.95.x and 3.0
-#CPU_CFLAGS = -mpentium
-# gcc 3.1 and newer
-# CPU_CFLAGS = -mcpu=pentium
-# gcc 4.0 and newer
+
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -mtune=pentium
 
 include $(RTEMS_ROOT)/make/custom/pc386.cfg
diff --git a/make/custom/pc686.cfg b/make/custom/pc686.cfg
index 4c66e28b8e..7c0d85d22a 100644
--- a/make/custom/pc686.cfg
+++ b/make/custom/pc686.cfg
@@ -5,11 +5,9 @@
 #
 
 RTEMS_CPU_MODEL=pentiumpro
-# gcc 2.95.x and 3.0
-#CPU_CFLAGS = -mpentiumpro
-# gcc 3.1 and newer
-# CPU_CFLAGS = -mcpu=pentiumpro
-# gcc 4.0 and newer
+
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -mtune=pentiumpro
 
 include $(RTEMS_ROOT)/make/custom/pc386.cfg
diff --git a/make/custom/pck6.cfg b/make/custom/pck6.cfg
index 7cfbfa8358..edbbeeb20f 100644
--- a/make/custom/pck6.cfg
+++ b/make/custom/pck6.cfg
@@ -5,9 +5,9 @@
 #
 
 RTEMS_CPU_MODEL=pentium
-# gcc 3.1 and newer
-# CPU_CFLAGS = -mcpu=k6
-# gcc 4.0 and newer
+
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -mtune=k6
 
 include $(RTEMS_ROOT)/make/custom/pc386.cfg
diff --git a/make/custom/sim68000.cfg b/make/custom/sim68000.cfg
index 63cd76d176..2b0d3abd04 100644
--- a/make/custom/sim68000.cfg
+++ b/make/custom/sim68000.cfg
@@ -8,6 +8,9 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=m68k
 RTEMS_CPU_MODEL=m68000
+
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -m68000
 
 # This is the actual bsp directory used during the build process.
diff --git a/make/custom/simcpu32.cfg b/make/custom/simcpu32.cfg
index e0625ba8a6..489f6acd3f 100644
--- a/make/custom/simcpu32.cfg
+++ b/make/custom/simcpu32.cfg
@@ -8,6 +8,9 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=m68k
 RTEMS_CPU_MODEL=mcpu32
+
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
 CPU_CFLAGS = -mcpu32
 
 # This is the actual bsp directory used during the build process.
-- 
cgit v1.2.3