From: Jason Merrill <jason@redhat.com>
Date: Wed, 24 Feb 2010 19:26:29 +0000 (-0500)
Subject: class.c (layout_class_type): Don't give -Wabi warning for a bug in a previous ABI... 
X-Git-Tag: releases/gcc-4.5.0~617
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=254d1a5a0c690e62e637fe913c00b00c9bec9aed;p=thirdparty%2Fgcc.git

class.c (layout_class_type): Don't give -Wabi warning for a bug in a previous ABI version.

	* class.c (layout_class_type): Don't give -Wabi warning for a bug
	in a previous ABI version.

From-SVN: r157051
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c72e7e3dc6b4..427b3ad47dea 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-24  Jason Merrill  <jason@redhat.com>
+
+	* class.c (layout_class_type): Don't give -Wabi warning for a bug
+	in a previous ABI version.
+
 2010-02-23  Jason Merrill  <jason@redhat.com>
 
 	PR c++/43143
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index f7e0a9307d5d..1bab07dd42c6 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5044,6 +5044,7 @@ layout_class_type (tree t, tree *virtuals_p)
       /* G++ used to use DECL_FIELD_OFFSET as if it were the byte
 	 offset of the field.  */
       if (warn_abi
+	  && !abi_version_at_least (2)
 	  && !tree_int_cst_equal (DECL_FIELD_OFFSET (field),
 				  byte_position (field))
 	  && contains_empty_class_p (TREE_TYPE (field)))
diff --git a/gcc/testsuite/g++.dg/abi/empty6.C b/gcc/testsuite/g++.dg/abi/empty6.C
index f78630878234..1b14a6d03bec 100644
--- a/gcc/testsuite/g++.dg/abi/empty6.C
+++ b/gcc/testsuite/g++.dg/abi/empty6.C
@@ -1,4 +1,4 @@
-// { dg-options "-Wabi" }
+// { dg-options "-Wabi -fabi-version=1" }
 
 struct A {};