Patches rtems-rc-4.5.0-1.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

that addresses the following:

    * Duplicate variables in Makefiles (many Makefile.ams below c/src/test
      are affected systematically)
    * Erroniously using local.am instead of host.am in host-Makefile.am
      (Only host Makefile.ams should be affected; Erroniously using local.am
      in host-Makefiles doesn't desturb much)
    * use '.' instead of '$pwd' in ./bootstrap (using $pwd does not work if
      $pwd is a symlink on linux).
    * Broken CVS Ids somewhere
    * Removing redundant/obsolete make variables from *.cfg files.

  Except of the last item from the list above, most parts of this patch
  are fairly harmless, sometimes even cosmetical.

  As mentioned before, this patch also contains a new ampolish script.

  This script features:
    * Pretty printing of Makefile.ams (eg. removal of trailing spaces,
      removal of duplicate empty lines, pretty printing make variables, etc.).

    * Some syntactical checks on the contents of Makefiles.am
    * Proper handling of Automake conditionals

  FYI:
    * Applying tools/update/rtems-polish.sh -am completely reformats all
      Makefile.am resulting into a very large (~500k) diff.
    * Applying tools/update/rtems-polish.sh -am twice, finally does not
      reformat the Makefile.ams anymore.
    * Many parts of the patch above result from merging back issues which
      have shown when applying this new ampolish (i.e. partially result from
      extracting the essentials of reformating being proposed by applying it
      on Makefile.ams).

    Though this ampolish is a very nice tool, IMHO, I am hestitant if you
    should apply (i.e. run tools/update/rtems-polish.sh -am) it to the
    sources before the release, because
      * the resulting diff is fairly large
      * I am not 100% sure it doesn't break anything.

    However, applying it after the release would result into compatibility
    problems in applying patches ;)

    I would suggest that you might consider trying it locally, then to
    examine the diff and then to decide whether to apply it in general or
    not.

Joel's Comments:

As Ralf points out, this patch is problematic in that applying it before
a release could break things but applying it afterwards will result in
patches being unusable for Makefiles.  My inclination is to forge ahead
and apply it.

6 files changed, 1 insertions, 18 deletions

diff --git a/make/compilers/gcc-no_bsp.cfg b/make/compilers/gcc-no_bsp.cfg
index af2a88f580..02997de16b 100644
--- a/make/compilers/gcc-no_bsp.cfg
+++ b/make/compilers/gcc-no_bsp.cfg
@@ -78,10 +78,6 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
 # debug flag; typically -g
 CFLAGS_DEBUG_V=-g -Wno-unused
 
-# when debugging, optimize flag: typically empty
-# some compilers do allow optimization with their "-g"
-CFLAGS_DEBUG_OPTIMIZE_V=
-
 # profile flag; use gprof(1)
 CFLAGS_PROFILE_V=-pg
 
diff --git a/make/compilers/gcc-portsw.cfg b/make/compilers/gcc-portsw.cfg
index 2d67ebb099..bc6870f3b7 100644
--- a/make/compilers/gcc-portsw.cfg
+++ b/make/compilers/gcc-portsw.cfg
@@ -59,10 +59,6 @@ CFLAGS_OPTIMIZE_V=-Os
 # debug flag; typically -g
 CFLAGS_DEBUG_V=-g -O0 -DRTEMS_DEBUG -DSTACK_CHECKER_ON
 
-# when debugging, optimize flag: typically empty
-# some compilers do allow optimization with their "-g"
-CFLAGS_DEBUG_OPTIMIZE_V=
-
 # profile flag; use gprof(1)
 CFLAGS_PROFILE_V=
 
diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg
index 88b5e58c0d..62757713d9 100644
--- a/make/compilers/gcc-target-default.cfg
+++ b/make/compilers/gcc-target-default.cfg
@@ -93,10 +93,6 @@ ifeq ($(RTEMS_USE_GCC272),no)
 CFLAGS_DEBUG_V+=-qrtems_debug
 endif
 
-# when debugging, optimize flag: typically empty
-# some compilers do allow optimization with their "-g"
-CFLAGS_DEBUG_OPTIMIZE_V=-g
-
 # profile flag; use gprof(1)
 CFLAGS_PROFILE_V=-pg
 
diff --git a/make/custom/dmv177.cfg b/make/custom/dmv177.cfg
index 4f42ef6e81..73f2042a5e 100644
--- a/make/custom/dmv177.cfg
+++ b/make/custom/dmv177.cfg
@@ -84,7 +84,6 @@ endef
 #  and (hopefully) optimize for it. 
 #
 CPU_CFLAGS = -mcpu=603
-#CFLAGS_DEBUG_OPTIMIZE_V=
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
diff --git a/make/custom/simhppa.cfg b/make/custom/simhppa.cfg
index 93e25b0f9c..ed5de71bda 100644
--- a/make/custom/simhppa.cfg
+++ b/make/custom/simhppa.cfg
@@ -125,10 +125,6 @@ define make-exe
 endef
 endif
 
-define make-rel
-	$(LDARGS) $(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $(OBJS)
-endef
-
 # Miscellaneous additions go here
 
 # BSP-specific tools
diff --git a/make/leaf.cfg b/make/leaf.cfg
index a8b90ee1f1..a4f29aa6ef 100644
--- a/make/leaf.cfg
+++ b/make/leaf.cfg
@@ -49,7 +49,7 @@ ifndef AUTOMAKE
 debug:
 	$(MAKE) -f $(MAKEFILE) MAKEFILE=$(MAKEFILE) "ARCH=o-debug" \
       "CFLAGS_DEBUG=$(CFLAGS_DEBUG_V)" \
-      "CFLAGS_OPTIMIZE=$(CFLAGS_DEBUG_OPTIMIZE_V)" \
+      "CFLAGS_OPTIMIZE=$(CFLAGS_OPTIMIZE_V)" \
       "LDFLAGS_DEBUG=$(LDFLAGS_DEBUG_V)" $(TARGET_VA)
 
 profile: