[svn-r9408] Purpose:

    Code cleanup/bug fix

Description:
    Remove the undocumented "$NOFP" shell variable which would allow production
builds without removing the stack frame.  This was cascading between C and
FORTRAN builds and causing problems.

Solution:
    Hard-code removing the stack frame for now.  Users would have needed to
read the configure scripts anyway, so there's not really much benefit to the
extra knob.  Users who need this functionality (production builds with stack
frames) are debugging probably, so they will need to modify the script and
build their own version of the library now.

Platforms tested:
    Linux 2.4 (verbena)
    Too minor to require h5committest

5 files changed, 7 insertions, 29 deletions

diff --git a/fortran/config/gnu-flags b/fortran/config/gnu-flags
index 8e543db..cb2e028 100644
--- a/fortran/config/gnu-flags
+++ b/fortran/config/gnu-flags
@@ -125,13 +125,9 @@ case "$cc_vendor-$cc_version" in
     CFLAGS="$CFLAGS $arch -ansi -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline"
 
     # Production
-
-    # Omit frame pointer for optimized code?
-    NOFP=${NOFP:=-fomit-frame-pointer}
-
     case "$cc_vendor-$cc_version" in
       gcc-2.95.[34])
-        PROD_CFLAGS="-O3 $NOFP"
+        PROD_CFLAGS="-O3"
         ;;
       gcc-3.[0-4]*)
         # The optimization level is reduced for gcc 3.* due to problems
@@ -140,18 +136,18 @@ case "$cc_vendor-$cc_version" in
         # failures for various integer types -> long long conversions in the
         # test/dtypes test).  Perhaps later versions of gcc will fix this
         # bug... - QAK - 2003/10/20
-        PROD_CFLAGS="-O $NOFP"
+        PROD_CFLAGS="-O"
         ;;
       gcc-3*)
         # Be optimistic about future versions of gcc.. :-) - QAK - 2003/10/20
-        PROD_CFLAGS="-O3 $NOFP"
+        PROD_CFLAGS="-O3"
         ;;
       *)
-        PROD_CFLAGS="-O $NOFP"
+        PROD_CFLAGS="-O"
         ;;
     esac
 
-    PROD_CFLAGS="$PROD_CFLAGS -finline-functions"
+    PROD_CFLAGS="$PROD_CFLAGS -fomit-frame-pointer -finline-functions"
     PROD_CPPFLAGS=
 
     # Debug
diff --git a/fortran/config/intel-fflags b/fortran/config/intel-fflags
index 77dd1c5..00e24b5 100644
--- a/fortran/config/intel-fflags
+++ b/fortran/config/intel-fflags
@@ -60,11 +60,6 @@ if test "X-ifort" = "X-$f9x_vendor"; then
     FFLAGS="$FFLAGS"
 
     # Production
-
-    # Omit frame pointer for optimized code?
-    #NOFP=${NOFP:=-Mnoframe}
-
-    #PROD_FFLAGS="-O3 $NOFP"
     PROD_FFLAGS="-O3"
 
     # Debug
diff --git a/fortran/config/intel-flags b/fortran/config/intel-flags
index d04c112..37af160 100644
--- a/fortran/config/intel-flags
+++ b/fortran/config/intel-flags
@@ -56,11 +56,6 @@ if test "X-icc" = "X-$cc_vendor"; then
     CFLAGS="$CFLAGS $arch -Wall -Wcheck"
 
     # Production
-
-    # Omit frame pointer for optimized code?
-    #NOFP=${NOFP:=-Mnoframe}
-
-    #PROD_CFLAGS="-O3 $NOFP"
     PROD_CFLAGS="-O3"
     PROD_CPPFLAGS=
 
diff --git a/fortran/config/pgi-fflags b/fortran/config/pgi-fflags
index ea59c2d..e617db6 100644
--- a/fortran/config/pgi-fflags
+++ b/fortran/config/pgi-fflags
@@ -59,11 +59,7 @@ if test "X-pgf90" = "X-$f9x_vendor"; then
     FFLAGS="$FFLAGS -Mdclchk -Mstandard -Minform,warn"
 
     # Production
-
-    # Omit frame pointer for optimized code?
-    NOFP=${NOFP:=-Mnoframe}
-
-    PROD_FFLAGS="-fast -s $NOFP"
+    PROD_FFLAGS="-fast -s -Mnoframe"
 
     # Debug
     DEBUG_FFLAGS="-g -Mbounds -Mchkfpstk -Mchkptr"
diff --git a/fortran/config/pgi-flags b/fortran/config/pgi-flags
index ed49d86..67e3af8 100644
--- a/fortran/config/pgi-flags
+++ b/fortran/config/pgi-flags
@@ -56,11 +56,7 @@ if test "X-pgcc" = "X-$cc_vendor"; then
     CFLAGS="$CFLAGS $arch -Minform,warn"
 
     # Production
-
-    # Omit frame pointer for optimized code?
-    NOFP=${NOFP:=-Mnoframe}
-
-    PROD_CFLAGS="-fast -s $NOFP"
+    PROD_CFLAGS="-fast -s -Mnoframe"
     PROD_CPPFLAGS=
 
     # Debug