Daily bump.

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index a522144b0f9c23a501261f112b2aeb6f34b8b836..3a84504fca82677126384494e34151041d3ffbea 100644 (file)
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20210619
+20210620

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 19e772dd89d2bff3ae79125cb7041dcd2bca4fdc..b8f8ed11af102fd13895c64435603f7f1bdd5c24 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,13 @@
+2021-06-19  Harald Anlauf  <anlauf@gmx.de>
+
+       Backported from master:
+       2021-06-18  Harald Anlauf  <anlauf@gmx.de>
+
+       PR fortran/100283
+       PR fortran/101123
+       * trans-intrinsic.c (gfc_conv_intrinsic_minmax): Unconditionally
+       convert result of min/max to result type.
+
 2021-06-18  Harald Anlauf  <anlauf@gmx.de>
 
        Backported from master:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 762d01ceda0e3b0d1214e70855f87b96b4c5e858..c67c9b387749030f4b909bbc5f1d060aba81801d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2021-06-19  Harald Anlauf  <anlauf@gmx.de>
+
+       Backported from master:
+       2021-06-18  Harald Anlauf  <anlauf@gmx.de>
+
+       PR fortran/100283
+       PR fortran/101123
+       * gfortran.dg/min0_max0_1.f90: New test.
+       * gfortran.dg/min0_max0_2.f90: New test.
+
 2021-06-18  Harald Anlauf  <anlauf@gmx.de>
 
        Backported from master: