Backport various changes from CVS-HEAD.

71 files changed, 181 insertions, 282 deletions

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/armulator.cfg b/make/custom/armulator.cfg
index f5d6ee4ae8..0e448c3320 100644
--- a/make/custom/armulator.cfg
+++ b/make/custom/armulator.cfg
@@ -19,7 +19,7 @@ RTEMS_BSP_FAMILY=armulator
 # CPU_CFLAGS = -msoft-float
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4
+CFLAGS_OPTIMIZE_V = -O2
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ \
diff --git a/make/custom/av5282.cfg b/make/custom/av5282.cfg
index 7f24a41b81..e955d1f3db 100644
--- a/make/custom/av5282.cfg
+++ b/make/custom/av5282.cfg
@@ -1,12 +1,6 @@
 #
 #  Config file for the uC5282 BSP
 #
-#Based on:
-#  $Id$
-#
-# A0.01 Initial Version                   BDS	07/26/01
-#
-
 
 RTEMS_CPU=m68k
 RTEMS_CPU_MODEL=mcf5282
@@ -22,7 +16,7 @@ CPU_CFLAGS = -m528x
 
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V= -O4 -fomit-frame-pointer
+CFLAGS_OPTIMIZE_V = -O2 -fomit-frame-pointer
 
 ifndef MTARGET
 MTARGET=ram
@@ -30,8 +24,7 @@ endif
 
 
 # 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.
+# is currently required.
 
 
 define make-exe
diff --git a/make/custom/bare.cfg b/make/custom/bare.cfg
index 288d99da50..da33ae34a1 100644
--- a/make/custom/bare.cfg
+++ b/make/custom/bare.cfg
@@ -11,19 +11,20 @@ RTEMS_BSP=bare
 
 RTEMS_CPU_MODEL=$(BARE_CPU_MODEL)
 
-CPU_CFLAGS=$(BARE_CPU_CFLAGS)
+# 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
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
+CFLAGS_OPTIMIZE_V = -O2 -fomit-frame-pointer
 
 # 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.
+# is currently required.
 
 define make-exe
 	@echo "*** Cannot do a link with the bare bsp. ***"
diff --git a/make/custom/brs5l.cfg b/make/custom/brs5l.cfg
index 190260a28f..1e403f0618 100644
--- a/make/custom/brs5l.cfg
+++ b/make/custom/brs5l.cfg
@@ -1,7 +1,7 @@
 #
 #  Config file for customer specific MPC5200 board
 #
-#  brs5l.cfg,v 1.8 2005/03/03 13:16:01 ralf Exp
+#  $Id$
 #
 
 #
diff --git a/make/custom/csb336.cfg b/make/custom/csb336.cfg
index 9813fa0a53..71e348382e 100644
--- a/make/custom/csb336.cfg
+++ b/make/custom/csb336.cfg
@@ -16,11 +16,9 @@ RTEMS_BSP_FAMILY=csb336
 #  and (hopefully) optimize for it. 
 #
 CPU_CFLAGS = -mcpu=arm920 -mstructure-size-boundary=8 
-#CPU_CFLAGS += -msoft-float
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O3
-#CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align
+CFLAGS_OPTIMIZE_V = -O2
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ \
diff --git a/make/custom/csb337.cfg b/make/custom/csb337.cfg
index a07a7adfa8..128a4aee24 100644
--- a/make/custom/csb337.cfg
+++ b/make/custom/csb337.cfg
@@ -18,7 +18,7 @@ RTEMS_BSP_FAMILY=csb337
 CPU_CFLAGS = -mcpu=arm920 -mstructure-size-boundary=8 
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O2 -g 
+CFLAGS_OPTIMIZE_V = -O2 -g 
 
 
 define make-exe
diff --git a/make/custom/csb350.cfg b/make/custom/csb350.cfg
index 02fb011705..87772c7ff0 100644
--- a/make/custom/csb350.cfg
+++ b/make/custom/csb350.cfg
@@ -16,14 +16,13 @@ RTEMS_BSP_FAMILY=csb350
 #  and (hopefully) optimize for it. 
 #
 # gcc 3.1 and newer
-CPU_CFLAGS=-mips32 -G0 -msoft-float
+CPU_CFLAGS = -mips32 -G0 -msoft-float
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O2 -g
+CFLAGS_OPTIMIZE_V = -O2 -g
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/csb360.cfg b/make/custom/csb360.cfg
index 01e1a5960a..e3c118dcab 100644
--- a/make/custom/csb360.cfg
+++ b/make/custom/csb360.cfg
@@ -14,19 +14,15 @@ 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 -0, could use -O4 or -fast
-# 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
+# optimize flag: typically -O2
+CFLAGS_OPTIMIZE_V = -O2 -fomit-frame-pointer
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ \
diff --git a/make/custom/dmv152.cfg b/make/custom/dmv152.cfg
index 6bde1524d2..74ae377cab 100644
--- a/make/custom/dmv152.cfg
+++ b/make/custom/dmv152.cfg
@@ -20,15 +20,14 @@ RTEMS_BSP_FAMILY=dmv152
 CPU_CFLAGS = 
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
+CFLAGS_OPTIMIZE_V = -O2 -fomit-frame-pointer
 
 # Here is the rule to actually build a $(ARCH)/foo.exe
 # It also builds $(ARCH)/foo.sr and $(ARCH)/foo.nm
 # Usage ref: src/tests/sptest/sp1/Makefile
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \
diff --git a/make/custom/edb7312.cfg b/make/custom/edb7312.cfg
index ca2a9bb457..4b381caba6 100644
--- a/make/custom/edb7312.cfg
+++ b/make/custom/edb7312.cfg
@@ -16,11 +16,9 @@ RTEMS_BSP_FAMILY=edb7312
 #  and (hopefully) optimize for it. 
 #
 CPU_CFLAGS = -mcpu=$(RTEMS_CPU_MODEL) -mstructure-size-boundary=8
-# CPU_CFLAGS += -msoft-float
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O3
-#CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align
+CFLAGS_OPTIMIZE_V = -O2
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ \
diff --git a/make/custom/ep1a.cfg b/make/custom/ep1a.cfg
index 963a3a6d5a..6530527e5b 100644
--- a/make/custom/ep1a.cfg
+++ b/make/custom/ep1a.cfg
@@ -17,9 +17,7 @@ RTEMS_BSP_FAMILY=ep1a
 CPU_CFLAGS = -mcpu=603e -Dmpc603e -Dppc603e -mmultiple -mstring -mstrict-align
 
 # optimize flag: typically -O2
-# NOTE: some level of -O may be actually required by inline assembler
-#CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
-CFLAGS_OPTIMIZE_V = -O4
+CFLAGS_OPTIMIZE_V = -O2
 
 define make-exe
         $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).exe \
diff --git a/make/custom/erc32.cfg b/make/custom/erc32.cfg
index 5a8f1b2fbd..4d99ebbcfb 100644
--- a/make/custom/erc32.cfg
+++ b/make/custom/erc32.cfg
@@ -13,14 +13,15 @@ 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
-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
-# will be able to override parts of the compilers specs and link using gcc.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).exe \
diff --git a/make/custom/erc32nfp.cfg b/make/custom/erc32nfp.cfg
index 775068d530..0b33524b0f 100644
--- a/make/custom/erc32nfp.cfg
+++ b/make/custom/erc32nfp.cfg
@@ -14,14 +14,15 @@ 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
-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
-# will be able to override parts of the compilers specs and link using gcc.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).exe \
diff --git a/make/custom/gba.cfg b/make/custom/gba.cfg
index 9e40b7439b..56d0c783b9 100644
--- a/make/custom/gba.cfg
+++ b/make/custom/gba.cfg
@@ -19,8 +19,7 @@ RTEMS_BSP_FAMILY=gba
 CPU_CFLAGS = -mcpu=$(RTEMS_CPU_MODEL) -msoft-float -mstructure-size-boundary=8
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O3
-CXXFLAGS_OPTIMIZE_V=-O3
+CFLAGS_OPTIMIZE_V = -O2
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/gen405.cfg b/make/custom/gen405.cfg
index ec6e3a0293..c23c80474c 100644
--- a/make/custom/gen405.cfg
+++ b/make/custom/gen405.cfg
@@ -25,16 +25,14 @@ RTEMS_BSP_FAMILY=gen405
 CPU_CFLAGS = -mcpu=403 -D_OLD_EXCEPTIONS -Dppc405
 
 # optimize flag: typically -O2
-# NOTE: some level of -O may be actually required by inline assembler
-CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions -g
+CFLAGS_OPTIMIZE_V = -O2 -fno-keep-inline-functions -g
 
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS)
diff --git a/make/custom/gen5200.cfg b/make/custom/gen5200.cfg
index 493e7bd6c4..d3dc1779f6 100644
--- a/make/custom/gen5200.cfg
+++ b/make/custom/gen5200.cfg
@@ -19,12 +19,10 @@ RTEMS_BSP_FAMILY=gen5200
 CPU_CFLAGS = -mcpu=603e -mstrict-align -D$(RTEMS_BOARD_MODEL)
 
 # optimize flag: typically -O2
