3 files changed, 5 insertions, 45 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc
index 9ed3e09dbd..d61eca7672 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
@@ -2,11 +2,11 @@ require gcc-common.inc
 
 # Third digit in PV should be incremented after a minor release
 
-PV = "4.9.2"
+PV = "4.9.3"
 
 # BINV should be incremented to a revision after a minor gcc release
 
-BINV = "4.9.2"
+BINV = "4.9.3"
 
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-4.9:"
 
@@ -77,11 +77,10 @@ SRC_URI = "\
     file://0059-gcc-PR-rtl-optimization-63348.patch \
     file://0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch \
     file://0061-target-gcc-includedir.patch \
-    file://0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch \
-    file://0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
+    file://0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
 "
-SRC_URI[md5sum] = "4df8ee253b7f3863ad0b86359cd39c43"
-SRC_URI[sha256sum] = "2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd"
+SRC_URI[md5sum] = "6f831b4d251872736e8e9cc09746f327"
+SRC_URI[sha256sum] = "2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e"
 
 S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
 B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-4.9/0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
index c48bd48478..c48bd48478 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.9/0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch b/meta/recipes-devtools/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch
deleted file mode 100644
index c0ea62f0ef..0000000000
--- a/meta/recipes-devtools/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b30ffb8097749fdb55704aa7d8307ca1a58255d6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de>
-Date: Tue, 7 Apr 2015 16:15:11 +0200
-Subject: [PATCH] gcc/var-tracking.c: backport from gcc trunk r212178
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-resolves a bug seen on cortexa8 building qt5 libraries.
-
-2014-06-30  Joseph Myers  <joseph@codesourcery.com>
-
-    * var-tracking.c (add_stores): Return instead of asserting if old
-    and new values for conditional store are the same.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212178 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
----
- gcc/var-tracking.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
-index 65d8285..7c38910 100644
---- a/gcc/var-tracking.c
-+++ b/gcc/var-tracking.c
-@@ -5997,7 +5997,8 @@ add_stores (rtx loc, const_rtx expr, void *cuip)
-     {
-       cselib_val *oval = cselib_lookup (oloc, GET_MODE (oloc), 0, VOIDmode);
- 
--      gcc_assert (oval != v);
-+      if (oval == v)
-+        return;
-       gcc_assert (REG_P (oloc) || MEM_P (oloc));
- 
-       if (oval && !cselib_preserved_value_p (oval))
--- 
-1.9.1
-