From edb1f4202b9ad28514c93d61c2dbd960c6fc3ce0 Mon Sep 17 00:00:00 2001 From: jvdelisle Date: Fri, 15 Apr 2011 16:29:44 +0000 Subject: [PATCH] 2011-04-15 Jerry DeLisle PR libgfortran/48589 * io/write_float.def (write_infnan): Set width properly for G0. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172502 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgfortran/ChangeLog | 6 ++++++ 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 + + PR libgfortran/48589 + * io/write_float.def (write_infnan): Set width properly for G0. + 2011-04-15 Tobias Burnus PR fortran/18918 @@ -15,6 +20,7 @@ * intrinsics/system_clock.c: Use weakrefs only when needed and supported. +>>>>>>> .r172501 2011-04-12 Janne Blomqvist * 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..ea9c99f 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; -- 2.7.4