From ad39fcd6905bdc39ed99e4b1f48d7ea60e01aea2 Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Wed, 11 Sep 2002 16:31:13 -0500
Subject: [svn-r5919] Purpose:     Cleanup

Description:
    Cleanup gcc cases to be more general about gcc 3.x, now that gcc 3.2 has
    been released.

Platforms tested:
    FreeBSD 4.6 (sleipnir) - not a significant enough change to worry about
    multi-platform testing.
---
 config/gnu-flags | 43 +++++++++++--------------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/config/gnu-flags b/config/gnu-flags
index e89b01d..e2a84c2 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -160,52 +160,35 @@ case "$cc_vendor-$cc_version" in
 	cc_flags_set=yes
 	;;
 
-    gcc-2.95*)
-        # Append some extra warning flags that only gcc2.95+ know about
-	CFLAGS="$CFLAGS -Wno-long-long"
+    egcs-2.*|pgcc-2.*)
+	# General
+	CFLAGS="$CFLAGS $ARCH -Wsign-compare"
+
+	# Production
+	PROD_CFLAGS="-O6 $NOFP"
 
 	# Flags are set
 	cc_flags_set=yes
 	;;
 
-    gcc-3.0*)
-        # Replace -ansi flag with -std=c99 flag
-	CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-        # Append warning flags from gcc-2.95.* case
+    gcc-2.95*)
+        # Append some extra warning flags that only gcc2.95+ know about
 	CFLAGS="$CFLAGS -Wno-long-long"
 
-        # Append some extra warning flags that only gcc3+ know about
-	CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-
 	# Flags are set
 	cc_flags_set=yes
 	;;
 
-    gcc-3.1*)
+    gcc-3*)
         # Replace -ansi flag with -std=c99 flag
 	CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
 
-        # Append warning flags from gcc-2.95* case
+        # Append warning flags from gcc-2.95.* case
 	CFLAGS="$CFLAGS -Wno-long-long"
 
-        # Append warning flags from gcc-3.0* case
+        # Append some extra warning flags that only gcc3+ know about
 	CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
 
-        # Append some extra warning flags that only gcc3.1+ know about
-        # None currently...
-
-	# 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
 	;;
@@ -222,10 +205,6 @@ case "$cc_vendor-$cc_version" in
 	DEBUG_CFLAGS=-g
 	DEBUG_CPPFLAGS=
 
-	# Profile
-	PROFILE_CFLAGS=-pg
-	PROFILE_CPPFLAGS=
-
 	# Flags are set
 	cc_flags_set=yes
 	;;
-- 
cgit v0.12