-# NOTE: some level of -O may be actually required by inline assembler
-CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions -g
+CFLAGS_OPTIMIZE_V = -O2 -fno-keep-inline-functions -g
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/gen68302.cfg b/make/custom/gen68302.cfg
index 170ea9e27b..a469504453 100644
--- a/make/custom/gen68302.cfg
+++ b/make/custom/gen68302.cfg
@@ -15,17 +15,13 @@ RTEMS_BSP_FAMILY=gen68302
 #
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
-#
-# 68000+softfloat results in gcc 2.95.2 giving default libraries. 
-# CPU_CFLAGS = -m68302 -msoft-float
 CPU_CFLAGS = -m68302
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ \
diff --git a/make/custom/gen68340.cfg b/make/custom/gen68340.cfg
index 278be8117c..1f75bd9fbc 100644
--- a/make/custom/gen68340.cfg
+++ b/make/custom/gen68340.cfg
@@ -13,14 +13,15 @@ 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
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
@@ -28,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 e757a38123..60d24c8478 100644
--- a/make/custom/gen68360.cfg
+++ b/make/custom/gen68360.cfg
@@ -17,21 +17,19 @@ 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
+CPU_CFLAGS = -m68040
 else
 CPU_CFLAGS = -mcpu32
 endif
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ \
diff --git a/make/custom/genmongoosev.cfg b/make/custom/genmongoosev.cfg
index 61635907b2..39e8a9a8bd 100644
--- a/make/custom/genmongoosev.cfg
+++ b/make/custom/genmongoosev.cfg
@@ -15,14 +15,13 @@ RTEMS_BSP_FAMILY=genmongoosev
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS=-mips1 -G0
+CPU_CFLAGS = -mips1 -G0
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O2 -g
+CFLAGS_OPTIMIZE_V = -O2 -g
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/gensh1.cfg b/make/custom/gensh1.cfg
index df03bb1558..4f236d2ca3 100644
--- a/make/custom/gensh1.cfg
+++ b/make/custom/gensh1.cfg
@@ -20,14 +20,13 @@ RTEMS_BSP_FAMILY=gensh1
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
 #
-CPU_CFLAGS=-m1
+CPU_CFLAGS = -m1
 
 # optimize flag: typically -O2
-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
-# will be able to override parts of the compilers specs and link using gcc.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/gensh2.cfg b/make/custom/gensh2.cfg
index 1fc22deca7..19f5aa45f5 100644
--- a/make/custom/gensh2.cfg
+++ b/make/custom/gensh2.cfg
@@ -20,14 +20,13 @@ RTEMS_BSP_FAMILY=gensh2
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
 #
-CPU_CFLAGS= -m2
+CPU_CFLAGS = -m2
 
 # optimize flag: typically -O2
-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
-# will be able to override parts of the compilers specs and link using gcc.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -Wl,-Map,$(basename $@).map \
diff --git a/make/custom/gensh4.cfg b/make/custom/gensh4.cfg
index 019ae2ecfb..87f5948c1e 100644
--- a/make/custom/gensh4.cfg
+++ b/make/custom/gensh4.cfg
@@ -23,18 +23,17 @@ RTEMS_BSP_FAMILY=gensh4
 #
 # Seems to be good without initialisation FPSCR.
 # Also works with SH4_FPSCR_DN bit set.
-#CPU_CFLAGS= -m4-single-only -mfmovd -ml
-#CPU_CFLAGS= -m4-single -ml
+#CPU_CFLAGS = -m4-single-only -mfmovd -ml
+#CPU_CFLAGS = -m4-single -ml
 #
 # It works with SH4_FPSCR_PR bit set
-CPU_CFLAGS= -m4 -ml
+CPU_CFLAGS = -m4 -ml
 
 # optimize flag: typically -O2
-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
-# will be able to override parts of the compilers specs and link using gcc.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -Wl,-Map,$(basename $@).map \
diff --git a/make/custom/gp32.cfg b/make/custom/gp32.cfg
index dc9ded1e75..b48d5fa9e8 100644
--- a/make/custom/gp32.cfg
+++ b/make/custom/gp32.cfg
@@ -15,10 +15,10 @@ RTEMS_BSP_FAMILY=gp32
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS = -mcpu=arm920t -mstructure-size-boundary=32 -O3
+CPU_CFLAGS = -mcpu=arm920t -mstructure-size-boundary=32
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=
+CFLAGS_OPTIMIZE_V = -O2
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ \
diff --git a/make/custom/h8sim.cfg b/make/custom/h8sim.cfg
index c616a8816d..3ebbd3eb99 100644
--- a/make/custom/h8sim.cfg
+++ b/make/custom/h8sim.cfg
@@ -15,15 +15,13 @@ RTEMS_BSP_FAMILY=h8sim
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS=-mh -mint32
+CPU_CFLAGS = -mh -mint32
 
 # optimize flag: typically -O2
