From e9b490008e63973dd5a9a9dcbe33a35e84e1bc00 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <burnus@gcc.gnu.org>
Date: Mon, 27 Aug 2012 10:20:59 +0200
Subject: [PATCH] options.c (set_Wall): Don't set for -Wcompare-reals.
2012-08-27 Tobias Burnus <burnus@net-b.de>
* options.c (set_Wall): Don't set for -Wcompare-reals.
* invoke.texi (-Wall, -Wcompare-reals): -Wall no longer
implies -Wcompare-reals.
2012-08-27 Tobias Burnus <burnus@net-b.de>
* gfortran.dg/bessel_5.f90: Remove -Wno-compare-reals
from dg-options as -Wall no longer implies it.
From-SVN: r190707
---
gcc/fortran/ChangeLog | 6 ++++++
gcc/fortran/invoke.texi | 3 +--
gcc/fortran/options.c | 1 -
gcc/testsuite/ChangeLog | 9 +++++++--
gcc/testsuite/gfortran.dg/bessel_5.f90 | 2 +-
5 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f67e501f4200..4d50517ce972 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-27 Tobias Burnus <burnus@net-b.de>
+
+ * options.c (set_Wall): Don't set for -Wcompare-reals.
+ * invoke.texi (-Wall, -Wcompare-reals): -Wall no longer
+ implies -Wcompare-reals.
+
2012-08-24 Simon Baldwin <simonb@google.com>
* lang.opt (-cpp=): Mark flag NoDWARFRecord.
diff --git a/gcc/fortran/invoke.texi b/gcc/fortran/invoke.texi
index dfd4ca7fad0b..d5fdee3c7079 100644
--- a/gcc/fortran/invoke.texi
+++ b/gcc/fortran/invoke.texi
@@ -727,7 +727,7 @@ warnings.
Enables commonly used warning options pertaining to usage that
we recommend avoiding and that we believe are easy to avoid.
This currently includes @option{-Waliasing}, @option{-Wampersand},
-@option{-Wconversion}, @option{-Wcompare-reals}, @option{-Wsurprising},
+@option{-Wconversion}, @option{-Wsurprising},
@option{-Wintrinsics-std}, @option{-Wno-tabs}, @option{-Wintrinsic-shadow},
@option{-Wline-truncation}, @option{-Wtarget-lifetime},
@option{-Wreal-q-constant} and @option{-Wunused}.
@@ -939,7 +939,6 @@ allocatable variable; this includes scalars and derived types.
@item -Wcompare-reals
@opindex @code{Wcompare-reals}
Warn when comparing real or complex types for equality or inequality.
-Enabled by @option{-Wall}.
@item -Wtarget-lifetime
@opindex @code{Wtargt-lifetime}
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index cbec705b195c..764f5706ad0c 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -475,7 +475,6 @@ set_Wall (int setting)
gfc_option.warn_character_truncation = setting;
gfc_option.warn_real_q_constant = setting;
gfc_option.warn_unused_dummy_argument = setting;
- gfc_option.warn_compare_reals = setting;
gfc_option.warn_target_lifetime = setting;
warn_return_type = setting;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 590fac40e34c..1c7f779a7857 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-27 Tobias Burnus <burnus@net-b.de>
+
+ * gfortran.dg/bessel_5.f90: Remove -Wno-compare-reals
+ from dg-options as -Wall no longer implies it.
+
2012-08-26 Richard Sandiford <rdsandiford@googlemail.com>
* lib/scanasm.exp (scan-assembler-times_required_options): New proc.
@@ -153,8 +158,8 @@
2012-08-19 Thomas König <tkoenig@gcc.gnu.org>
PR fortran/54298
- * gfortran.dg/real_compare_1.f90: New test case.
- * gfortran.dg/bessel_5.f90 Add -Wno-compare-reals to options.
+ * gfortran.dg/real_compare_1.f90: New test case.
+ * gfortran.dg/bessel_5.f90: Add -Wno-compare-reals to options.
2012-08-18 Jan Hubicka <jh@suse.cz>
diff --git a/gcc/testsuite/gfortran.dg/bessel_5.f90 b/gcc/testsuite/gfortran.dg/bessel_5.f90
index 0027280e5089..aab45cafe17f 100644
--- a/gcc/testsuite/gfortran.dg/bessel_5.f90
+++ b/gcc/testsuite/gfortran.dg/bessel_5.f90
@@ -1,5 +1,5 @@
! { dg-do run }
-! { dg-options "-Wall -fno-range-check -Wno-compare-reals" }
+! { dg-options "-Wall -fno-range-check" }
!
! PR fortran/36158 - Transformational BESSEL_JN/YN
! PR fortran/33197 - F2008 math functions
--
GitLab