Merge changes between r5759 and r5854 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@5855 7b3dc134-2b1b-0410-93df-9e9f96275f8d

3 files changed, 16 insertions, 13 deletions

diff --git a/libc/stdlib/mbtowc.c b/libc/stdlib/mbtowc.c
index 744b2b6c0..ee8850bbc 100644
--- a/libc/stdlib/mbtowc.c
+++ b/libc/stdlib/mbtowc.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991, 1992, 1995-1999, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995-1999, 2002, 2008
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,9 +24,6 @@
 #include <wcsmbs/wcsmbsload.h>
 
 
-/* Common state for all non-restartable conversion functions.  */
-mbstate_t __no_r_state attribute_hidden;
-
 /* Convert the multibyte character at S, which is no longer
    than N characters, to its `wchar_t' representation, placing
    this n *PWC and returning its length.
@@ -38,6 +36,7 @@ int
 mbtowc (wchar_t *pwc, const char *s, size_t n)
 {
   int result;
+  static mbstate_t state;
 
   /* If S is NULL the function has to return null or not null
      depending on the encoding having a state depending encoding or
@@ -51,7 +50,7 @@ mbtowc (wchar_t *pwc, const char *s, size_t n)
 
       /* This is an extension in the Unix standard which does not directly
 	 violate ISO C.  */
-      memset (&__no_r_state, '\0', sizeof __no_r_state);
+      memset (&state, '\0', sizeof state);
 
       result = fcts->towc->__stateful;
     }
@@ -63,7 +62,7 @@ mbtowc (wchar_t *pwc, const char *s, size_t n)
     }
   else
     {
-      result = __mbrtowc (pwc, s, n, &__no_r_state);
+      result = __mbrtowc (pwc, s, n, &state);
 
       /* The `mbrtowc' functions tell us more than we need.  Fold the -1
 	 and -2 result into -1.  */
diff --git a/libc/stdlib/tst-makecontext.c b/libc/stdlib/tst-makecontext.c
index 1451efa56..5fe66f6fc 100644
--- a/libc/stdlib/tst-makecontext.c
+++ b/libc/stdlib/tst-makecontext.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -25,10 +25,12 @@ ucontext_t ucp;
 char st1[8192];
 __thread int thr;
 
+int somevar = -76;
+
 void
 cf (int i)
 {
-  if (i != 78 || thr != 94)
+  if (i != -78 || thr != 94)
     {
       printf ("i %d thr %d\n", i, thr);
       exit (1);
@@ -54,7 +56,7 @@ do_test (void)
   ucp.uc_link = NULL;
   ucp.uc_stack.ss_sp = st1;
   ucp.uc_stack.ss_size = sizeof st1;
-  makecontext (&ucp, (void (*) (void)) cf, 1, 78);
+  makecontext (&ucp, (void (*) (void)) cf, 1, somevar - 2);
   if (setcontext (&ucp) != 0)
     {
       puts ("setcontext failed");
diff --git a/libc/stdlib/wctomb.c b/libc/stdlib/wctomb.c
index 49872f5c6..3ba8a3e2a 100644
--- a/libc/stdlib/wctomb.c
+++ b/libc/stdlib/wctomb.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991, 1992, 1995-1999, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995-1999, 2002, 2008
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +24,8 @@
 #include <wcsmbs/wcsmbsload.h>
 
 
-extern mbstate_t __no_r_state attribute_hidden;	/* Defined in mbtowc.c.  */
+/* Shared with __wctomb_chk.  */
+mbstate_t __wctomb_state attribute_hidden;
 
 /* Convert WCHAR into its multibyte character representation,
    putting this in S and returning its length.
@@ -47,11 +49,11 @@ wctomb (char *s, wchar_t wchar)
 
       /* This is an extension in the Unix standard which does not directly
 	 violate ISO C.  */
-      memset (&__no_r_state, '\0', sizeof __no_r_state);
+      memset (&__wctomb_state, '\0', sizeof __wctomb_state);
 
       return fcts->tomb->__stateful;
     }
 
-  return __wcrtomb (s, wchar, &__no_r_state);
+  return __wcrtomb (s, wchar, &__wctomb_state);
 }
 libc_hidden_def (wctomb)