From 1cc311178dbb434c59f8776742dc5bc06bc0239f Mon Sep 17 00:00:00 2001
From: burley <burley@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 28 Jun 1999 18:38:42 +0000
Subject: [PATCH] Update to Netlib version of 1999-06-28, doc fix

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27816 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/f/ChangeLog         |  5 +++++
 gcc/f/bugs.texi         | 13 +------------
 gcc/f/news.texi         | 12 ++++++++++--
 libf2c/ChangeLog        |  6 ++++++
 libf2c/changes.netlib   |  5 +++++
 libf2c/libI77/Version.c |  5 ++++-
 libf2c/libI77/rsne.c    |  2 +-
 libf2c/readme.netlib    |  6 ++++++
 8 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 5090b60ef88f..f94aa6ff08b3 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 28 21:31:35 1999  Craig Burley  <craig@jcb-sc.com>
+
+	* bugs.texi, news.texi: Doc upgrade to netlib libf2c as of today.
+	Explain that this fixes the NAMELIST-read bug.
+
 Fri Jun 25 11:06:32 1999  Craig Burley  <craig@jcb-sc.com>
 
 	* bugs.texi: Describe K(5)=10*3 NAMELIST-read bug.
diff --git a/gcc/f/bugs.texi b/gcc/f/bugs.texi
index a08a0a17155a..52954bfc5ac9 100644
--- a/gcc/f/bugs.texi
+++ b/gcc/f/bugs.texi
@@ -9,7 +9,7 @@
 @c in the standalone derivations of this file (e.g. BUGS).
 @set copyrights-bugs 1995-1999
 
-@set last-update-bugs 1999-06-25
+@set last-update-bugs 1999-06-28
 
 @include root.texi
 
@@ -97,17 +97,6 @@ see "Problems Installing" in @file{@value{path-g77}/INSTALL}.
 The following information was last updated on @value{last-update-bugs}:
 
 @itemize @bullet
-@item
-Input to a @code{NAMELIST} read involving a repeat count,
-such as @samp{K(5)=10*3},
-is not properly handled by @code{libf2c}.
-The first item is written to @samp{K(5)},
-but the remaining nine are written elsewhere (still within the array),
-not necessarily starting at @samp{K(6)}.
-
-A fix is pending, certainly for @code{gcc} 3.0,
-perhaps for 2.96 if such a release is made.
-
 @item
 @code{g77} fails to warn about
 use of a ``live'' iterative-DO variable
diff --git a/gcc/f/news.texi b/gcc/f/news.texi
index 196e3aaf6338..9ff221efb6c8 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-06-18
+@set last-update-news 1999-06-28
 
 @include root.texi
 
@@ -161,7 +161,15 @@ if the system has no @code{ttyname} implementation available.
 
 @ifclear USERVISONLY
 @item
-Upgrade to @code{libf2c} as of 1999-06-18.
+Upgrade to @code{libf2c} as of 1999-06-28.
+
+This fixes a bug whereby
+input to a @code{NAMELIST} read involving a repeat count,
+such as @samp{K(5)=10*3},
+was not properly handled by @code{libf2c}.
+The first item was written to @samp{K(5)},
+but the remaining nine were written elsewhere (still within the array),
+not necessarily starting at @samp{K(6)}.
 @end ifclear
 @end itemize
 
diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index 7a62c4f33271..b51430ae917c 100644
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 28 21:27:08 1999  Craig Burley  <craig@jcb-sc.com>
+
+	Update to Netlib version of 1999-06-28:
+	* changes.netlib, libI77/Version.c, libI77/rsne.c
+	readme.netlib: See changes.netlib for info.
+
 Fri Jun 18 11:38:07 1999  Craig Burley  <craig@jcb-sc.com>
 
 	* libU77/ttynam_.c: if !defined (HAVE_TTYNAM),
diff --git a/libf2c/changes.netlib b/libf2c/changes.netlib
index b0e675322309..4ec0e7f58253 100644
--- a/libf2c/changes.netlib
+++ b/libf2c/changes.netlib
@@ -3019,3 +3019,8 @@ Fri Jun 18 02:33:08 EDT 1999
   libf2c.zip: rename backspace.c backspac.c, and fix a glitch in it
 -- b->ufd may change in t_runc().  (For now, it's still backspace.c
 in the libi77 bundle.)
+
+Sun Jun 27 22:05:47 EDT 1999
+  libf2c.zip, libi77: rsne.c: fix bug in namelist input: a misplaced
+increment could cause wrong array elements to be assigned; e.g.,
+"&input k(5)=10*1 &end" assigned k(5) and k(15 .. 23).
diff --git a/libf2c/libI77/Version.c b/libf2c/libI77/Version.c
index 6a09b70ca2e7..f6581dcf9636 100644
--- a/libf2c/libI77/Version.c
+++ b/libf2c/libI77/Version.c
@@ -1,4 +1,4 @@
-static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 19990618\n";
+static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 19990627\n";
 
 /*
 */
@@ -302,6 +302,9 @@ wrtfmt.c:
 		 by formats Inn or Lnn with nn > 83. */
 /* 3 May 1999:	open.c: insert two casts for machines with 64-bit longs. */
 /* 18 June 1999: backspace.c: allow for b->ufd changing in t_runc */
+/* 27 June 1999: rsne.c: fix bug in namelist input: a misplaced increment */
+/*		 could cause wrong array elements to be assigned; e.g.,	*/
+/*		 "&input k(5)=10*1 &end" assigned k(5) and k(15..23)	*/
 
 
 
diff --git a/libf2c/libI77/rsne.c b/libf2c/libI77/rsne.c
index 86bb2164f128..c9d5f1015f4a 100644
--- a/libf2c/libI77/rsne.c
+++ b/libf2c/libI77/rsne.c
@@ -530,10 +530,10 @@ x_rsne(cilist *a)
 					no1 = (ivae - iva)/size;
 					if (no1 > f__lcount)
 						no1 = f__lcount;
-					iva += no1 * dn0->delta;
 					if (k = l_read(&no1, vaddr + iva,
 							size, type))
 						return k;
+					iva += no1 * dn0->delta;
 					}
 				}
  mustend:
diff --git a/libf2c/readme.netlib b/libf2c/readme.netlib
index 0b8b7f7ee432..1ec98865e5b3 100644
--- a/libf2c/readme.netlib
+++ b/libf2c/readme.netlib
@@ -719,6 +719,12 @@ Fri Jun 18 02:33:08 EDT 1999
 -- b->ufd may change in t_runc().  (For now, it's still backspace.c
 in the libi77 bundle.)
 
+Sun Jun 27 22:05:47 EDT 1999
+  libf2c.zip, libi77: rsne.c: fix bug in namelist input: a misplaced
+increment could cause wrong array elements to be assigned; e.g.,
+"&input k(5)=10*1 &end" assigned k(5) and k(15 .. 23).
+
+
 Current timestamps of files in "all from f2c/src", sorted by time,
 appear below (mm/dd/year hh:mm:ss).  To bring your source up to date,
 obtain source files with a timestamp later than the time shown in your
-- 
GitLab