This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] Fix test-suite fallout of default -Wreturn-type.


Hi!

On Mon, 20 Nov 2017 09:11:19 -0500, Jason Merrill <jason@redhat.com> wrote:
> On Sun, Nov 19, 2017 at 7:56 AM, Thomas Schwinge
> <thomas@codesourcery.com> wrote:
> > OK to fix the first four issues as follows?
> 
> OK.
> 
> Reviewed-by: Jason Merrill <jason@redhat.com>

Better late than never, committed to trunk in r258142:

commit 0e793314b12e82e8a7eeee0971e509572d67b773
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Fri Mar 2 16:35:36 2018 +0000

    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>
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@258142 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog                 | 8 ++++++++
 gcc/testsuite/g++.dg/lto/20080907_0.C   | 4 +++-
 gcc/testsuite/g++.dg/lto/20080915_0.C   | 1 -
 gcc/testsuite/g++.dg/lto/20101010-1_0.C | 4 +++-
 gcc/testsuite/g++.dg/lto/20101010-2_0.C | 4 +++-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git gcc/testsuite/ChangeLog gcc/testsuite/ChangeLog
index 84ebf2e..3864204 100644
--- gcc/testsuite/ChangeLog
+++ 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 gcc/testsuite/g++.dg/lto/20080907_0.C gcc/testsuite/g++.dg/lto/20080907_0.C
index a423196..153d0ab 100644
--- gcc/testsuite/g++.dg/lto/20080907_0.C
+++ 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 gcc/testsuite/g++.dg/lto/20080915_0.C gcc/testsuite/g++.dg/lto/20080915_0.C
index 40c5042..c91e756 100644
--- gcc/testsuite/g++.dg/lto/20080915_0.C
+++ 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 gcc/testsuite/g++.dg/lto/20101010-1_0.C gcc/testsuite/g++.dg/lto/20101010-1_0.C
index 8f694c7..bb3e6d4 100644
--- gcc/testsuite/g++.dg/lto/20101010-1_0.C
+++ 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 gcc/testsuite/g++.dg/lto/20101010-2_0.C gcc/testsuite/g++.dg/lto/20101010-2_0.C
index a26956f..721ac01 100644
--- gcc/testsuite/g++.dg/lto/20101010-2_0.C
+++ 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


Grüße
 Thomas


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]