+++ /dev/null
-From 346ee8b5c2bf3bf0f0e681b2df5755f299aa1a68 Mon Sep 17 00:00:00 2001
-From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Thu, 30 Apr 2015 16:31:36 +0000
-Subject: [PATCH] /cp 2015-04-30 Paolo Carlini <paolo.carlini@oracle.com>
-
- PR c++/65801
- * typeck2.c (check_narrowing): In C++11 mode too, -Wno-narrowing
- suppresses the diagnostic.
-
-2015-04-30 Paolo Carlini <paolo.carlini@oracle.com>
-
- PR c++/65801
- * doc/invoke.texi ([-Wnarrowing]): Update.
-
-/testsuite
-2015-04-30 Paolo Carlini <paolo.carlini@oracle.com>
-
- PR c++/65801
- * g++.dg/cpp0x/Wnarrowing2.C: New.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@222636 138bc75d-0d04-0410-961f-82ee72b054a4
----
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
- gcc/ChangeLog | 5 +++++
- gcc/cp/ChangeLog | 6 ++++++
- gcc/cp/typeck2.c | 10 +++++++---
- gcc/doc/invoke.texi | 8 ++++----
- gcc/testsuite/ChangeLog | 5 +++++
- gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C | 5 +++++
- 6 files changed, 32 insertions(+), 7 deletions(-)
- create mode 100644 gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C
-
-diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
-index 80a6939..884957b 100644
---- a/gcc/cp/typeck2.c
-+++ b/gcc/cp/typeck2.c
-@@ -957,9 +957,13 @@ check_narrowing (tree type, tree init, tsubst_flags_t complain)
- }
- }
- else if (complain & tf_error)
-- error_at (EXPR_LOC_OR_LOC (init, input_location),
-- "narrowing conversion of %qE from %qT to %qT inside { }",
-- init, ftype, type);
-+ {
-+ global_dc->pedantic_errors = 1;
-+ pedwarn (EXPR_LOC_OR_LOC (init, input_location), OPT_Wnarrowing,
-+ "narrowing conversion of %qE from %qT to %qT inside { }",
-+ init, ftype, type);
-+ global_dc->pedantic_errors = flag_pedantic_errors;
-+ }
- }
-
- return cxx_dialect == cxx98 || ok;
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 520c2c5..4ef8f7f 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -2703,10 +2703,10 @@ int i = @{ 2.2 @}; // error: narrowing from double to int
-
- This flag is included in @option{-Wall} and @option{-Wc++11-compat}.
-
--With @option{-std=c++11}, @option{-Wno-narrowing} suppresses for
--non-constants the diagnostic required by the standard. Note that this
--does not affect the meaning of well-formed code; narrowing conversions
--are still considered ill-formed in SFINAE context.
-+With @option{-std=c++11}, @option{-Wno-narrowing} suppresses the diagnostic
-+required by the standard. Note that this does not affect the meaning
-+of well-formed code; narrowing conversions are still considered
-+ill-formed in SFINAE context.
-
- @item -Wnoexcept @r{(C++ and Objective-C++ only)}
- @opindex Wnoexcept
-diff --git a/gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C b/gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C
-new file mode 100644
-index 0000000..fc806f9
---- /dev/null
-+++ b/gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C
-@@ -0,0 +1,5 @@
-+// PR c++/65801
-+// { dg-do compile { target c++11 } }
-+// { dg-options "-Wno-narrowing" }
-+
-+static struct zai { unsigned int x; } x = {-1};
---
-2.1.4
-
+++ /dev/null
-From 82e461dc9d53927de7dae667880b63c2d497172d Mon Sep 17 00:00:00 2001
-From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 1 May 2015 18:47:55 +0000
-Subject: [PATCH] /cp 2015-05-01 Paolo Carlini <paolo.carlini@oracle.com>
- Prathamesh Kulharni <prathamesh.kulkarni@linaro.org>
-
- PR c++/65858
- * typeck2.c (check_narrowing): Set ok = true when pedwarn returns
- false.
-
-/testsuite
-2015-05-01 Paolo Carlini <paolo.carlini@oracle.com>
- Prathamesh Kulharni <prathamesh.kulkarni@linaro.org>
-
- PR c++/65858
- * g++.dg/cpp0x/Wnarrowing3.C: New.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@222700 138bc75d-0d04-0410-961f-82ee72b054a4
----
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
- gcc/cp/ChangeLog | 7 +++++++
- gcc/cp/typeck2.c | 7 ++++---
- gcc/testsuite/ChangeLog | 6 ++++++
- gcc/testsuite/g++.dg/cpp0x/Wnarrowing3.C | 6 ++++++
- 4 files changed, 23 insertions(+), 3 deletions(-)
- create mode 100644 gcc/testsuite/g++.dg/cpp0x/Wnarrowing3.C
-
-diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
-index 884957b..9a491aa 100644
---- a/gcc/cp/typeck2.c
-+++ b/gcc/cp/typeck2.c
-@@ -959,9 +959,10 @@ check_narrowing (tree type, tree init, tsubst_flags_t complain)
- else if (complain & tf_error)
- {
- global_dc->pedantic_errors = 1;
-- pedwarn (EXPR_LOC_OR_LOC (init, input_location), OPT_Wnarrowing,
-- "narrowing conversion of %qE from %qT to %qT inside { }",
-- init, ftype, type);
-+ if (!pedwarn (EXPR_LOC_OR_LOC (init, input_location), OPT_Wnarrowing,
-+ "narrowing conversion of %qE from %qT to %qT "
-+ "inside { }", init, ftype, type))
-+ ok = true;
- global_dc->pedantic_errors = flag_pedantic_errors;
- }
- }
-diff --git a/gcc/testsuite/g++.dg/cpp0x/Wnarrowing3.C b/gcc/testsuite/g++.dg/cpp0x/Wnarrowing3.C
-new file mode 100644
-index 0000000..d2dd383
---- /dev/null
-+++ b/gcc/testsuite/g++.dg/cpp0x/Wnarrowing3.C
-@@ -0,0 +1,6 @@
-+// PR c++/65858
-+// { dg-do compile { target c++11 } }
-+// { dg-require-effective-target lto }
-+// { dg-options "-flto -Wno-narrowing" }
-+
-+int x { 0.5 };
---
-2.1.4
-
+++ /dev/null
-From 3b1253116b7cb98da33c997bffa5fa2616aee40a Mon Sep 17 00:00:00 2001
-From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Mon, 4 May 2015 20:59:03 +0000
-Subject: [PATCH] /cp 2015-05-04 Paolo Carlini <paolo.carlini@oracle.com>
- Jakub Jelinek <jakub@redhat.com>
-
- PR c++/66007
- * typeck2.c (check_narrowing): Check by-hand that the pedwarn didn't
- result in an actual error.
-
-/testsuite
-2015-05-04 Paolo Carlini <paolo.carlini@oracle.com>
- Jakub Jelinek <jakub@redhat.com>
-
- PR c++/66007
- * g++.dg/cpp0x/Wnarrowing4.C: New.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@222779 138bc75d-0d04-0410-961f-82ee72b054a4
----
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
- gcc/cp/ChangeLog | 7 +++++++
- gcc/cp/typeck2.c | 8 +++++---
- gcc/testsuite/ChangeLog | 6 ++++++
- gcc/testsuite/g++.dg/cpp0x/Wnarrowing4.C | 14 ++++++++++++++
- 4 files changed, 32 insertions(+), 3 deletions(-)
- create mode 100644 gcc/testsuite/g++.dg/cpp0x/Wnarrowing4.C
-
-diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
-index 9a491aa..c0df823 100644
---- a/gcc/cp/typeck2.c
-+++ b/gcc/cp/typeck2.c
-@@ -958,10 +958,12 @@ check_narrowing (tree type, tree init, tsubst_flags_t complain)
- }
- else if (complain & tf_error)
- {
-+ int savederrorcount = errorcount;
- global_dc->pedantic_errors = 1;
-- if (!pedwarn (EXPR_LOC_OR_LOC (init, input_location), OPT_Wnarrowing,
-- "narrowing conversion of %qE from %qT to %qT "
-- "inside { }", init, ftype, type))
-+ pedwarn (EXPR_LOC_OR_LOC (init, input_location), OPT_Wnarrowing,
-+ "narrowing conversion of %qE from %qT to %qT "
-+ "inside { }", init, ftype, type);
-+ if (errorcount == savederrorcount)
- ok = true;
- global_dc->pedantic_errors = flag_pedantic_errors;
- }
-diff --git a/gcc/testsuite/g++.dg/cpp0x/Wnarrowing4.C b/gcc/testsuite/g++.dg/cpp0x/Wnarrowing4.C
-new file mode 100644
-index 0000000..7defce3
---- /dev/null
-+++ b/gcc/testsuite/g++.dg/cpp0x/Wnarrowing4.C
-@@ -0,0 +1,14 @@
-+// PR c++/66007
-+// { dg-do run { target c++11 } }
-+// { dg-options "-Wno-error=narrowing" }
-+
-+extern "C" void abort();
-+
-+int main()
-+{
-+ unsigned foo[] = { 1, -1, 3 };
-+ if (foo[0] != 1 || foo[1] != __INT_MAX__ * 2U + 1 || foo[2] != 3)
-+ abort();
-+}
-+
-+// { dg-prune-output "narrowing conversion" }
---
-2.1.4
-
# Third digit in PV should be incremented after a minor release
-PV = "5.1.0"
+PV = "5.2.0"
#SNAP = "5-20150405"
# BINV should be incremented to a revision after a minor gcc release
-BINV = "5.1.0"
+BINV = "5.2.0"
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-5.1:${FILE_DIRNAME}/gcc-5.1/backport:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-5.2:${FILE_DIRNAME}/gcc-5.2/backport:"
DEPENDS =+ "mpfr gmp libmpc zlib"
NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"
"
#BASEURI = "http://www.netgull.com/gcc/snapshots/${SNAP}/gcc-${SNAP}.tar.bz2"
BASEURI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "d5525b1127d07d215960e6051c5da35e"
-SRC_URI[sha256sum] = "b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad"
+SRC_URI[md5sum] = "a51bcfeb3da7dd4c623e27207ed43467"
+SRC_URI[sha256sum] = "5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad"
SRC_URI = "\
${BASEURI} \
file://0038-fix-g++-sysroot.patch \
"
-BACKPORTS = "\
- file://0001-PR65801.patch \
- file://0002-PR65858.patch \
- file://0003-PR66007.patch \
- "
+BACKPORTS = ""
#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${SNAP}"
S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
