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. --- nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'nptl/sysdeps/unix/sysv/linux/i386') 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 -- cgit 1.4.1