[compat-gcc-296] 2.96-146

[Jakub Jelinek]

commit c87a6a163fb1ad7dbbb0f08647b29e96c5da53be
Author: Jakub Jelinek <jakub at redhat.com>
Date:   Mon Jul 7 17:43:20 2014 +0200

    2.96-146

 compat-gcc-296.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/compat-gcc-296.spec b/compat-gcc-296.spec
index b5bd682..826b74e 100644
--- a/compat-gcc-296.spec
+++ b/compat-gcc-296.spec
@@ -1,10 +1,10 @@
 %define DATE 20000731
 %define gcc_version 2.96
-%define gcc_release 145
+%define gcc_release 146
 Summary: 2.96-RH compatibility libraries
 Name: compat-gcc-296
 Version: %{gcc_version}
-Release: %{gcc_release}.2
+Release: %{gcc_release}
 License: GPLv2+
 Group: Development/Languages
 ExclusiveArch: %{ix86} ia64 ppc
@@ -999,7 +999,9 @@ OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'`
 %endif
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Wall//g' -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fexceptions//g' -e 's/-fasynchronous-unwind-tables//g'`
-OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fstack-protector//g' -e 's/--param=ssp-buffer-size=[0-9]*//g'`
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fstack-protector\(-strong\)\?//g'`
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/--param=ssp-buffer-size=[0-9]*//g'`
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-grecord-gcc-switches//g' -e 's/-Werror=format-security//g'`
 %ifarch ia64
 rm -f ../gcc/ChangeLog*.ia64
 %endif
@@ -1084,6 +1086,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o
 
 %changelog
+* Mon Jul  7 2014 Jakub Jelinek  <jakub at redhat.com> 2.96-146
+- fix build on Fedora21+ (#1106075)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.96-145.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild