From: Martin Liska <mliska@suse.cz>
Date: Thu, 22 Jun 2017 11:29:22 +0000 (+0200)
Subject: Backport r248089
X-Git-Tag: releases/gcc-5.5.0~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=838cfee5715d248c033288bd76aae362ae3d6f72;p=thirdparty%2Fgcc.git

Backport r248089

2017-06-22  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-05-16  Martin Liska  <mliska@suse.cz>

	PR ipa/79850.
	* ipa-devirt.c (odr_types_equivalent_p): Fix typo.

From-SVN: r249535
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f31bb493d31..5f67c7719a3b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-06-22  Martin Liska  <mliska@suse.cz>
+
+	Backport from mainline
+	2017-05-16  Martin Liska  <mliska@suse.cz>
+
+	PR ipa/79850.
+	* ipa-devirt.c (odr_types_equivalent_p): Fix typo.
+
 2017-06-22  Martin Liska  <mliska@suse.cz>
 
 	Backport from mainline
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 08cfa8033f01..316f33624bca 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -1459,7 +1459,7 @@ odr_types_equivalent_p (tree t1, tree t2, bool warn, bool *warned,
 		    if (DECL_ARTIFICIAL (f1))
 		      break;
 		    warn_odr (t1, t2, f1, f2, warn, warned,
-			      G_("fields has different layout "
+			      G_("fields have different layout "
 				 "in another translation unit"));
 		    return false;
 		  }