Update.

2003-10-07  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Backout 2003-10-02
	changes.
	(SAVE_OLDTYPE_0): Fix a typo.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 2241a28..a096fe9 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-07  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Backout 2003-10-02
+       changes.
+       (SAVE_OLDTYPE_0): Fix a typo.
+
 2003-10-02  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (DOCARGS_1): Use

diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index 5cf115c..baba152 100644 (file)
--- a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
@@ -50,11 +50,11 @@
   L(pseudo_end):
 
 # define SAVE_OLDTYPE_0        movl %eax, %ecx;
-# define SAVE_OLDTYPE_1        pushl %eax;
-# define SAVE_OLDTYPE_2        SAVE_OLDTYPE_1
-# define SAVE_OLDTYPE_3        SAVE_OLDTYPE_1
-# define SAVE_OLDTYPE_4        SAVE_OLDTYPE_1
-# define SAVE_OLDTYPE_5        SAVE_OLDTYPE_1
+# define SAVE_OLDTYPE_1        SAVE_OLDTYPE_0
+# define SAVE_OLDTYPE_2        pushl %eax;
+# define SAVE_OLDTYPE_3        SAVE_OLDTYPE_2
+# define SAVE_OLDTYPE_4        SAVE_OLDTYPE_2
+# define SAVE_OLDTYPE_5        SAVE_OLDTYPE_2
 
 # define PUSHCARGS_0   /* No arguments to push.  */
 # define DOCARGS_0     /* No arguments to frob.  */
@@ -63,7 +63,7 @@
 # define _POPCARGS_0   /* No arguments to pop.  */
 
 # define PUSHCARGS_1   movl %ebx, %edx; PUSHCARGS_0
-# define DOCARGS_1     _DOARGS_1 (8)
+# define DOCARGS_1     _DOARGS_1 (4)
 # define POPCARGS_1    POPCARGS_0; movl %edx, %ebx
 # define _PUSHCARGS_1  pushl %ebx; L(PUSHBX2): _PUSHCARGS_0
 # define _POPCARGS_1   _POPCARGS_0; popl %ebx; L(POPBX2):
@@ -100,11 +100,11 @@
 #  define CDISABLE     call __libc_disable_asynccancel
 # endif
 # define POPSTATE_0    pushl %eax; movl %ecx, %eax; CDISABLE; popl %eax;
-# define POPSTATE_1    xchgl (%esp), %eax; CDISABLE; popl %eax;
-# define POPSTATE_2    POPSTATE_1
-# define POPSTATE_3    POPSTATE_1
-# define POPSTATE_4    POPSTATE_1
-# define POPSTATE_5    POPSTATE_1
+# define POPSTATE_1    POPSTATE_0
+# define POPSTATE_2    xchgl (%esp), %eax; CDISABLE; popl %eax;
+# define POPSTATE_3    POPSTATE_2
+# define POPSTATE_4    POPSTATE_2
+# define POPSTATE_5    POPSTATE_2
 
 #if !defined NOT_IN_libc
 # define __local_multiple_threads __libc_multiple_threads

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b958935..3a399f0 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-07  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Backout 2003-10-02
+       changes.
+       (SAVE_OLDTYPE_0): Fix a typo.
+
 2003-10-03  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/i386/pthread_once.S (__pthread_once):

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index b53ecca..0dead61 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
@@ -301,11 +301,11 @@
 # define ASM_SIZE_DIRECTIVE(name) L(name##END): .size name,.-name;
 
 # define SAVE_OLDTYPE_0        movl %eax, %ecx;
-# define SAVE_OLDTYPE_1        pushl %eax; L(PUSHSTATE):
-# define SAVE_OLDTYPE_2        SAVE_OLDTYPE_1
-# define SAVE_OLDTYPE_3        SAVE_OLDTYPE_1
-# define SAVE_OLDTYPE_4        SAVE_OLDTYPE_1
-# define SAVE_OLDTYPE_5        SAVE_OLDTYPE_1
+# define SAVE_OLDTYPE_1        SAVE_OLDTYPE_0
+# define SAVE_OLDTYPE_2        pushl %eax; L(PUSHSTATE):
+# define SAVE_OLDTYPE_3        SAVE_OLDTYPE_2
+# define SAVE_OLDTYPE_4        SAVE_OLDTYPE_2
+# define SAVE_OLDTYPE_5        SAVE_OLDTYPE_2
 
 # define PUSHCARGS_0   /* No arguments to push.  */
 # define DOCARGS_0     /* No arguments to frob.  */
@@ -314,7 +314,7 @@
 # define _POPCARGS_0   /* No arguments to pop.  */
 
 # define PUSHCARGS_1   movl %ebx, %edx; L(SAVEBX2): PUSHCARGS_0
-# define DOCARGS_1     _DOARGS_1 (8)
+# define DOCARGS_1     _DOARGS_1 (4)
 # define POPCARGS_1    POPCARGS_0; movl %edx, %ebx; L(RESTBX2):
 # define _PUSHCARGS_1  pushl %ebx; L(PUSHBX2): _PUSHCARGS_0
 # define _POPCARGS_1   _POPCARGS_0; popl %ebx; L(POPBX2):
@@ -357,8 +357,8 @@
 # endif
 # define POPSTATE_0 \
  pushl %eax; L(PUSHSTATE): movl %ecx, %eax; CDISABLE; popl %eax; L(POPSTATE):
-# define POPSTATE_1    xchgl (%esp), %eax; CDISABLE; popl %eax; L(POPSTATE):
-# define POPSTATE_2    POPSTATE_1
+# define POPSTATE_1    POPSTATE_0
+# define POPSTATE_2    xchgl (%esp), %eax; CDISABLE; popl %eax; L(POPSTATE):
 # define POPSTATE_3    POPSTATE_2
 # define POPSTATE_4    POPSTATE_3
 # define POPSTATE_5    POPSTATE_4

diff --git a/posix/bug-regex11.c b/posix/bug-regex11.c
index c7a8b65..ae4bb06 100644 (file)
--- a/posix/bug-regex11.c
+++ b/posix/bug-regex11.c
@@ -58,10 +58,8 @@ struct
   { "([0-9]).*\\1(a*)", "7;7a6", REG_EXTENDED, 3, { { 0, 4 }, { 0, 1 }, { 3, 4 } } },
   { "([0-9]).*\\1(a*)", "7;7a", REG_EXTENDED, 3, { { 0, 4 }, { 0, 1 }, { 3, 4 } } },
 #if 0
-  /* XXX This test seems wrong. --drepper */
-  { "()(b)\\1c\\2", "bcb", REG_EXTENDED, 3, { { 0, 3 }, { 0, 0 }, { 1, 2 } } },
-
   /* XXX Not used since they fail so far.  */
+  { "()(b)\\1c\\2", "bcb", REG_EXTENDED, 3, { { 0, 3 }, { 0, 0 }, { 1, 2 } } },
   { "(b())\\2\\1", "bbbb", REG_EXTENDED, 3, { { 0, 2 }, { 0, 1 }, { 1, 1 } } },
   { "(bb())\\2\\1", "bbbb", REG_EXTENDED, 3, { { 0, 4 }, { 0, 2 }, { 2, 2 } } },
 #endif