[BZ #710]

2005-02-09  Jakub Jelinek  <jakub@redhat.com>
	[BZ #710]
	* stdlib/random_r.c (__initstate_r): Save old state.
	* stdlib/Makefile (tests): Add tst-random2.
	* stdlib/tst-random2.c: New test.
	Reported by Peter Bergner <bergner@vnet.ibm.com>.

	(s390-.*-.*, powerpc.*-.*-.*, sparc.*-.*-.*): Add WORDSIZE64 entries
	for these mapping back to the above.

diff --git a/ChangeLog b/ChangeLog
index f9486d6..c593d35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-09  Jakub Jelinek  <jakub@redhat.com>
+
+       [BZ #710]
+       * stdlib/random_r.c (__initstate_r): Save old state.
+       * stdlib/Makefile (tests): Add tst-random2.
+       * stdlib/tst-random2.c: New test.
+       Reported by Peter Bergner <bergner@vnet.ibm.com>.
+
 2005-01-25  H.J. Lu  <hongjiu.lu@intel.com>
 
        * dlfcn/dlfcn.c (init): Put it in .init_array section.
@@ -20,6 +28,8 @@
        (s390x-.*-.*): Likewise for s390.
        (powerpc64-.*-.*): Likewise for powerpc.
        (sparc64-.*-.*): Likewise for sparc.
+       (s390-.*-.*, powerpc.*-.*-.*, sparc.*-.*-.*): Add WORDSIZE64 entries
+       for these mapping back to the above.
 
 2005-02-08  Jakub Jelinek  <jakub@redhat.com>
 

diff --git a/shlib-versions b/shlib-versions
index b6999c3..aaeb966 100644 (file)
--- a/shlib-versions
+++ b/shlib-versions
@@ -32,12 +32,15 @@ x86_64-.*-linux.*       DEFAULT                     GLIBC_2.2.5
 powerpc64-.*-linux.*   DEFAULT                 GLIBC_2.3
 .*-.*-gnu-gnu.*                DEFAULT                 GLIBC_2.2.6
 
-# Configuration                WORDSIZE32              Alternate configuration
+# Configuration                WORDSIZE[32|64]         Alternate configuration
 # -------------                ----------              -----------------------
 x86_64-.*-.*           WORDSIZE32              i686-@VENDOR@-@OS@
 s390x-.*-.*            WORDSIZE32              s390-@VENDOR@-@OS@
+s390-.*-.*             WORDSIZE64              s390x-@VENDOR@-@OS@
 powerpc64-.*-.*                WORDSIZE32              powerpc-@VENDOR@-@OS@
+powerpc.*-.*-.*                WORDSIZE64              powerpc64-@VENDOR@-@OS@
 sparc64-.*-.*          WORDSIZE32              sparc-@VENDOR@-@OS@
+sparc.*-.*-.*          WORDSIZE64              sparc64-@VENDOR@-@OS@
 
 # Configuration                Library=version         Earliest symbol set (optional)
 # -------------                ---------------         ------------------------------

diff --git a/stdlib/Makefile b/stdlib/Makefile
index a0c0e71..fafe606 100644 (file)
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -61,9 +61,9 @@ distribute    := exit.h grouping.h abort-instr.h isomac.c tst-fmtmsg.sh   \
 test-srcs      := tst-fmtmsg
 tests          := tst-strtol tst-strtod testmb testrand testsort testdiv   \
                   test-canon test-canon2 tst-strtoll tst-environ           \
-                  tst-xpg-basename tst-random tst-bsearch tst-limits       \
-                  tst-rand48 bug-strtod tst-setcontext test-a64l tst-qsort \
-                  tst-system testmb2
+                  tst-xpg-basename tst-random tst-random2 tst-bsearch      \
+                  tst-limits tst-rand48 bug-strtod tst-setcontext          \
+                  test-a64l tst-qsort tst-system testmb2
 
 include ../Makeconfig
 

diff --git a/stdlib/random_r.c b/stdlib/random_r.c
index 09677e6..c85fd5e 100644 (file)
--- a/stdlib/random_r.c
+++ b/stdlib/random_r.c
@@ -1,5 +1,5 @@
 /* 
-   Copyright (C) 1995 Free Software Foundation
+   Copyright (C) 1995, 2005 Free Software Foundation
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -240,10 +240,19 @@ __initstate_r (seed, arg_state, n, buf)
   int degree;
   int separation;
   int32_t *state;
+  int old_type;
+  int32_t *old_state;
 
   if (buf == NULL)
     goto fail;
 
+  old_type = buf->rand_type;
+  old_state = buf->state;
+  if (old_type == TYPE_0)
+    old_state[-1] = TYPE_0;
+  else
+    old_state[-1] = (MAX_TYPES * (buf->rptr - old_state)) + old_type;
+
   if (n >= BREAK_3)
     type = n < BREAK_4 ? TYPE_3 : TYPE_4;
   else if (n < BREAK_1)

diff --git a/stdlib/tst-random2.c b/stdlib/tst-random2.c
new file mode 100644 (file)
index 0000000..aa1b89d
--- /dev/null
+++ b/stdlib/tst-random2.c
@@ -0,0 +1,59 @@
+/* Test initstate saving the old state.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub@redhat.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main (void)
+{
+  int pass;
+  int ret = 0;
+  long int r[2];
+
+  for (pass = 0; pass < 2; pass++)
+    {
+      srandom (0x12344321);
+
+      int j;
+      for (j = 0; j < 3; ++j)
+       random ();
+      if (pass == 1)
+       {
+         char state[128];
+         char *ostate = initstate (0x34562101, state, 128);
+         if (setstate (ostate) != state)
+           {
+             puts ("setstate (ostate) != state");
+             ret = 1;
+           }
+       }
+
+      random ();
+      r[pass] = random ();
+    }
+
+  if (r[0] != r[1])
+    {
+      printf ("%ld != %ld\n", r[0], r[1]);
+      ret = 1;
+    }
+  return ret;
+}