-# CFLAGS_OPTIMIZE_V=-O4 -mleaf-procedures
-CFLAGS_OPTIMIZE_V=-O0
+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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/helas403.cfg b/make/custom/helas403.cfg
index 605474a628..395832de83 100644
--- a/make/custom/helas403.cfg
+++ b/make/custom/helas403.cfg
@@ -19,15 +19,13 @@ RTEMS_BSP_FAMILY=helas403
 CPU_CFLAGS = -mcpu=403 -D_OLD_EXCEPTIONS -Dppc403
 
 # optimize flag: typically -O2
-# NOTE: some level of -O may be actually required by inline assembler
-CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
+CFLAGS_OPTIMIZE_V = -O2 -fno-keep-inline-functions
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).exe \
diff --git a/make/custom/hurricane.cfg b/make/custom/hurricane.cfg
index b092b0aea6..8e389ff792 100644
--- a/make/custom/hurricane.cfg
+++ b/make/custom/hurricane.cfg
@@ -16,11 +16,10 @@ RTEMS_BSP_FAMILY=hurricane
 CPU_CFLAGS = -mips3 -G0 -EL
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/i386ex.cfg b/make/custom/i386ex.cfg
index 576ef28a6d..39c2203a31 100644
--- a/make/custom/i386ex.cfg
+++ b/make/custom/i386ex.cfg
@@ -18,7 +18,7 @@ RTEMS_BSP_FAMILY=i386ex
 CPU_CFLAGS = -msoft-float
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4
+CFLAGS_OPTIMIZE_V = -O2
 
 #  Something like this should produce a map file but this does not work.
 
@@ -29,8 +29,7 @@ CFLAGS_OPTIMIZE_V=-O4
 # $(OBJDUMP) -x -m i386 -d $(basename $@).elf > $(basename $@).rdmp
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).elf \
diff --git a/make/custom/idp.cfg b/make/custom/idp.cfg
index ee96a1dbc4..57500c43ed 100644
--- a/make/custom/idp.cfg
+++ b/make/custom/idp.cfg
@@ -18,11 +18,10 @@ RTEMS_BSP_FAMILY=idp
 CPU_CFLAGS = -msoft-float
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \
diff --git a/make/custom/jmr3904.cfg b/make/custom/jmr3904.cfg
index 7184b35495..3ad437c646 100644
--- a/make/custom/jmr3904.cfg
+++ b/make/custom/jmr3904.cfg
@@ -16,16 +16,15 @@ RTEMS_BSP_FAMILY=jmr3904
 #  and (hopefully) optimize for it. 
 #
 # gcc 2.95.x and 3.0
-#CPU_CFLAGS=-m3900 -G0
+#CPU_CFLAGS = -m3900 -G0
 # gcc 3.1 and newer
-CPU_CFLAGS=-march=r3900 -Wa,-xgot -G0
+CPU_CFLAGS = -march=r3900 -Wa,-xgot -G0
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O2
+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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) -G0 $(AM_LDFLAGS) \
diff --git a/make/custom/leon2.cfg b/make/custom/leon2.cfg
index d4d6b60f38..e53ca06c06 100644
--- a/make/custom/leon2.cfg
+++ b/make/custom/leon2.cfg
@@ -11,21 +11,15 @@ RTEMS_CPU_MODEL=leon2
 # This is the actual bsp directory used during the build process.
 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.
-
-# 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
-CFLAGS_OPTIMIZE_V=-O2
+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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).exe \
@@ -34,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 7651a0e71d..73a14d10cd 100644
--- a/make/custom/leon3.cfg
+++ b/make/custom/leon3.cfg
@@ -13,21 +13,15 @@ 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)
+#  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
-CFLAGS_OPTIMIZE_V=-O2
+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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).exe \
diff --git a/make/custom/mbx821_002b.cfg b/make/custom/mbx821_002b.cfg
index 234dfb75cb..26686e3ca0 100644
--- a/make/custom/mbx821_002b.cfg
+++ b/make/custom/mbx821_002b.cfg
@@ -12,4 +12,5 @@ RTEMS_MBX_MODEL=mbx821_002b
 
 include $(RTEMS_ROOT)/make/custom/mbx8xx.cfg
 
-CFLAGS_OPTIMIZE_V=-O2
+# optimize flag: typically -O2
+CFLAGS_OPTIMIZE_V = -O2
diff --git a/make/custom/mbx8xx.cfg b/make/custom/mbx8xx.cfg
index 64bf9d253a..85170dc927 100644
--- a/make/custom/mbx8xx.cfg
+++ b/make/custom/mbx8xx.cfg
@@ -46,11 +46,8 @@ RTEMS_BSP_FAMILY=mbx8xx
 CPU_CFLAGS = -mcpu=$(8XX_CPU_TYPE) -Dmpc$(8XX_CPU_TYPE) -D$(RTEMS_MBX_MODEL)
 
 
