summaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authorjvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4>2015-02-11 04:29:06 +0000
committerjvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4>2015-02-11 04:29:06 +0000
commit09f979b04e8ae7f288b5ba189d51a9e2c0ef71ff (patch)
tree3f420616c8e238cc435efc4215290307d495f229 /libgfortran
parent6a3671ce51ddfa1624b7e798d6f36ac335d1b1ac (diff)
downloadgcc-09f979b04e8ae7f288b5ba189d51a9e2c0ef71ff.tar.gz
2015-02-10 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/57822 * io/write_float.def (output_float): Apply fix of previous patch to correctly calculate the exponent number of digits and take care of wide character output. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220606 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog7
-rw-r--r--libgfortran/io/write_float.def4
2 files changed, 9 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 61de246a149..612ed81a039 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-10 Jerry DeLisle <jvdelisle@gcc.gnu.org>
+
+ PR libgfortran/57822
+ * io/write_float.def (output_float): Apply fix of previous patch
+ to correctly calculate the exponent number of digits and take
+ care of wide character output.
+
2015-02-09 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/57822
diff --git a/libgfortran/io/write_float.def b/libgfortran/io/write_float.def
index 434c3dfd069..1bbe0160619 100644
--- a/libgfortran/io/write_float.def
+++ b/libgfortran/io/write_float.def
@@ -446,7 +446,7 @@ output_float (st_parameter_dt *dtp, const fnode *f, char *buffer, size_t size,
skip:
/* Calculate the format of the exponent field. */
- if (expchar)
+ if (expchar && !(dtp->u.p.g0_no_blanks && e == 0))
{
edigits = 1;
for (i = abs (e); i >= 10; i /= 10)
@@ -632,7 +632,7 @@ output_float (st_parameter_dt *dtp, const fnode *f, char *buffer, size_t size,
}
/* Output the exponent. */
- if (expchar)
+ if (expchar && !(dtp->u.p.g0_no_blanks && e == 0))
{
if (expchar != ' ')
{