summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.9.inc11
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.9/0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch (renamed from meta/recipes-devtools/gcc/gcc-4.9/0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch39
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
2 2
3# Third digit in PV should be incremented after a minor release 3# Third digit in PV should be incremented after a minor release
4 4
5PV = "4.9.2" 5PV = "4.9.3"
6 6
7# BINV should be incremented to a revision after a minor gcc release 7# BINV should be incremented to a revision after a minor gcc release
8 8
9BINV = "4.9.2" 9BINV = "4.9.3"
10 10
11FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-4.9:" 11FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-4.9:"
12 12
@@ -77,11 +77,10 @@ SRC_URI = "\
77 file://0059-gcc-PR-rtl-optimization-63348.patch \ 77 file://0059-gcc-PR-rtl-optimization-63348.patch \
78 file://0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch \ 78 file://0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch \
79 file://0061-target-gcc-includedir.patch \ 79 file://0061-target-gcc-includedir.patch \
80 file://0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch \ 80 file://0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
81 file://0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
82" 81"
83SRC_URI[md5sum] = "4df8ee253b7f3863ad0b86359cd39c43" 82SRC_URI[md5sum] = "6f831b4d251872736e8e9cc09746f327"
84SRC_URI[sha256sum] = "2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd" 83SRC_URI[sha256sum] = "2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e"
85 84
86S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" 85S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
87B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" 86B = "${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 @@
1From b30ffb8097749fdb55704aa7d8307ca1a58255d6 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de>
3Date: Tue, 7 Apr 2015 16:15:11 +0200
4Subject: [PATCH] gcc/var-tracking.c: backport from gcc trunk r212178
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9resolves a bug seen on cortexa8 building qt5 libraries.
10
112014-06-30 Joseph Myers <joseph@codesourcery.com>
12
13 * var-tracking.c (add_stores): Return instead of asserting if old
14 and new values for conditional store are the same.
15
16git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212178 138bc75d-0d04-0410-961f-82ee72b054a4
17
18Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
19---
20 gcc/var-tracking.c | 3 ++-
21 1 file changed, 2 insertions(+), 1 deletion(-)
22
23diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
24index 65d8285..7c38910 100644
25--- a/gcc/var-tracking.c
26+++ b/gcc/var-tracking.c
27@@ -5997,7 +5997,8 @@ add_stores (rtx loc, const_rtx expr, void *cuip)
28 {
29 cselib_val *oval = cselib_lookup (oloc, GET_MODE (oloc), 0, VOIDmode);
30
31- gcc_assert (oval != v);
32+ if (oval == v)
33+ return;
34 gcc_assert (REG_P (oloc) || MEM_P (oloc));
35
36 if (oval && !cselib_preserved_value_p (oval))
37--
381.9.1
39