[svn-r6876] Purpose:

    Code cleanup

Description:
    Remove special optimization and debugging flags for obsolete versions of
gcc.

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    h5committest not needed.

1 files changed, 11 insertions, 68 deletions

diff --git a/config/gnu-flags b/config/gnu-flags
index 34f140d..7833aaf 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -86,29 +86,14 @@ case "$host_os-$host_cpu" in
         host_cpu_model=`sysctl -n hw.model`
         case "$host_cpu_model" in
             # Hmm.. this might not catch Celerons, but it won't hurt them either...
-            *Pro*|*II*)
-                # This check should be kept in sync with the *-i686 check below
-                case "$cc_vendor-$cc_version" in
-                    gcc-2.95*|gcc-3*)
-                        ARCH=${ARCH:="-march=i686"}
-                        ;;
-                    gcc-*|egcs-*|pgcc-*)
-                        ARCH=${ARCH:="-mcpu=pentiumpro -march=pentiumpro"}
-                        ;;
-                esac
+            *Pro*|*II*|*III*|*IV*|*Athlon*)
+                ARCH=${ARCH:="-march=i686"}
             ;;
         esac
         ;;
 
     *-i686)
-        case "$cc_vendor-$cc_version" in
-            gcc-2.9[56]*|gcc-3*)
-                ARCH=${ARCH:="-march=i686"}
-                ;;
-            gcc-*|egcs-*|pgcc-*)
-                ARCH=${ARCH:="-mcpu=pentiumpro -march=pentiumpro"}
-                ;;
-        esac
+        ARCH=${ARCH:="-march=i686"}
         ;;
 esac
 
@@ -116,7 +101,7 @@ esac
 case "`hostname`" in
     sleipnir.ncsa.uiuc.edu)
 #        case "$cc_vendor-$cc_version" in
-#            gcc-3.2*)
+#            gcc-3*)
 #                ARCH="`echo $ARCH | sed -e 's/i686/athlon-mp/g'`"
 #            ;;
 #        esac
@@ -132,7 +117,7 @@ case "$cc_vendor-$cc_version" in
 
 	# Production
         case "$cc_vendor-$cc_version" in
-            gcc-2.95.3|gcc-2.95.4|gcc-3*)
+            gcc-2.95.[34]|gcc-3*)
                 PROD_CFLAGS="-O3 $NOFP"
                 ;;
             *)
@@ -153,44 +138,10 @@ case "$cc_vendor-$cc_version" in
 esac
 
 # Version specific GCC flags
+#
+# Please follow the pattern below by adding new versions at the top, copying
+# the information from the previous version and adding modifications to that.
 case "$cc_vendor-$cc_version" in
-    gcc-2.7*)
-        # No changes from default GCC flags...
-
-	# Flags are set
-	cc_flags_set=yes
-	;;
-
-    gcc-2.8*)
-        # General
-        # No changes from default GCC flags...
-
-	# Production
-	PROD_CFLAGS="$PROD_CFLAGS -fschedule-insns2"
-
-	# Flags are set
-	cc_flags_set=yes
-	;;
-
-    egcs-2.*|pgcc-2.*)
-	# General
-	CFLAGS="$CFLAGS $ARCH -Wsign-compare"
-
-	# Production
-	PROD_CFLAGS="-O6 $NOFP"
-
-	# Flags are set
-	cc_flags_set=yes
-	;;
-
-    gcc-2.95*)
-        # Append some extra warning flags that only gcc2.95+ know about
-	CFLAGS="$CFLAGS -Wno-long-long"
-
-	# Flags are set
-	cc_flags_set=yes
-	;;
-
     gcc-3.3*)
         # Replace -ansi flag with -std=c99 flag
 	CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
@@ -252,17 +203,9 @@ case "$cc_vendor-$cc_version" in
 	cc_flags_set=yes
 	;;
 
-    gcc-*|egcs-*|pgcc-*)
-        # This must be some other GNU compiler that we don't know about.
-        # Just use fairly generic flags.
-
-	# Production
-	PROD_CFLAGS=-O
-	PROD_CPPFLAGS=
-
-	# Debug
-	DEBUG_CFLAGS=-g
-	DEBUG_CPPFLAGS=
+    gcc-2.95*)
+        # Append some extra warning flags that only gcc2.95+ know about
+	CFLAGS="$CFLAGS -Wno-long-long"
 
 	# Flags are set
 	cc_flags_set=yes