From e0177fbbb9e6022466f8342ff3569c589ec8f8bd Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@fedoraproject.org>
Date: Feb 11 2006 09:19:33 +0000
Subject: 3.2.3-55.fc5


---

diff --git a/compat-gcc-32.spec b/compat-gcc-32.spec
index a195ea6..7c828c3 100644
--- a/compat-gcc-32.spec
+++ b/compat-gcc-32.spec
@@ -2,7 +2,7 @@ ExcludeArch: s390x
 %define LIBSTDCXXDATE 20040818
 %define DATE 20040701
 %define gcc_version 3.2.3
-%define gcc_release 54.fc5
+%define gcc_release 55.fc5
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define build_java 0
@@ -21,7 +21,7 @@ ExcludeArch: s390x
 Summary: The compatibility GNU Compiler Collection
 Name: compat-gcc-32
 Version: %{gcc_version}
-Release: %{gcc_release}.2
+Release: %{gcc_release}
 License: GPL
 Group: Development/Languages
 Source0: gcc-%{gcc_version}-%{DATE}.tar.bz2
@@ -271,9 +271,11 @@ OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g'
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'`
 %ifarch %{ix86}
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mtune=pentium4/-mcpu=i686/g'`
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mtune=generic/-mcpu=i686/g'`
 %endif
 %ifarch x86_64
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mtune=nocona//g'`
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mtune=generic//g'`
 %endif
 %ifarch sparc sparc64
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'`
@@ -634,6 +636,10 @@ fi
 %{_prefix}/%{_lib}/libg2c.so.0*
 
 %changelog
+* Sat Feb 11 2006 Jakub Jelinek  <jakub@redhat.com> 3.2.3-55.fc5
+- replace -mtune=generic in $RPM_OPT_FLAGS with something that
+  GCC 3.2.3 groks
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 3.2.3-54.fc5.2
 - bump again for double-long bug on ppc(64)