aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-10-02 17:32:59 +0000
committerUlrich Drepper <drepper@redhat.com>2003-10-02 17:32:59 +0000
commit4d961dc7aa520e17b15e1fe024be8d6ccdadf87e (patch)
tree0205b06a1bb861d631d175a0c5587f3f5a35b7e0 /nptl
parentbf8288adc819b5a760d3937a1252e593acaa069e (diff)
downloadglibc-4d961dc7aa520e17b15e1fe024be8d6ccdadf87e.zip
glibc-4d961dc7aa520e17b15e1fe024be8d6ccdadf87e.tar.gz
glibc-4d961dc7aa520e17b15e1fe024be8d6ccdadf87e.tar.bz2
Update.
2003-10-02 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Fix saving and restoring of the old cancellation type. * sysdeps/pthread/malloc-machine.h: New file
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog7
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h16
2 files changed, 14 insertions, 9 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 6ce8758..9cf02f8 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,10 +1,15 @@
+2003-10-02 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Fix saving and
+ restoring of the old cancellation type.
+
2003-09-30 Jakub Jelinek <jakub@redhat.com>
* sysdeps/pthread/malloc-machine.h: Remove misleading comment.
2003-09-27 Wolfram Gloger <wg@malloc.de>
- * sysdeps/pthread/malloc-machine.h: New file.
+ * sysdeps/pthread/malloc-machine.h: New file
2003-09-24 Roland McGrath <roland@redhat.com>
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index 8eb6ede..5201082 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