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 /nptl | |
| 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 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 16 |
2 files changed, 14 insertions, 8 deletions
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 <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 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 |