Daily bump.

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index b7f012f6fdec0ab8056e66b242642444f98e52a4..1ace328d28163160ee3ad031c37175cae37d867d 100644 (file)
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20201227
+20201228

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e3094572d9cec6c28ed10b6c36905cf8a190045c..ba37ecf0eda7396a0f6ea7e2757ade649897b7e7 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,14 @@
+2020-12-27  Harald Anlauf  <anlauf@gmx.de>
+
+       Backported from master:
+       2020-12-25  Harald Anlauf  <anlauf@gmx.de>
+
+       * data.c (gfc_assign_data_value): Restrict use of
+       create_character_initializer to constant initializers.
+       * trans-expr.c (gfc_conv_initializer): Ensure that character
+       initializer is constant, otherwise fall through to get the same
+       error handling as for non-character cases.
+
 2020-12-19  Harald Anlauf  <anlauf@gmx.de>
 
        Backported from master:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cccb4fd352f8f72c2a80d4908e2b15dc8cb370b0..e0d44ea2054d4cc16c7403572135c3730177d700 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2020-12-27  Harald Anlauf  <anlauf@gmx.de>
+
+       Backported from master:
+       2020-12-25  Harald Anlauf  <anlauf@gmx.de>
+
+       * gfortran.dg/pr93685_1.f90: New test.
+       * gfortran.dg/pr93685_2.f90: New test.
+
 2020-12-24  Roman Zhuykov  <zhroma@ispras.ru>
 
        Backported from master: