[compat-gcc-34] 3.4.6-34

[Jakub Jelinek]

commit adddf50a0b20a2ce8d9dfa7d2047161216ada55f
Author: Jakub Jelinek <jakub at redhat.com>
Date:   Mon Sep 22 17:33:37 2014 +0200

    3.4.6-34

 compat-gcc-34.spec |    9 ++++++---
 gcc34-bison.patch  |   20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/compat-gcc-34.spec b/compat-gcc-34.spec
index 7f1efd0..ec4af52 100644
--- a/compat-gcc-34.spec
+++ b/compat-gcc-34.spec
@@ -16,7 +16,7 @@
 Summary: Compatibility GNU Compiler Collection
 Name: compat-gcc-34
 Version: 3.4.6
-Release: 33%{?dist}
+Release: 34%{?dist}
 # libgcc and crtstuff have an exception which allows
 # linking it into any kind of programs or shared libraries without
 # restrictions.
@@ -119,6 +119,7 @@ Patch100: gcc34-ldbl-hack.patch
 Patch101: gcc34-makeinfo.patch
 Patch102: gcc34-bison4.patch
 Patch103: gcc34-pr56258.patch
+Patch104: gcc34-bison.patch
 
 %define _gnu %{nil}
 %ifarch sparc sparcv9
@@ -237,8 +238,9 @@ Fortran 77 dynamically linked programs.
 
 %patch100 -p0 -b .ldbl-hack~
 %patch101 -p0 -b .makeinfo~
-%patch102 -p0 -b .bison4
+%patch102 -p0 -b .bison4~
 %patch103 -p0 -b .pr56258~
+%patch104 -p0 -b .bison~
 
 sed -i -e 's/struct siginfo/siginfo_t/' gcc/config/*/linux*.h
 
@@ -687,6 +689,7 @@ fi
 %changelog
 * Mon Sep 22 2014 Jakub Jelinek  <jakub at redhat.com> 3.4.6-34
 - don't conflict with libstdc++ 4.9.x, it is still backwards ABI compatible
+- fix build on F21+
 
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.6-33
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@@ -695,7 +698,7 @@ fi
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
 * Mon Aug 19 2013 Peter Robinson <pbrobinson at fedoraproject.org> 3.4.6-31
-- Exlclude ARM as HFP was not supported until gcc 4.5
+- Exclude ARM as HFP was not supported until gcc 4.5
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.6-30
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/gcc34-bison.patch b/gcc34-bison.patch
new file mode 100644
index 0000000..ff5803d
--- /dev/null
+++ b/gcc34-bison.patch
@@ -0,0 +1,20 @@
+--- gcc/c-parse.in.jj	2005-11-21 14:43:19.000000000 +0100
++++ gcc/c-parse.in	2014-09-22 17:31:14.696458883 +0200
+@@ -635,7 +635,7 @@ primary:
+ 	IDENTIFIER
+ 		{
+ 		  if (yychar == YYEMPTY)
+-		    yychar = YYLEX;
++		    yychar = yylex ();
+ 		  $$ = build_external_ref ($1, yychar == '(');
+ 		}
+ 	| CONSTANT
+@@ -2227,7 +2227,7 @@ do_stmt_start:
+ 
+ save_location:
+ 		{ if (yychar == YYEMPTY)
+-		    yychar = YYLEX;
++		    yychar = yylex ();
+ 		  $$ = input_location; }
+ 	;
+