From e700a90879806fa32aa21efbf877db646a8d9fd8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 7 Oct 2003 18:50:07 +0000 Subject: Update. 2003-10-07 Jakub Jelinek * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Backout 2003-10-02 changes. (SAVE_OLDTYPE_0): Fix a typo. --- linuxthreads/ChangeLog | 6 ++++++ .../sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 22 +++++++++++----------- nptl/ChangeLog | 6 ++++++ nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 16 ++++++++-------- posix/bug-regex11.c | 4 +--- 5 files changed, 32 insertions(+), 22 deletions(-) diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 2241a28eac..a096fe93b3 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,9 @@ +2003-10-07 Jakub Jelinek + + * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Backout 2003-10-02 + changes. + (SAVE_OLDTYPE_0): Fix a typo. + 2003-10-02 Ulrich Drepper * 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 5cf115c549..baba152a77 100644 --- 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 b958935cc8..3a399f0936 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2003-10-07 Jakub Jelinek + + * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Backout 2003-10-02 + changes. + (SAVE_OLDTYPE_0): Fix a typo. + 2003-10-03 Ulrich Drepper * 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 b53ecca909..0dead61c6a 100644 --- 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 c7a8b6537a..ae4bb06e06 100644 --- 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 -- cgit 1.4.1