From 4d961dc7aa520e17b15e1fe024be8d6ccdadf87e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 2 Oct 2003 17:32:59 +0000 Subject: Update. 2003-10-02 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Fix saving and restoring of the old cancellation type. * sysdeps/pthread/malloc-machine.h: New file --- nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'nptl/sysdeps/unix') diff --git a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index 8eb6ede89d..5201082b0d 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h @@ -300,12 +300,12 @@ # undef ASM_SIZE_DIRECTIVE # define ASM_SIZE_DIRECTIVE(name) L(name##END): .size name,.-name; -# define SAVE_OLDTYPE_0 movl %eax, %edx; -# 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 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 PUSHCARGS_0 /* No arguments to push. */ # define DOCARGS_0 /* No arguments to frob. */ @@ -357,8 +357,8 @@ # endif # define POPSTATE_0 \ pushl %eax; L(PUSHSTATE): movl %ecx, %eax; CDISABLE; popl %eax; L(POPSTATE): -# define POPSTATE_1 POPSTATE_0 -# define POPSTATE_2 xchgl (%esp), %eax; CDISABLE; popl %eax; L(POPSTATE): +# define POPSTATE_1 xchgl (%esp), %eax; CDISABLE; popl %eax; L(POPSTATE): +# define POPSTATE_2 POPSTATE_1 # define POPSTATE_3 POPSTATE_2 # define POPSTATE_4 POPSTATE_3 # define POPSTATE_5 POPSTATE_4 -- cgit v1.2.3