diff options
| author | Fritz Reese <fritzoreese@gmail.com> | 2017-08-10 12:36:44 +0000 |
|---|---|---|
| committer | Fritz Reese <foreese@gcc.gnu.org> | 2017-08-10 12:36:44 +0000 |
| commit | 57e1270f58ad000b55282ae12b3c641f940bc923 (patch) | |
| tree | ec223d9e9ea6f23e81c0be67fa969f3431c28183 | |
| parent | 6f855a26ab2d30bc7f3b0cfec456e2b27e63b9a7 (diff) | |
| download | gcc-57e1270f58ad000b55282ae12b3c641f940bc923.zip gcc-57e1270f58ad000b55282ae12b3c641f940bc923.tar.gz gcc-57e1270f58ad000b55282ae12b3c641f940bc923.tar.bz2 | |
options.c (set_dec_flags, [...]): Only set flag_d_lines with -fdec when not set by user.
2017-08-10 Fritz Reese <Reese-Fritz@zai.com>
gcc/fortran/ChangeLog:
* options.c (set_dec_flags, gfc_post_options): Only set flag_d_lines
with -fdec when not set by user.
gcc/testsuite/ChangeLog:
gfortran.dg/
* dec_d_lines_1.f, dec_d_lines_2.f: New.
From-SVN: r251024
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/options.c | 14 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/dec_d_lines_1.f | 9 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/dec_d_lines_2.f | 8 |
5 files changed, 38 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 45b16d4..20fa93f 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,4 +1,9 @@ -2017-08-10 Fritz Reese <Reese-Fritz@zai.com> +2017-08-10 Fritz Reese <fritzoreese@gmail.com> + + * options.c (set_dec_flags, gfc_post_options): Only set flag_d_lines + with -fdec when not set by user. + +2017-08-10 Fritz Reese <fritzoreese@gmail.com> * decl.c (attr_seen): New static variable. * decl.c (variable_decl): Match %FILL in STRUCTURE body. diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c index 283c835..cd254e9 100644 --- a/gcc/fortran/options.c +++ b/gcc/fortran/options.c @@ -57,9 +57,6 @@ set_dec_flags (int value) | GFC_STD_GNU | GFC_STD_LEGACY; gfc_option.warn_std &= ~(GFC_STD_LEGACY | GFC_STD_F95_DEL); - /* Set -fd-lines-as-comments by default. */ - if (value && gfc_current_form != FORM_FREE && gfc_option.flag_d_lines == -1) - gfc_option.flag_d_lines = 0; /* Set other DEC compatibility extensions. */ flag_dollar_ok |= value; @@ -339,8 +336,15 @@ gfc_post_options (const char **pfilename) diagnostic_classify_diagnostic (global_dc, OPT_Wline_truncation, DK_ERROR, UNKNOWN_LOCATION); } - else if (warn_line_truncation == -1) - warn_line_truncation = 0; + else + { + /* With -fdec, set -fd-lines-as-comments by default in fixed form. */ + if (flag_dec && gfc_option.flag_d_lines == -1) + gfc_option.flag_d_lines = 0; + + if (warn_line_truncation == -1) + warn_line_truncation = 0; + } /* If -pedantic, warn about the use of GNU extensions. */ if (pedantic && (gfc_option.allow_std & GFC_STD_GNU) != 0) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index adae3b9..a1e7236 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,9 @@ -2017-08-10 Fritz Reese <Reese-Fritz@zai.com> +2017-08-10 Fritz Reese <fritzoreese@gmail.com> + + * gfortran.dg/dec_d_lines_1.f: New test. + * gfortran.dg/dec_d_lines_2.f: New test. + +2017-08-10 Fritz Reese <fritzoreese@gmail.com> * gfortran.dg/dec_structure_18.f90: New test. * gfortran.dg/dec_structure_19.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/dec_d_lines_1.f b/gcc/testsuite/gfortran.dg/dec_d_lines_1.f new file mode 100644 index 0000000..2cc7a01 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/dec_d_lines_1.f @@ -0,0 +1,9 @@ +! { dg-do compile } +! { dg-options "-ffixed-form -fd-lines-as-code -fdec" } +! +! Ensure -fd-lines-as-code is not overridden by -fdec. +! + i = 0 +d end + subroutine s +D end diff --git a/gcc/testsuite/gfortran.dg/dec_d_lines_2.f b/gcc/testsuite/gfortran.dg/dec_d_lines_2.f new file mode 100644 index 0000000..31eaf5f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/dec_d_lines_2.f @@ -0,0 +1,8 @@ +! { dg-do compile } +! { dg-options "-ffixed-form -fdec" } +! +! Ensure -fd-lines-as-comments is enabled by default with -fdec. +! +d This is a comment. +D This line, too. + end |