aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog7
-rw-r--r--gcc/fortran/options.c5
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 033e97c..31fcc5a 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-05 Steven G. Kargl <kargls@comcast.net>
+
+ * 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 <tobias.schlueter@physik.uni-muenchen.de>
* simplify.c (ascii_table): Fix wrong entry.
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index ff3719e..278a346 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: