--- szip-2.0/config/gnu-flags.orig	2004-03-16 17:14:13.000000000 +0100
+++ szip-2.0/config/gnu-flags	2005-02-27 22:25:15.841670040 +0100
@@ -89,26 +89,6 @@
 
 fi
 
-# Architecture-specific flags
-case "$host_os-$host_cpu" in
-    # FreeBSD sets the information from "hostname -m" to the general machine
-    # architecture, not the specific CPU for the machine, so even our
-    # Pentium II Xeon server is set to "i386".  Once we know we are on a FreeBSD
-    # machine, use the "sysctl" command to get the CPU hardware model.
-    freebsd*)
-        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*|*III*|*IV*|*Athlon*)
-                ARCH=${ARCH:="-march=i686"}
-            ;;
-        esac
-        ;;
-
-    *-i686)
-        ARCH=${ARCH:="-march=i686"}
-        ;;
-esac
 
 # Host-specific flags
 case "`hostname`" in
@@ -131,7 +111,7 @@
 	# Production
         case "$cc_vendor-$cc_version" in
             gcc-2.95.[34])
-                PROD_CFLAGS="-O3 $NOFP"
+                PROD_CFLAGS="$NOFP"
                 ;;
             gcc-3.[0-3]*)
                 # The optimization level is reduced for gcc 3.* due to problems
@@ -140,14 +120,14 @@
                 # 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="$NOFP"
                 ;;
             gcc-3*)
                 # Be optimistic about future versions of gcc.. :-) - QAK - 2003/10/20
-                PROD_CFLAGS="-O3 $NOFP"
+                PROD_CFLAGS="$NOFP"
                 ;;
             *)
-                PROD_CFLAGS="-O $NOFP -finline-functions"
+                PROD_CFLAGS="$NOFP -finline-functions"
                 ;;
         esac
 	PROD_CPPFLAGS=
--- szip-2.0/config/ia64-linux-gnu.orig	2004-03-16 17:14:14.000000000 +0100
+++ szip-2.0/config/ia64-linux-gnu	2005-02-27 22:25:38.008300200 +0100
@@ -18,7 +18,7 @@
 case $CC_BASENAME in
     ecc)
 	CFLAGS="$CFLAGS -std=c99 -w2 -Wall"
-	DEBUG_CFLAGS="-g -O0"
+	DEBUG_CFLAGS="-g"
 	DEBUG_CPPFLAGS=
 	PROD_CFLAGS=""		# ecc has -O2 as default
 	PROD_CPPFLAGS=
@@ -34,7 +34,7 @@
 	CFLAGS="$CFLAGS -ansi"
 	DEBUG_CFLAGS="-g"
 	DEBUG_CPPFLAGS=
-	PROD_CFLAGS="-O"
+	PROD_CFLAGS=
 	PROD_CPPFLAGS=
 	PROFILE_CFLAGS="-pg"
 	PROFILE_CPPFLAGS=