aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.9/libgfortran
diff options
context:
space:
mode:
authorBen Cheng <bccheng@google.com>2014-04-22 13:33:12 -0700
committerBen Cheng <bccheng@google.com>2014-04-22 13:33:12 -0700
commite3cc64dec20832769406aa38cde83c7dd4194bf4 (patch)
treeef8e39be37cfe0cb69d850043b7924389ff17164 /gcc-4.9/libgfortran
parentf33c7b3122b1d7950efa88067c9a156229ba647b (diff)
downloadtoolchain_gcc-e3cc64dec20832769406aa38cde83c7dd4194bf4.tar.gz
toolchain_gcc-e3cc64dec20832769406aa38cde83c7dd4194bf4.tar.bz2
toolchain_gcc-e3cc64dec20832769406aa38cde83c7dd4194bf4.zip
[4.9] GCC 4.9.0 official release refresh
Change-Id: Ic99a7da8b44b789a48aeec93b33e93944d6e6767
Diffstat (limited to 'gcc-4.9/libgfortran')
-rw-r--r--gcc-4.9/libgfortran/ChangeLog11
-rw-r--r--gcc-4.9/libgfortran/io/unit.c4
2 files changed, 11 insertions, 4 deletions
diff --git a/gcc-4.9/libgfortran/ChangeLog b/gcc-4.9/libgfortran/ChangeLog
index 6d92f9a65..91d283d6d 100644
--- a/gcc-4.9/libgfortran/ChangeLog
+++ b/gcc-4.9/libgfortran/ChangeLog
@@ -1,8 +1,17 @@
+2014-04-22 Release Manager
+
+ * GCC 4.9.0 released.
+
+2014-04-12 Jerry DeLisle <jvdelisle@gcc.gnu>
+
+ PR libfortran/60810
+ io/unit.c (is_trim_ok): If internal unit is array, do not trim.
+
2014-03-21 Jerry DeLisle <jvdelisle@gcc.gnu>
PR libfortran/60148
* io/transfer.c (data_transfer_init): If std= was specified, set
- delim status to DELIM_NONE of no other was specified.
+ delim status to DELIM_NONE if no other was specified.
2014-03-18 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
diff --git a/gcc-4.9/libgfortran/io/unit.c b/gcc-4.9/libgfortran/io/unit.c
index e522195e5..385818adc 100644
--- a/gcc-4.9/libgfortran/io/unit.c
+++ b/gcc-4.9/libgfortran/io/unit.c
@@ -382,9 +382,7 @@ static bool
is_trim_ok (st_parameter_dt *dtp)
{
/* Check rank and stride. */
- if (dtp->internal_unit_desc
- && (GFC_DESCRIPTOR_RANK (dtp->internal_unit_desc) > 1
- || GFC_DESCRIPTOR_STRIDE(dtp->internal_unit_desc, 0) != 1))
+ if (dtp->internal_unit_desc)
return false;
/* Format strings can not have 'BZ' or '/'. */
if (dtp->common.flags & IOPARM_DT_HAS_FORMAT)