Update.

	* malloc/hooks.c (realloc_check): If mremap succeeds actually use
	the result.

	* sysdeps/i386/i486/bits/string.h: Add early clobber for "a"
	output parameter.  Reported by Denis Zaitsev <zzz@cd-club.ru>.

	* Versions.def (libthread_db): Add GLIBC_2.3.

2002-07-09  Jakub Jelinek  <jakub@redhat.com>

	* libio/freopen.c (freopen): Reset jump tables, use mmap stdio for the
	new stream if possible.
	* libio/freopen64.c (freopen64): Likewise.
	* libio/Makefile (tests): Add tst-freopen.
	* libio/tst-freopen.c: New file.

2002-07-03  Jakub Jelinek  <jakub@redhat.com>

	* libio/stdio.h (obstack_printf): Add format attribute.
	(obstack_vprintf): Likewise.

2002-07-04  Jakub Jelinek  <jakub@redhat.com>

	* posix/regex_internal.h (re_token_t): Shrink the structure to 8
	resp. 16 bytes on 32-bit resp. 64-bit platforms.
	(re_charset_t, re_string_t): Reorder structure members for 64-bit
	architectures.

2002-07-04  Jakub Jelinek  <jakub@redhat.com>

	* posix/regcomp.c (re_compile_internal): Move clearing of dfa...
	(init_dfa): ...here.

2002-07-05  Isamu Hasegawa  <isamu@yamato.ibm.com>

	* posix/regcomp.c (parse_sub_exp): Add nodes OP_OPEN_SUBEXP and
	OP_CLOSE_SUBEXP at both ends of sub expressions instead of SUBEXP
	nodes in parse trees.
	(calc_first): Fix the Definition of `firsts' of OP_OPEN_SUBEXP
	and OP_CLOSE_SUBEXP, and remove the definition of SUBEXP.
	(calc_epsdest): Treat OP_OPEN_SUBEXP and OP_CLOSE_SUBEXP as the
	nodes which can epsilon transit.
	* posix/regex_internal.h: Add OP_OPEN_SUBEXP and OP_CLOSE_SUBEXP
	to IS_EPSILON_NODE macro.
	* posix/regexec.c (update_regs): New function to update registers
	by refering OP_OPEN_SUBEXP and OP_CLOSE_SUBEXP nodes.
	(proceed_next_node): Use the entities of the nodes to determine
	whether the node can transit to.
	(set_regs): Use update_regs function to update registers.

2002-07-03  Jakub Jelinek  <jakub@redhat.com>

	* posix/bug-regex4.c (main): Remove duplicate setlocale.
	* posix/bug-regex6.c: New file.
	* posix/Makefile (tests): Add bug-regex6.
	(bug-regex6-ENV): Set LOCPATH.

2002-07-10  Ulrich Drepper  <drepper@redhat.com>

7 files changed, 71 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 6bc44d7ff6..8ab81718c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,64 @@
 2002-07-10  Ulrich Drepper  <drepper@redhat.com>
 
+	* malloc/hooks.c (realloc_check): If mremap succeeds actually use
+	the result.
+
+	* sysdeps/i386/i486/bits/string.h: Add early clobber for "a"
+	output parameter.  Reported by Denis Zaitsev <zzz@cd-club.ru>.
+
+	* Versions.def (libthread_db): Add GLIBC_2.3.
+
+2002-07-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* libio/freopen.c (freopen): Reset jump tables, use mmap stdio for the
+	new stream if possible.
+	* libio/freopen64.c (freopen64): Likewise.
+	* libio/Makefile (tests): Add tst-freopen.
+	* libio/tst-freopen.c: New file.
+
+2002-07-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* libio/stdio.h (obstack_printf): Add format attribute.
+	(obstack_vprintf): Likewise.
+
+2002-07-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* posix/regex_internal.h (re_token_t): Shrink the structure to 8
+	resp. 16 bytes on 32-bit resp. 64-bit platforms.
+	(re_charset_t, re_string_t): Reorder structure members for 64-bit
+	architectures.
+
+2002-07-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* posix/regcomp.c (re_compile_internal): Move clearing of dfa...
+	(init_dfa): ...here.
+
+2002-07-05  Isamu Hasegawa  <isamu@yamato.ibm.com>
+
+	* posix/regcomp.c (parse_sub_exp): Add nodes OP_OPEN_SUBEXP and
+	OP_CLOSE_SUBEXP at both ends of sub expressions instead of SUBEXP
+	nodes in parse trees.
+	(calc_first): Fix the Definition of `firsts' of OP_OPEN_SUBEXP
+	and OP_CLOSE_SUBEXP, and remove the definition of SUBEXP.
+	(calc_epsdest): Treat OP_OPEN_SUBEXP and OP_CLOSE_SUBEXP as the
+	nodes which can epsilon transit.
+	* posix/regex_internal.h: Add OP_OPEN_SUBEXP and OP_CLOSE_SUBEXP
+	to IS_EPSILON_NODE macro.
+	* posix/regexec.c (update_regs): New function to update registers
+	by refering OP_OPEN_SUBEXP and OP_CLOSE_SUBEXP nodes.
+	(proceed_next_node): Use the entities of the nodes to determine
+	whether the node can transit to.
+	(set_regs): Use update_regs function to update registers.
+
+2002-07-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* posix/bug-regex4.c (main): Remove duplicate setlocale.
+	* posix/bug-regex6.c: New file.
+	* posix/Makefile (tests): Add bug-regex6.
+	(bug-regex6-ENV): Set LOCPATH.
+
+2002-07-10  Ulrich Drepper  <drepper@redhat.com>
+
 	* Versions.def [libpthread]: Add GLIBC_2.2.6.
 	* posix/Versions [libc] (GLIBC_2.2.6): Add __nanosleep.
 
diff --git a/iconvdata/iso-2022-jp-3.c b/iconvdata/iso-2022-jp-3.c
index 2bf666cb8f..2704a17b7f 100644
--- a/iconvdata/iso-2022-jp-3.c
+++ b/iconvdata/iso-2022-jp-3.c
@@ -109,9 +109,8 @@ enum
 		    {							      \
 		      /* Write out the shift sequence before the last	      \
 			 character.  */					      \
-		      int set = data->__statep->__count & CURRENT_SEL_MASK;   \
-									      \
-		      assert (set == JISX0208_1983_set);		      \
+		      assert ((data->__statep->__count & CURRENT_SEL_MASK)    \
+			      == JISX0208_1983_set);			      \
 		      *outbuf++ = ESC;					      \
 		      *outbuf++ = '$';					      \
 		      *outbuf++ = 'B';					      \
diff --git a/libio/tst-eof.c b/libio/tst-eof.c
index 627eaf8ac5..4c5ec01692 100644
--- a/libio/tst-eof.c
+++ b/libio/tst-eof.c
@@ -15,8 +15,6 @@ do_test (void)
   char *buf;
   int fd;
   FILE *fp;
-  int ch;
-  char tm[20];
 
   buf = (char *) malloc (strlen (test_dir) + sizeof "/tst-eof.XXXXXX");
   if (buf == NULL)
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index de239845ec..fd8788c7f3 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-01  Jakub Jelinek  <jakub@redhat.com>
+
+	* Examples/ex9.c (main): Remove unused th variable.
+
 2002-07-10  Ulrich Drepper  <drepper@redhat.com>
 
 	* wrapsyscall.c: Add __nanosleep alias.
diff --git a/linuxthreads/Examples/ex9.c b/linuxthreads/Examples/ex9.c
index 9b8aca3b94..e2421a5c41 100644
--- a/linuxthreads/Examples/ex9.c
+++ b/linuxthreads/Examples/ex9.c
@@ -32,7 +32,6 @@ static pthread_barrier_t barrier;
 int
 main (void)
 {
-  pthread_t th; 
   pthread_t thread_list[NUM_THREADS]; 
   int i;
 
diff --git a/malloc/hooks.c b/malloc/hooks.c
index 2dc5cf55e5..87b9e52e43 100644
--- a/malloc/hooks.c
+++ b/malloc/hooks.c
@@ -367,6 +367,8 @@ realloc_check(oldmem, bytes, caller)
         }
       }
 #if HAVE_MREMAP
+    } else {
+      newmem = chunk2mem(newp);
     }
 #endif
   } else {
diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h
index cbb074712a..cc8594ff36 100644
--- a/sysdeps/i386/i486/bits/string.h
+++ b/sysdeps/i386/i486/bits/string.h
@@ -186,7 +186,7 @@ memcmp (__const void *__s1, __const void *__s2, size_t __n)
      "sbbl	%0,%0\n\t"
      "orl	$1,%0\n"
      "1:"
-     : "=a" (__res), "=&S" (__d0), "=&D" (__d1), "=&c" (__d2)
+     : "=&a" (__res), "=&S" (__d0), "=&D" (__d1), "=&c" (__d2)
      : "0" (0), "1" (__s1), "2" (__s2), "3" (__n),
        "m" ( *(struct { __extension__ char __x[__n]; } *)__s1),
        "m" ( *(struct { __extension__ char __x[__n]; } *)__s2)
@@ -1861,7 +1861,7 @@ __strstr_cg (__const char *__haystack, __const char __needle[],
      "jne	1b\n\t"
      "xorl	%%eax,%%eax\n"
      "2:"
-     : "=a" (__res), "=&S" (__d0), "=&D" (__d1), "=&c" (__d2)
+     : "=&a" (__res), "=&S" (__d0), "=&D" (__d1), "=&c" (__d2)
      : "g" (__needle_len), "1" (__haystack), "d" (__needle)
      : "memory", "cc");
   return __res;
@@ -1894,7 +1894,7 @@ __strstr_g (__const char *__haystack, __const char *__needle)
      "xorl	%%eax,%%eax\n"
      "2:\n\t"
      "popl	%%ebx"
-     : "=a" (__res), "=&c" (__d0), "=&S" (__d1), "=&D" (__d2)
+     : "=&a" (__res), "=&c" (__d0), "=&S" (__d1), "=&D" (__d2)
      : "0" (0), "1" (0xffffffff), "2" (__haystack), "3" (__needle),
        "d" (__needle)
      : "memory", "cc");
@@ -1923,7 +1923,7 @@ __strstr_g (__const char *__haystack, __const char *__needle)
      "jne	1b\n\t"
      "xorl	%%eax,%%eax\n"
      "2:"
-     : "=a" (__res), "=&c" (__d0), "=&S" (__d1), "=&D" (__d2), "=&d" (__d3)
+     : "=&a" (__res), "=&c" (__d0), "=&S" (__d1), "=&D" (__d2), "=&d" (__d3)
      : "0" (0), "1" (0xffffffff), "2" (__haystack), "3" (__needle),
        "b" (__needle)
      : "memory", "cc");