-# optimize flag: typically -O, could use -O4 or -fast
-# NOTE: some level of -O may be actually required by inline assembler
-# CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
-CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
-CXXFLAGS_OPTIMIZE_V=-O4
+# optimize flag: typically -O2
+CFLAGS_OPTIMIZE_V = -O2 -fno-keep-inline-functions
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) $(MBX8xx_LDFLAGS) \
diff --git a/make/custom/mcf5206elite.cfg b/make/custom/mcf5206elite.cfg
index 776a50c13c..2f5c61328e 100644
--- a/make/custom/mcf5206elite.cfg
+++ b/make/custom/mcf5206elite.cfg
@@ -14,18 +14,15 @@ 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 -0, could use -O4 or -fast
-# -O4 is ok for RTEMS
-CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
+# optimize flag: typically -O2
+CFLAGS_OPTIMIZE_V = -O2 -fomit-frame-pointer
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ \
diff --git a/make/custom/mcf5235.cfg b/make/custom/mcf5235.cfg
index e7e61ce0b6..a91c89b6ec 100644
--- a/make/custom/mcf5235.cfg
+++ b/make/custom/mcf5235.cfg
@@ -21,8 +21,8 @@ RTEMS_BSP_FAMILY=mcf5235
 CPU_CFLAGS = -m528x
 
 
-# optimize flag: typically -0, could use -O4 or -fast, -O4 is ok for RTEMS
-CFLAGS_OPTIMIZE_V= -O4 -fomit-frame-pointer
+# optimize flag: typically -O2
+CFLAGS_OPTIMIZE_V = -O2 -fomit-frame-pointer
 
 
 ifndef MTARGET
@@ -30,8 +30,7 @@ MTARGET=ram
 endif
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) -m5200 $(AM_LDFLAGS) \
diff --git a/make/custom/mcp750.cfg b/make/custom/mcp750.cfg
index 19f2be80ee..30783f9e51 100644
--- a/make/custom/mcp750.cfg
+++ b/make/custom/mcp750.cfg
@@ -18,7 +18,7 @@ RTEMS_BSP_FAMILY=motorola_powerpc
 CPU_CFLAGS = -mcpu=750 -Dmpc750
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align
+CFLAGS_OPTIMIZE_V = -O2 -mmultiple -mstring -mstrict-align
 
 define make-exe
   	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/mpc8260ads.cfg b/make/custom/mpc8260ads.cfg
index 68685f57e7..bdaa97f6e5 100644
--- a/make/custom/mpc8260ads.cfg
+++ b/make/custom/mpc8260ads.cfg
@@ -20,12 +20,10 @@ RTEMS_BSP_FAMILY=mpc8260ads
 CPU_CFLAGS = -mcpu=603e -mstrict-align -Dmpc8260
 
 # optimize flag: typically -O2
-# NOTE: some level of -O may be actually required by inline assembler
-CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions -g
+CFLAGS_OPTIMIZE_V = -O2 -fno-keep-inline-functions -g
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).exe \
diff --git a/make/custom/mrm332.cfg b/make/custom/mrm332.cfg
index b109eabf32..6dc9fc960b 100644
--- a/make/custom/mrm332.cfg
+++ b/make/custom/mrm332.cfg
@@ -17,11 +17,10 @@ RTEMS_BSP_FAMILY=mrm332
 CPU_CFLAGS = -mcpu32
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 ifeq ($(MRM_IN_ROM),yes)
 # Build a rommable image - move the .data section after the .text section
diff --git a/make/custom/mtx603e.cfg b/make/custom/mtx603e.cfg
index 92da685114..00a40bfa05 100644
--- a/make/custom/mtx603e.cfg
+++ b/make/custom/mtx603e.cfg
@@ -1,7 +1,7 @@
 #
 #  Config file for Motorola MTX603e -- a MPC603e ATX form factor board
 #
-#  mcp750.cfg,v 1.24 2002/04/18 13:07:35 joel Exp
+#  $Id$
 #
 
 include $(RTEMS_ROOT)/make/custom/default.cfg
@@ -17,7 +17,7 @@ RTEMS_BSP_FAMILY=motorola_powerpc
 CPU_CFLAGS = -mcpu=603e -Dmpc603e -Dppc603e
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align
+CFLAGS_OPTIMIZE_V = -O2 -mmultiple -mstring -mstrict-align
 
 define make-exe
   	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/mvme136.cfg b/make/custom/mvme136.cfg
