From ebad20f95f40a9e9a8354e2022935359d816f799 Mon Sep 17 00:00:00 2001 From: kargl Date: Fri, 5 May 2006 23:14:50 +0000 Subject: [PATCH] 2006-05-05 Steven G. Kargl * invoke.texi: Update description of -fall-intrinsics * options.c (gfc_post_options): Disable -Wnonstd-intrinsics if -fall-intrinsics is used. (gfc_handle_option): Permit -Wno-nonstd-intrinsics. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113562 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/options.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 033e97c5b15..31fcc5a8afe 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2006-05-05 Steven G. Kargl + + * invoke.texi: Update description of -fall-intrinsics + * options.c (gfc_post_options): Disable -Wnonstd-intrinsics if + -fall-intrinsics is used. + (gfc_handle_option): Permit -Wno-nonstd-intrinsics. + 2006-05-04 Tobias Schlüter * simplify.c (ascii_table): Fix wrong entry. diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c index ff3719e54d9..278a3463924 100644 --- a/gcc/fortran/options.c +++ b/gcc/fortran/options.c @@ -280,6 +280,9 @@ gfc_post_options (const char **pfilename) if (pedantic) gfc_option.warn_ampersand = 1; + if (gfc_option.flag_all_intrinsics) + gfc_option.warn_nonstd_intrinsics = 0; + return false; } @@ -598,7 +601,7 @@ gfc_handle_option (size_t scode, const char *arg, int value) break; case OPT_Wnonstd_intrinsics: - gfc_option.warn_nonstd_intrinsics = 1; + gfc_option.warn_nonstd_intrinsics = value; break; case OPT_fshort_enums: -- 2.11.0