diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2016-05-11 13:45:56 +0200 |
|---|---|---|
| committer | Yvan Roux <yvan.roux@linaro.org> | 2016-05-11 13:45:56 +0200 |
| commit | cf2693b851f4a3a53f015c2113b9d6dc7ae54fe6 (patch) | |
| tree | f0f998391d67ff63cbb8934194b2665a952db641 /libgfortran | |
| parent | 128df3b55b1b42a5f876fc9f8875d96ee02d0d6c (diff) | |
Merge branches/gcc-5-branch rev 236108.
Change-Id: I421c7be7ac36a838c822da9b9412865e9e4fb1fa
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/io/list_read.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index b3952c36f50..b356340f478 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2016-05-02 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + Backport from trunk. + PR libgfortran/70684 + * io/list_read (check_buffers): Add '\r' to check for end of line. + 2016-04-05 Jerry DeLisle <jvdelisle@gcc.gnu.org> Dominique d'Humieres <dominiq@lps.ens.fr> diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index e02feca952b..6b42ecf1824 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -197,7 +197,7 @@ check_buffers (st_parameter_dt *dtp) } done: - dtp->u.p.at_eol = (c == '\n' || c == EOF); + dtp->u.p.at_eol = (c == '\n' || c == '\r' || c == EOF); return c; } |