index 1ccea1fd40..c7a1d955f0 100644
--- a/make/custom/mvme136.cfg
+++ b/make/custom/mvme136.cfg
@@ -19,11 +19,10 @@ RTEMS_BSP_FAMILY=mvme136
 CPU_CFLAGS =
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \
diff --git a/make/custom/mvme147.cfg b/make/custom/mvme147.cfg
index 41feb8564d..c578a83bd2 100644
--- a/make/custom/mvme147.cfg
+++ b/make/custom/mvme147.cfg
@@ -12,15 +12,15 @@ RTEMS_CPU_MODEL=m68030
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=mvme147
 
-# default flags
-CPU_CFLAGS=
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it.
+CPU_CFLAGS =
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \
diff --git a/make/custom/mvme162.cfg b/make/custom/mvme162.cfg
index 639732904b..1a844f97d3 100644
--- a/make/custom/mvme162.cfg
+++ b/make/custom/mvme162.cfg
@@ -21,11 +21,10 @@ RTEMS_BSP_FAMILY=mvme162
 CPU_CFLAGS = -m68040
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/mvme162lx.cfg b/make/custom/mvme162lx.cfg
index b3380a9062..317e9cb815 100644
--- a/make/custom/mvme162lx.cfg
+++ b/make/custom/mvme162lx.cfg
@@ -27,11 +27,10 @@ RTEMS_BSP_FAMILY=mvme162
 CPU_CFLAGS = -m68040 -msoft-float
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/mvme167.cfg b/make/custom/mvme167.cfg
index 310f5ea360..7732831bec 100644
--- a/make/custom/mvme167.cfg
+++ b/make/custom/mvme167.cfg
@@ -24,8 +24,8 @@ RTEMS_BSP_FAMILY=mvme167
 CPU_CFLAGS = -m68040
 
 
-# optimize flag: typically -O, could use -O4 or -fast
-CFLAGS_OPTIMIZE_V=-O4 -fno-omit-frame-pointer
+# optimize flag: typically -O2
+CFLAGS_OPTIMIZE_V = -O2 -fno-omit-frame-pointer
 
 # Here is the rule to actually build a $(ARCH)/foo.exe
 # It also builds $(ARCH)/foo.nm
@@ -35,8 +35,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fno-omit-frame-pointer
 # rather than S-records. We skip the header during downloads.
 
 # 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.
+# is currently required.
 
 # The MC68040 does not implement all MC68881/MC68882 instructions, so use
 # either the gcc floating-point software support (msoft-float libraries), or
diff --git a/make/custom/mvme2100.cfg b/make/custom/mvme2100.cfg
index 7378e20362..7cefd7f171 100644
--- a/make/custom/mvme2100.cfg
+++ b/make/custom/mvme2100.cfg
@@ -17,7 +17,7 @@ RTEMS_BSP_FAMILY=motorola_powerpc
 CPU_CFLAGS = -mcpu=603e -Dmpc603e -Dppc603e
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align
+CFLAGS_OPTIMIZE_V = -O2 -mmultiple -mstring -mstrict-align
 
 define make-exe
   	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/mvme2307.cfg b/make/custom/mvme2307.cfg
index 3559470ff2..682ff0fe94 100644
--- a/make/custom/mvme2307.cfg
+++ b/make/custom/mvme2307.cfg
@@ -16,12 +16,9 @@ RTEMS_BSP_FAMILY=motorola_powerpc
 #  and (hopefully) optimize for it. 
 #
 CPU_CFLAGS = -mcpu=604 -mmultiple -mstring -mstrict-align -meabi 
-#-msdata=eabi
 
 # optimize flag: typically -O2
-# NOTE: some level of -O may be actually required by inline assembler
-#CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
-CFLAGS_OPTIMIZE_V = -O4
+CFLAGS_OPTIMIZE_V = -O2
 
 define make-exe
   	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/mvme5500.cfg b/make/custom/mvme5500.cfg
index 51a3a901a7..684308fd67 100644
--- a/make/custom/mvme5500.cfg
+++ b/make/custom/mvme5500.cfg
@@ -20,14 +20,12 @@ CPU_CFLAGS = -mcpu=7450 -Dmpc7455 -mno-altivec -mabi=altivec -mvrsave=no -mmulti
 #T. Straumann; disable sdata=eabi for now until CEXP supports it -meabi -msdata=eabi
 
 # optimize flag: typically -O2
-#CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
-CFLAGS_OPTIMIZE_V = -O4
+CFLAGS_OPTIMIZE_V = -O2
 
 define make-exe
         $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS)
         $(NM) -g -n $@ > $(basename $@).num
         $(SIZE) $@
-#       test -d ${PROJECT_RELEASE}/bin || mkdir ${PROJECT_RELEASE}/bin
         $(OBJCOPY) -Obinary $@ $(@:%.exe=%)$(LIB_VARIANT).bin
 endef
 
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/ods68302.cfg b/make/custom/ods68302.cfg
index c42e91ca97..830957cf44 100644
--- a/make/custom/ods68302.cfg
+++ b/make/custom/ods68302.cfg
@@ -25,11 +25,10 @@ RTEMS_BSP_FAMILY=ods68302
 CPU_CFLAGS = -m68302
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/pc386.cfg b/make/custom/pc386.cfg
index e965bb701e..e3aba556a5 100644
--- a/make/custom/pc386.cfg
+++ b/make/custom/pc386.cfg
@@ -21,7 +21,7 @@ RTEMS_BSP_FAMILY=pc386
 # CPU_CFLAGS = 
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4
+CFLAGS_OPTIMIZE_V = -O2
 
 # Here is the rule to actually build a $(ARCH)/foo.exe
 # It also builds $(ARCH)/foo.sr and $(ARCH)/foo.nm
@@ -43,8 +43,7 @@ START16ADDR=0x00097C00
 HEADERADDR=0x00097E00
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -Wl,-Ttext,$(RELOCADDR) \
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 feb3b91de5..e62187b180 100644
--- a/make/custom/pc486.cfg
+++ b/make/custom/pc486.cfg
@@ -5,12 +5,10 @@
 #
 
 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
-CPU_CFLAGS=-mtune=i486
+
+#  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 98158e377e..0959a4c3c0 100644
--- a/make/custom/pc586.cfg
+++ b/make/custom/pc586.cfg
@@ -5,12 +5,10 @@
 #
 
 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
-CPU_CFLAGS=-mtune=pentium
+
+#  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 e2aacdb6b1..7c0d85d22a 100644
--- a/make/custom/pc686.cfg
+++ b/make/custom/pc686.cfg
@@ -5,12 +5,10 @@
 #
 
 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
-CPU_CFLAGS=-mtune=pentiumpro
+
+#  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/psim.cfg b/make/custom/psim.cfg
index 85a787fafc..7597da1bd3 100644
--- a/make/custom/psim.cfg
+++ b/make/custom/psim.cfg
@@ -19,8 +19,7 @@ CPU_CFLAGS = -mcpu=603e  -Dppc603e
 #-ffunction-sections
 
 # optimize flag: typically -O2
-# NOTE: some level of -O may be actually required by inline assembler
-CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
+CFLAGS_OPTIMIZE_V = -O2 -fno-keep-inline-functions
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).exe \
diff --git a/make/custom/rbtx4925.cfg b/make/custom/rbtx4925.cfg
index e0076f492b..e9913e50b7 100644
--- a/make/custom/rbtx4925.cfg
+++ b/make/custom/rbtx4925.cfg
@@ -16,11 +16,10 @@ RTEMS_BSP_FAMILY=rbtx4925
 CPU_CFLAGS = -mips3 -G0 -EL
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/rbtx4938.cfg b/make/custom/rbtx4938.cfg
index f8589a6d06..da1f769fc5 100644
--- a/make/custom/rbtx4938.cfg
+++ b/make/custom/rbtx4938.cfg
@@ -16,11 +16,10 @@ RTEMS_BSP_FAMILY=rbtx4938
 CPU_CFLAGS = -mips3 -G0 -EL
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-fomit-frame-pointer
+CFLAGS_OPTIMIZE_V = -fomit-frame-pointer
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/score603e.cfg b/make/custom/score603e.cfg
index f57e2fe497..99f5266bd1 100644
--- a/make/custom/score603e.cfg
+++ b/make/custom/score603e.cfg
@@ -23,9 +23,7 @@ RTEMS_BSP_FAMILY=score603e
 CPU_CFLAGS = -mcpu=603e -Dmpc603e -Dppc603e -mmultiple -mstring -mstrict-align
 
 # optimize flag: typically -O2
-# NOTE: some level of -O may be actually required by inline assembler
-CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
-# CFLAGS_OPTIMIZE_V=-O0 
+CFLAGS_OPTIMIZE_V = -O2 -fno-keep-inline-functions
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
@@ -39,5 +37,3 @@ define make-exe
 endef
 
 # Miscellaneous additions go here
-
-DRIVER_ARCHITECTURE=vmebus
diff --git a/make/custom/shsim.cfg b/make/custom/shsim.cfg
index 2726eb3c52..c07ffa1fd1 100644
--- a/make/custom/shsim.cfg
+++ b/make/custom/shsim.cfg
@@ -15,15 +15,13 @@ RTEMS_BSP_FAMILY=shsim
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS=-m1
+CPU_CFLAGS = -m1
 
 # optimize flag: typically -O2
