Fix "dg-lto-options" misuse

	gcc/testsuite/
	* g++.dg/lto/20080915_0.C: Don't use "dg-lto-options".
	* g++.dg/lto/20080907_0.C: Use "#pragma GCC" instead of
	"dg-lto-options".
	* g++.dg/lto/20101010-1_0.C: Likewise.
	* g++.dg/lto/20101010-2_0.C: Likewise.

Reviewed-by: Jason Merrill <jason@redhat.com>
From-SVN: r258142

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 84ebf2e694c8343fbce66ce8a5259873c9213ce8..3864204337d444a7bf88ad87aaadc16f4884b0eb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2018-03-02  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * g++.dg/lto/20080915_0.C: Don't use "dg-lto-options".
+       * g++.dg/lto/20080907_0.C: Use "#pragma GCC" instead of
+       "dg-lto-options".
+       * g++.dg/lto/20101010-1_0.C: Likewise.
+       * g++.dg/lto/20101010-2_0.C: Likewise.
+
 2018-03-02  Jakub Jelinek  <jakub@redhat.com>
 
        PR ipa/84628

diff --git a/gcc/testsuite/g++.dg/lto/20080907_0.C b/gcc/testsuite/g++.dg/lto/20080907_0.C
index a423196e7dbacee3935e90b837df5b32b0ea113a..153d0ab8c061af9793cb2ab8331693e388101df5 100644 (file)
--- a/gcc/testsuite/g++.dg/lto/20080907_0.C
+++ b/gcc/testsuite/g++.dg/lto/20080907_0.C
@@ -1,5 +1,7 @@
 // { dg-lto-do assemble }
-// { dg-lto-options "-Wno-return-type" }
+
+/* "WARNING: lto.exp does not support dg-additional-options" */
+#pragma GCC diagnostic ignored "-Wreturn-type"
 
 struct Foo { void func (); }; Foo & bar () { } struct Baz { Baz (Baz &); };
 Baz dummy() { bar().func(); }

diff --git a/gcc/testsuite/g++.dg/lto/20080915_0.C b/gcc/testsuite/g++.dg/lto/20080915_0.C
index 40c50422857bb5639972e9be41888a8d8302d7e9..c91e756816903d188d1f218ea094b82150c526ed 100644 (file)
--- a/gcc/testsuite/g++.dg/lto/20080915_0.C
+++ b/gcc/testsuite/g++.dg/lto/20080915_0.C
@@ -1,5 +1,4 @@
 // { dg-lto-do assemble }
-// { dg-lto-options "-Wno-return-type" }
 
 struct Foo {
  static const int dummy;

diff --git a/gcc/testsuite/g++.dg/lto/20101010-1_0.C b/gcc/testsuite/g++.dg/lto/20101010-1_0.C
index 8f694c78aa708fc89d06dd30b6aa35ff4f37b432..bb3e6d4841560ea6f622ae935e577d046c091525 100644 (file)
--- a/gcc/testsuite/g++.dg/lto/20101010-1_0.C
+++ b/gcc/testsuite/g++.dg/lto/20101010-1_0.C
@@ -1,5 +1,7 @@
 // { dg-lto-do link }
-// { dg-lto-options "-Wno-return-type" }
+
+/* "WARNING: lto.exp does not support dg-additional-options" */
+#pragma GCC diagnostic ignored "-Wreturn-type"
 
 typedef long size_t;
 template < class, class > struct pair

diff --git a/gcc/testsuite/g++.dg/lto/20101010-2_0.C b/gcc/testsuite/g++.dg/lto/20101010-2_0.C
index a26956f7fc74df52636f903e1fc2460303e92c1f..721ac015e67160016941aa7df27d0676a4c03093 100644 (file)
--- a/gcc/testsuite/g++.dg/lto/20101010-2_0.C
+++ b/gcc/testsuite/g++.dg/lto/20101010-2_0.C
@@ -1,5 +1,7 @@
 // { dg-lto-do link }
-// { dg-lto-options "-Wno-return-type" }
+
+/* "WARNING: lto.exp does not support dg-additional-options" */
+#pragma GCC diagnostic ignored "-Wreturn-type"
 
 typedef int size_t;
 template < size_t _Nw > struct _Base_bitset