diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-10-07 18:50:07 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-10-07 18:50:07 +0000 |
| commit | e700a90879806fa32aa21efbf877db646a8d9fd8 (patch) | |
| tree | fe734b671f8bbe3fb342bff6dc2690f389bacdb3 /linuxthreads | |
| parent | d0b96fc49b1535d820fe9680746677e55b8e83db (diff) | |
| download | glibc-e700a90879806fa32aa21efbf877db646a8d9fd8.tar glibc-e700a90879806fa32aa21efbf877db646a8d9fd8.tar.gz glibc-e700a90879806fa32aa21efbf877db646a8d9fd8.tar.bz2 glibc-e700a90879806fa32aa21efbf877db646a8d9fd8.zip | |
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.
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 6 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 22 |
2 files changed, 17 insertions, 11 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 <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 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 |