-# CFLAGS_OPTIMIZE_V=-O4 -mleaf-procedures
-CFLAGS_OPTIMIZE_V=-O2 -g
+CFLAGS_OPTIMIZE_V = -O2 -g
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/sim68000.cfg b/make/custom/sim68000.cfg
index 48c74b7fca..2b0d3abd04 100644
--- a/make/custom/sim68000.cfg
+++ b/make/custom/sim68000.cfg
@@ -8,17 +8,19 @@ 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.
 RTEMS_BSP_FAMILY=sim68000
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/simcpu32.cfg b/make/custom/simcpu32.cfg
index c548591960..489f6acd3f 100644
--- a/make/custom/simcpu32.cfg
+++ b/make/custom/simcpu32.cfg
@@ -8,17 +8,19 @@ 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.
 RTEMS_BSP_FAMILY=sim68000
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V=-O4 -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.  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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
diff --git a/make/custom/simsh4.cfg b/make/custom/simsh4.cfg
index d8fa0fdfb9..e0237e9f9f 100644
--- a/make/custom/simsh4.cfg
+++ b/make/custom/simsh4.cfg
@@ -23,18 +23,17 @@ RTEMS_BSP_FAMILY=simsh4
 #
 # Seems to be good without initialisation FPSCR.
 # Also works with SH4_FPSCR_DN bit set.
-#CPU_CFLAGS= -m4-single-only -ml
+#CPU_CFLAGS = -m4-single-only -ml
 #
 # It works with SH4_FPSCR_PR bit set
-CPU_CFLAGS= -m4 -ml
+CPU_CFLAGS = -m4 -ml
 
 
 # optimize flag: typically -O2
-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
-# will be able to override parts of the compilers specs and link using gcc.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -Wl,-Map,$(basename $@).map \
diff --git a/make/custom/simsh7032.cfg b/make/custom/simsh7032.cfg
index 1db61f14ce..059a9632bd 100644
--- a/make/custom/simsh7032.cfg
+++ b/make/custom/simsh7032.cfg
@@ -17,9 +17,9 @@ RTEMS_CPU_MODEL=sh7032
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
 #
-CPU_CFLAGS=-m1
+CPU_CFLAGS = -m1
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V = -O4 
+CFLAGS_OPTIMIZE_V = -O2 
 
 # Miscellaneous additions go here
diff --git a/make/custom/simsh7045.cfg b/make/custom/simsh7045.cfg
index c2a40bf9eb..18dfeb76d8 100644
--- a/make/custom/simsh7045.cfg
+++ b/make/custom/simsh7045.cfg
@@ -17,9 +17,9 @@ RTEMS_CPU_MODEL=sh7045
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
 #
-CPU_CFLAGS=-m2
+CPU_CFLAGS = -m2
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V = -O4 
+CFLAGS_OPTIMIZE_V = -O2 
 
 # Miscellaneous additions go here
diff --git a/make/custom/ss555.cfg b/make/custom/ss555.cfg
index 5855acb760..0c961c56a3 100644
--- a/make/custom/ss555.cfg
+++ b/make/custom/ss555.cfg
@@ -22,10 +22,8 @@ RTEMS_BSP_FAMILY=ss555
 #
 CPU_CFLAGS = -mcpu=$(GCC_CPU_MODEL) -D$(RTEMS_CPU_MODEL) -D$(RTEMS_BSP_FAMILY)
 
-# optimize flag: typically -O, could use -O4 or -fast
-# NOTE: some level of -O may be actually required by inline assembler
-CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
-CXXFLAGS_OPTIMIZE_V=-O4
+# optimize flag: typically -O2
+CFLAGS_OPTIMIZE_V = -O2 -fno-keep-inline-functions
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) $(SS555_LDFLAGS) \
diff --git a/make/custom/ts_386ex.cfg b/make/custom/ts_386ex.cfg
index dedc19a33b..dae62d0e01 100644
--- a/make/custom/ts_386ex.cfg
+++ b/make/custom/ts_386ex.cfg
@@ -19,7 +19,7 @@ RTEMS_BSP_FAMILY=ts_386ex
 CPU_CFLAGS =-msoft-float -mno-fp-ret-in-387
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V= -O4 
+CFLAGS_OPTIMIZE_V = -O2 
 
 #  Something like this should produce a map file but this does not work.
 
diff --git a/make/custom/uC5282.cfg b/make/custom/uC5282.cfg
index 9d403a8d22..f49818716f 100644
--- a/make/custom/uC5282.cfg
+++ b/make/custom/uC5282.cfg
@@ -14,12 +14,11 @@ RTEMS_BSP_FAMILY = uC5282
 #  and (hopefully) optimize for it. 
 CPU_CFLAGS = -m528x
 
-# CFLAGS_OPTIMIZE_V= -O0 -fomit-frame-pointer
-CFLAGS_OPTIMIZE_V= -O4 -g
+# optimize flag: typically -O2
+CFLAGS_OPTIMIZE_V = -O2 -g
 
 # 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.
+# is currently required.
 
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \