* g++.dg/abi/vbase10.C: Use -mstructure-size-boundary=8 on ARM.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75529 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 10 insertions, 7 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a57afff92b8..45d4c244501 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-07  Mark Mitchell  <mark@codesourcery.com>
+
+	* g++.dg/abi/vbase10.C: Use -mstructure-size-boundary=8 on ARM.
+
 2004-01-07  Joseph S. Myers  <jsm@polyomino.org.uk>
 
 	PR c/6024
diff --git a/gcc/testsuite/g++.dg/abi/vbase10.C b/gcc/testsuite/g++.dg/abi/vbase10.C
index bd03105ec1d..a0d113ade79 100644
--- a/gcc/testsuite/g++.dg/abi/vbase10.C
+++ b/gcc/testsuite/g++.dg/abi/vbase10.C
@@ -1,13 +1,12 @@
 // { dg-do compile }
 // { dg-options "-Wabi -fabi-version=1" }
+// On ARM processors, the alignment of B will be 4 even though it
+// contains only a single "char".  That would avoids the situation
+// that the warning below is designed to catch.  We therefore
+// explicitly set the default structure alignment to 1.
+// { dg-options "-Wabi -fabi-version=1 -mstructure-size-boundary=8" { target arm*-*-* } }
 
 struct A { virtual void f(); char c1; };
 struct B { B(); char c2; };
-// On ARM processors, the alignment of B will be 4 even though it
-// contains only a single "char".  That avoids the situation that the
-// warning below is designed to catch.  On ARM NetBSD, the alignment
-// of B will be only 1 -- but there is no way to tell DejaGNU that a
-// failure is expected on all ARM targets except arm*-*-netbsd*.
-// Therefore, this test will XPASS on arm*-*-netbsd*.
-struct C : public A, public virtual B {}; // { dg-warning "ABI" "" { xfail arm*-*-* } }
+struct C : public A, public virtual B {}; // { dg-warning "ABI" }