From 4c9c56bc0299b70bf1213d46946a0f8a066a26f6 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 19 Jun 2014 16:03:34 +0200
Subject: [PATCH] 4.9.0-12

---
 .gitignore          |  1 +
 gcc.spec            | 16 +++++++++-------
 gcc49-pr61545.patch | 10 ----------
 sources             |  2 +-
 4 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 gcc49-pr61545.patch

diff --git a/.gitignore b/.gitignore
index a04b5d5..a27c37c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /gcc-4.9.0-20140604.tar.bz2
 /gcc-4.9.0-20140612.tar.bz2
 /gcc-4.9.0-20140617.tar.bz2
+/gcc-4.9.0-20140619.tar.bz2
diff --git a/gcc.spec b/gcc.spec
index e3dcaec..963414a 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,9 +1,9 @@
-%global DATE 20140617
-%global SVNREV 211744
+%global DATE 20140619
+%global SVNREV 211824
 %global gcc_version 4.9.0
 # 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 11
+%global gcc_release 12
 %global _unpackaged_files_terminate_build 0
 %global _performance_build 1
 %global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64
@@ -196,7 +196,6 @@ Patch12: gcc49-no-add-needed.patch
 Patch14: gcc49-pr56493.patch
 Patch15: gcc49-color-auto.patch
 Patch16: gcc49-libgo-p224.patch
-Patch17: gcc49-pr61545.patch
 
 Patch1100: cloog-%{cloog_version}-ppc64le-config.patch
 
@@ -722,7 +721,6 @@ package or when debugging this package.
 %patch15 -p0 -b .color-auto~
 %endif
 %patch16 -p0 -b .libgo-p224~
-%patch17 -p1 -b .pr61545~
 rm -f libgo/go/crypto/elliptic/p224{,_test}.go
 
 %if 0%{?_enable_debug_packages}
@@ -2784,11 +2782,15 @@ fi
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
 
 %changelog
+* Thu Jun 19 2014 Jakub Jelinek <jakub@redhat.com> 4.9.0-12
+- update from the 4.9 branch
+  - PRs c++/59296, c++/60605, c++/61507, debug/57519
+
 * Wed Jun 18 2014 Kyle McMartin <kyle@redhat.com> 4.9.0-11
-- Avoid applying patch 16 twice.
+- avoid applying patch 16 twice
 
 * Wed Jun 18 2014 Richard Henderson <rth@redhat.com>
-- Import fix for target/pr61545 from the 4.9 branch.
+- import fix for PR target/61545 from the 4.9 branch
 
 * Tue Jun 17 2014 Jakub Jelinek <jakub@redhat.com> 4.9.0-10
 - update from the 4.9 branch
diff --git a/gcc49-pr61545.patch b/gcc49-pr61545.patch
deleted file mode 100644
index 41f51ff..0000000
--- a/gcc49-pr61545.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gcc-4.9.0-20140617/gcc/config/aarch64/aarch64.md.orig	2014-03-28 12:50:00.000000000 -0700
-+++ gcc-4.9.0-20140617/gcc/config/aarch64/aarch64.md	2014-06-18 10:07:37.715495580 -0700
-@@ -3608,6 +3608,7 @@
-         (unspec:DI [(match_operand:DI 0 "aarch64_valid_symref" "S")]
- 		   UNSPEC_TLSDESC))
-    (clobber (reg:DI LR_REGNUM))
-+   (clobber (reg:CC CC_REGNUM))
-    (clobber (match_scratch:DI 1 "=r"))]
-   "TARGET_TLS_DESC"
-   "adrp\\tx0, %A0\;ldr\\t%1, [x0, #%L0]\;add\\tx0, x0, %L0\;.tlsdesccall\\t%0\;blr\\t%1"
diff --git a/sources b/sources
index 1668007..0ab3cf2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 e34fca0540d840e5d0f6427e98c92252  cloog-0.18.1.tar.gz
-1d5e25a7e86133f27bad3c5f3db23338  gcc-4.9.0-20140617.tar.bz2
+374a8c2a57ecc9bef10c26375e62667e  gcc-4.9.0-20140619.tar.bz2
 e039bfcfb6c2ab039b8ee69bf883e824  isl-0.12.2.tar.bz2