[gcc] 4.9.1-3

[Jakub Jelinek]

commit cc749386409d1d368ad868d6adad6195b69601ca
Author: Jakub Jelinek <jakub at redhat.com>
Date:   Fri Aug 1 11:39:33 2014 +0200

    4.9.1-3

 .gitignore                    |    1 +
 gcc.spec                      |   26 +++++++++++++++-----------
 gcc49-aarch64-GNU_STACK.patch |   13 -------------
 gcc49-rh1117799.patch         |   21 +++++----------------
 sources                       |    2 +-
 5 files changed, 22 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ddfe5c3..4c566c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /gcc-4.9.0-20140702.tar.bz2
 /gcc-4.9.1-20140716.tar.bz2
 /gcc-4.9.1-20140717.tar.bz2
+/gcc-4.9.1-20140801.tar.bz2
diff --git a/gcc.spec b/gcc.spec
index a145392..1879618 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,9 +1,9 @@
-%global DATE 20140717
-%global SVNREV 212747
+%global DATE 20140801
+%global SVNREV 213428
 %global gcc_version 4.9.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 2
+%global gcc_release 3
 %global _unpackaged_files_terminate_build 0
 %global _performance_build 1
 %global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64
@@ -79,7 +79,7 @@
 Summary: Various compilers (C, C++, Objective-C, Java, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{gcc_release}%{?dist}.1
+Release: %{gcc_release}%{?dist}
 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have
 # GCC Runtime Exception.
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
@@ -197,10 +197,7 @@ Patch14: gcc49-pr56493.patch
 Patch15: gcc49-color-auto.patch
 Patch16: gcc49-libgo-p224.patch
 Patch17: gcc49-aarch64-async-unw-tables.patch
-Patch18: gcc49-aarch64-GNU_STACK.patch
-
-# backport from trunk
-Patch100: gcc49-rh1117799.patch
+Patch18: gcc49-rh1117799.patch
 
 Patch1100: cloog-%{cloog_version}-ppc64le-config.patch
 
@@ -728,8 +725,7 @@ package or when debugging this package.
 %patch16 -p0 -b .libgo-p224~
 rm -f libgo/go/crypto/elliptic/p224{,_test}.go
 %patch17 -p0 -b .aarch64-async-unw-tables~
-%patch18 -p0 -b .aarch64-GNU_STACK~
-%patch100 -p1 -b .rh1117799~
+%patch18 -p0 -b .rh1117799~
 
 %if 0%{?_enable_debug_packages}
 cat > split-debuginfo.sh <<\EOF
@@ -2802,8 +2798,16 @@ fi
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
 
 %changelog
+* Fri Aug  1 2014 Jakub Jelinek <jakub at redhat.com> 4.9.1-3
+- update from the 4.9 branch
+  - PRs fortran/61780, libobjc/61920, libstdc++/60037, target/47230,
+	target/61656, target/61662, target/61794, target/61844,
+	target/61855, tree-optimization/61964
+  - fix libgfortran overflows on allocation (CVE-2014-5044)
+- backport -fsanitize=alignment support from the trunk
+
 * Thu Jul 24 2014 Dan Horák <dan[at]danny.cz> 4.9.1-2.1
-- update from trunk with fix for #1117799
+- fix a LRA inheritance bug (#1117799)
 
 * Thu Jul 17 2014 Jakub Jelinek <jakub at redhat.com> 4.9.1-2
 - update from the 4.9 branch
diff --git a/gcc49-rh1117799.patch b/gcc49-rh1117799.patch
index 31212ce..1854136 100644
--- a/gcc49-rh1117799.patch
+++ b/gcc49-rh1117799.patch
@@ -1,21 +1,10 @@
-commit ef76edc2e27e49e7e148894948c8dda394b796c1
-Author: vmakarov <vmakarov at 138bc75d-0d04-0410-961f-82ee72b054a4>
-Date:   Fri Jul 11 17:19:53 2014 +0000
-
-    2014-07-11  Vladimir Makarov  <vmakarov at redhat.com>
-    
-    	* lra-constraints.c (remove_inheritance_pseudos): Process
-    	destination pseudo too.
-    
-    
+2014-07-11  Vladimir Makarov  <vmakarov at redhat.com>
     
-    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212464 138bc75d-0d04-0410-961f-82ee72b054a4
+	* lra-constraints.c (remove_inheritance_pseudos): Process
+	destination pseudo too.
 
- 	* gcov-tool.c (gcov_output_files): Fix build error introduced in
-diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
-index baed7e7..a43f8dc 100644
---- a/gcc/lra-constraints.c
-+++ b/gcc/lra-constraints.c
+--- gcc/lra-constraints.c
++++ gcc/lra-constraints.c
 @@ -5697,6 +5697,20 @@ remove_inheritance_pseudos (bitmap remove_pseudos)
  			SUBREG_REG (SET_SRC (set)) = SET_SRC (prev_set);
  		      else
diff --git a/sources b/sources
index a6cce97..9b2490d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 e34fca0540d840e5d0f6427e98c92252  cloog-0.18.1.tar.gz
-0f7586f719b329cfc5e03005e902e9b6  gcc-4.9.1-20140717.tar.bz2
+9b668671275b7e86cd3f655a4c52b4e0  gcc-4.9.1-20140801.tar.bz2
 e039bfcfb6c2ab039b8ee69bf883e824  isl-0.12.2.tar.bz2