From bded05359b10cb1d7ff4f2c980ff83b5d4660ee9 Mon Sep 17 00:00:00 2001
From: Craig Burley <craig@jcb-sc.com>
Date: Mon, 19 Apr 1999 22:27:05 +0000
Subject: [PATCH] Fix DATA repeat-count bug

From-SVN: r26554
---
 gcc/f/ChangeLog |  7 +++++++
 gcc/f/news.texi | 21 +++++++++++++++++++--
 gcc/f/stb.c     |  7 ++++++-
 gcc/f/version.c |  2 +-
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 8b2e99317e0..8cfae6851f8 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,10 @@
+Tue Apr 20 01:15:25 1999  Craig Burley  <craig@jcb-sc.com>
+
+	* stb.c (ffestb_R5282_): Convert DATA repeat count
+	to default INTEGER, to avoid problems downstream.
+
+	* version.c: Bump version.
+
 Mon Apr 19 21:36:48 1999  Craig Burley  <craig@jcb-sc.com>
 
 	* ste.c (ffeste_R819B): Start the loop before expanding
diff --git a/gcc/f/news.texi b/gcc/f/news.texi
index 9520e28e6be..52d03d6a679 100644
--- a/gcc/f/news.texi
+++ b/gcc/f/news.texi
@@ -9,7 +9,7 @@
 @c in the standalone derivations of this file (e.g. NEWS).
 @set copyrights-news 1995-1999
 
-@set last-update-news 1999-04-17
+@set last-update-news 1999-04-20
 
 @include root.texi
 
@@ -174,6 +174,13 @@ where @var{j} is other than default @code{INTEGER}
 Instead, it issues a diagnostic.
 @end ifclear
 
+@ifclear USERVISONLY
+@item
+Fix @code{g77} so it properly handles @samp{DATA A/@var{rpt}*@var{val}/},
+where @var{rpt} is not default @code{INTEGER}, such as @code{INTEGER*2},
+instead of producing a spurious diagnostic.
+@end ifclear
+
 @ifclear USERVISONLY
 @item
 The @samp{-ax} option is now obeyed when compiling Fortran programs.
@@ -217,13 +224,23 @@ The @samp{-malign-double} option
 now reliably aligns @emph{all} double-precision variables and arrays
 on Intel x86 targets.
 
+@item
+A substantial portion of the @code{g77} front end's code-generation component
+was rewritten.
+It now generates code using facilities more robustly supported
+by the @code{gcc} back end.
+One effect of this rewrite is that some codes no longer produce
+a spurious ``label @var{lab} used before containing binding contour''
+message.
+
 @item
 Support for the @samp{-fugly} option has been removed.
 
 @ifclear USERVISONLY
 @item
 Improve documentation and indexing,
-including information on Year 2000 (Y2K) compliance.
+including information on Year 2000 (Y2K) compliance,
+and providing more information on internals of the front end.
 @end ifclear
 
 @ifclear USERVISONLY
diff --git a/gcc/f/stb.c b/gcc/f/stb.c
index 59655e2cac7..ef523c4e117 100644
--- a/gcc/f/stb.c
+++ b/gcc/f/stb.c
@@ -5707,7 +5707,12 @@ ffestb_R5282_ (ffelexToken ft, ffebld expr, ffelexToken t)
     case FFELEX_typeASTERISK:
       if (expr == NULL)
 	break;
-      ffestb_local_.data.expr = expr;
+      ffestb_local_.data.expr = ffeexpr_convert (expr, ft, t,
+						 FFEINFO_basictypeINTEGER,
+						 FFEINFO_kindtypeINTEGER1,
+						 0,
+						 FFETARGET_charactersizeNONE,
+						 FFEEXPR_contextLET);
       ffesta_tokens[1] = ffelex_token_use (ft);
       return (ffelexHandler) ffeexpr_rhs
 	(ffesta_output_pool, FFEEXPR_contextDATA,
diff --git a/gcc/f/version.c b/gcc/f/version.c
index d962b670517..b2b996fa15f 100644
--- a/gcc/f/version.c
+++ b/gcc/f/version.c
@@ -1 +1 @@
-const char *ffe_version_string = "0.5.24-19990419";
+const char *ffe_version_string = "0.5.24-19990420";
-- 
2.30.2