diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2011-04-15 16:29:44 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2011-04-15 16:29:44 +0000 |
| commit | 0b0a0c945fad9f4a8ec83c4eabd9e141294d6ea5 (patch) | |
| tree | 6dbd6fc926495aa63ce26d5010f14f17a022aed0 /libgfortran | |
| parent | b3b66298b8abd301137928e290373c08fb5149d3 (diff) | |
| download | gcc-0b0a0c945fad9f4a8ec83c4eabd9e141294d6ea5.zip gcc-0b0a0c945fad9f4a8ec83c4eabd9e141294d6ea5.tar.gz gcc-0b0a0c945fad9f4a8ec83c4eabd9e141294d6ea5.tar.bz2 | |
re PR libfortran/48589 (Invalid G0/G0.d editing for NaN/infinity)
2011-04-15 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/48589
* io/write_float.def (write_infnan): Set width properly for G0.
From-SVN: r172502
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/io/write_float.def | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 8d53c6f..5dae754 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2011-04-15 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR libgfortran/48589 + * io/write_float.def (write_infnan): Set width properly for G0. + 2011-04-15 Tobias Burnus <burnus@net-b.de> PR fortran/18918 @@ -15,6 +20,7 @@ * intrinsics/system_clock.c: Use weakrefs only when needed and supported. +>>>>>>> .r172501 2011-04-12 Janne Blomqvist <jb@gcc.gnu.org> * configure.ac: Use AC_TYPE_* to make sure we have (u)intptr_t, diff --git a/libgfortran/io/write_float.def b/libgfortran/io/write_float.def index b72cf9f..ea9c99f5 100644 --- a/libgfortran/io/write_float.def +++ b/libgfortran/io/write_float.def @@ -654,11 +654,11 @@ write_infnan (st_parameter_dt *dtp, const fnode *f, int isnan_flag, int sign_bit mark = (sign == S_PLUS || sign == S_MINUS) ? 8 : 7; nb = f->u.real.w; - + /* If the field width is zero, the processor must select a width not zero. 4 is chosen to allow output of '-Inf' or '+Inf' */ - if (nb == 0) + if ((nb == 0) || dtp->u.p.g0_no_blanks) { if (isnan_flag) nb = 3; |