diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-08-22 10:27:46 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-08-22 10:27:46 +0000 |
| commit | f733cf303bcdc952c92b81dd62199a40a1f555ec (patch) | |
| tree | 0a9a9e0f28aa7c7f5bc4d1d1d0e9647163cac4f7 /libgfortran | |
| parent | e0e4357b88efe5dc53e50d341a09de4d02331200 (diff) | |
| download | gcc-tarball-f733cf303bcdc952c92b81dd62199a40a1f555ec.tar.gz | |
gcc-6.2.0gcc-6.2.0
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 11 | ||||
| -rw-r--r-- | libgfortran/io/list_read.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index d29c079aba..ffc09af6af 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,14 @@ +2016-08-22 Release Manager + + * GCC 6.2.0 released. + +2016-08-11 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + Backport from trunk + PR libgfortran/71123 + PR libgfortran/73142 + * io/list_read (eat_spaces): Eat '\r' as part of spaces. + 2016-04-27 Release Manager * GCC 6.1.0 released. diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index b8e174c5bd..244430d976 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -418,7 +418,7 @@ eat_spaces (st_parameter_dt *dtp) /* Now skip spaces, EOF and EOL are handled in next_char. */ do c = next_char (dtp); - while (c != EOF && (c == ' ' || c == '\t')); + while (c != EOF && (c == ' ' || c == '\r' || c == '\t')); unget_char (dtp, c); return c; |