From: Jerry DeLisle <jvdelisle@gcc.gnu.org>
Date: Fri, 15 Apr 2011 16:29:44 +0000 (+0000)
Subject: re PR libfortran/48589 (Invalid G0/G0.d editing for NaN/infinity)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0b0a0c945fad9f4a8ec83c4eabd9e141294d6ea5;p=gcc.git

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
---

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 8d53c6f16af..5dae754a9ce 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 b72cf9f5665..ea9c99f50f9 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;