From: Richard Henderson <rth@redhat.com>
Date: Tue, 31 Aug 2004 17:37:32 +0000 (-0700)
Subject: offsetof1.C: Include cstddef, use non-builtin form of offsetof.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1c04c4cc039e10143d481f328127c601af1d3515;p=gcc.git

offsetof1.C: Include cstddef, use non-builtin form of offsetof.

        * g++.dg/other/offsetof1.C: Include cstddef, use non-builtin
        form of offsetof.
        * g++.dg/other/offsetof5.C: Remove duplicate.

From-SVN: r86834
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 86a392c8f20..e7a17d30e43 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-31  Richard Henderson  <rth@redhat.com>
+
+	* g++.dg/other/offsetof1.C: Include cstddef, use non-builtin
+	form of offsetof.
+	* g++.dg/other/offsetof5.C: Remove duplicate.
+
 2004-08-31  Tobias Schlueter  <tobias.schlueter@physik.uni-muenchen.de>
 
 	PR fortran/17244
diff --git a/gcc/testsuite/g++.dg/other/offsetof1.C b/gcc/testsuite/g++.dg/other/offsetof1.C
index 39bb7836cee..78738892a70 100644
--- a/gcc/testsuite/g++.dg/other/offsetof1.C
+++ b/gcc/testsuite/g++.dg/other/offsetof1.C
@@ -4,6 +4,9 @@
 // Contributed by Nathan Sidwell 14 Aug 2002 <nathan@codesourcery.com>
 
 // PR c++ 7598, offsetof broke
+// PR c++ 11072, DR 273's solution is broken
+
+#include <cstddef>
 
 struct F
 {
@@ -11,4 +14,4 @@ struct F
   char j;
 };
 
-static int ary[__builtin_offsetof(F, j)];
+static int ary[offsetof(F, j)];
diff --git a/gcc/testsuite/g++.dg/other/offsetof5.C b/gcc/testsuite/g++.dg/other/offsetof5.C
deleted file mode 100644
index 40a44068ccc..00000000000
--- a/gcc/testsuite/g++.dg/other/offsetof5.C
+++ /dev/null
@@ -1,17 +0,0 @@
-// { dg-do compile }
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-// Contributed by Nathan Sidwell 30 June 2003 <nathan@codesourcery.com>
-
-// PR c++ 11072, DR 273's solution is broken
-
-#include <stddef.h>
-
-struct F
-{
-  char i;
-  char j;
-};
-
-static int ary[offsetof (F, j)];
-