From 7e02d2d2d412d52d2696d2bc68328d57ccbff690 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@fedoraproject.org>
Date: Thu, 29 Mar 2007 10:46:10 +0000
Subject: [PATCH] 4.1.2-7

---
 .cvsignore |  2 +-
 gcc41.spec | 11 +++++++++--
 sources    |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 600af4d..dcb017b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gcc-4.1.2-20070327.tar.bz2
+gcc-4.1.2-20070329.tar.bz2
diff --git a/gcc41.spec b/gcc41.spec
index b9e8cc8..288b319 100644
--- a/gcc41.spec
+++ b/gcc41.spec
@@ -1,6 +1,6 @@
-%define DATE 20070327
+%define DATE 20070329
 %define gcc_version 4.1.2
-%define gcc_release 6
+%define gcc_release 7
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -145,6 +145,7 @@ Patch33: gcc41-pr30863.patch
 Patch34: gcc41-java-bogus-debugline.patch
 Patch35: gcc41-libffi-selinux.patch
 Patch36: gcc41-libjava-visibility.patch
+Patch37: gcc41-pr30847.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -457,6 +458,7 @@ which are required to run programs compiled with the GNAT.
 %patch34 -p0 -b .java-bogus-debugline~
 %patch35 -p0 -b .libffi-selinux~
 #%patch36 -p0 -b .libjava-visibility~
+%patch37 -p0 -b .pr30847~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1386,6 +1388,7 @@ fi
 %{_mandir}/man1/gcj.1*
 %{_mandir}/man1/jcf-dump.1*
 %{_mandir}/man1/gjavah.1*
+%{_mandir}/man1/gcjh.1*
 %{_infodir}/gcj*
 %dir %{_prefix}/libexec/gcc
 %dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
@@ -1579,6 +1582,10 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Mar 29 2007 Jakub Jelinek <jakub@redhat.com> 4.1.2-7
+- make sure boehm-gc doesn't use PROT_EXEC (#202209)
+- fix C++ ICE on i ? j : k = (void) 0; (PR c++/30847)
+
 * Tue Mar 27 2007 Jakub Jelinek <jakub@redhat.com> 4.1.2-6
 - update from gcc-4_1-branch (-r123011:123245)
   - PRs fortran/31184, target/31245, tree-optimization/30590
diff --git a/sources b/sources
index 1ba155f..e2af51f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52e0d3ac7387126916b31fe65d188d9c  gcc-4.1.2-20070327.tar.bz2
+f49aa680623a3ef46ff411d61f4a3f99  gcc-4.1.2-20070329.tar.bz2