From f7868613d41df845b21f6666ae7f4deceaf2a0e5 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@fedoraproject.org>
Date: Mon, 19 Jun 2006 21:02:26 +0000
Subject: [PATCH] 4.1.1-4

---
 .cvsignore |  2 +-
 gcc41.spec | 23 +++++++++++++++++------
 sources    |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 30e9b4a..4bbc82c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gcc-4.1.1-20060612.tar.bz2
+gcc-4.1.1-20060619.tar.bz2
diff --git a/gcc41.spec b/gcc41.spec
index 038e7c7..5a78cc7 100644
--- a/gcc41.spec
+++ b/gcc41.spec
@@ -1,6 +1,6 @@
-%define DATE 20060612
+%define DATE 20060619
 %define gcc_version 4.1.1
-%define gcc_release 3
+%define gcc_release 4
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -123,8 +123,8 @@ Patch21: gcc41-pr25874.patch
 Patch22: gcc41-pr26881.patch
 Patch23: gcc41-pr27793.patch
 Patch24: gcc41-pr26885.patch
-Patch25: gcc41-fortran-merge-glitch.patch
-Patch26: gcc41-pr27959.patch
+Patch25: gcc41-libgomp-critical.patch
+Patch26: gcc41-merge-all-constants.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -427,8 +427,8 @@ which are required to run programs compiled with the GNAT.
 %patch22 -p0 -b .pr26881~
 %patch23 -p0 -b .pr27793~
 %patch24 -p0 -b .pr26885~
-%patch25 -p0 -b .fortran-merge-glitch~
-%patch26 -p0 -b .pr27959~
+%patch25 -p0 -b .libgomp-critical~
+%patch26 -p0 -b .merge-all-constants~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1470,6 +1470,17 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Jun 19 2006 Jakub Jelinek <jakub@redhat.com> 4.1.1-4
+- update from gcc-4_1-branch (-r114555:114766)
+  - PRs bootstrap/22541, c++/21210, c++/26559, c++/27227, c++/27648,
+	c++/27665, c++/27666, c++/27689, c++/27884, c++/27933, c++/27951,
+	fortran/27786, java/28024, middle-end/27733, middle-end/27802,
+	target/27858, tree-optimization/27830
+- merge gomp changes from the trunk (-r114642:114643)
+  - PR libgomp/28008
+- fix -fmerge-all-constants
+- fix #pragma omp critical handling if not --enable-linux-futex
+
 * Tue Jun 13 2006 Jakub Jelinek <jakub@redhat.com> 4.1.1-3
 - add BuildRequires for elfutils-devel on ia64
 - fix a reload bug visible on s390x (Andreas Krebbel, #193912,
diff --git a/sources b/sources
index e6475d8..eefa212 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c8d223d158721bcc926b014998d3f3f  gcc-4.1.1-20060612.tar.bz2
+2f40477c2c31cfe5832a96eb006a9f93  gcc-4.1.1-20060619.tar.bz2