about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2004-03-13 05:29:24 +0000
committerRichard Henderson <rth@redhat.com>2004-03-13 05:29:24 +0000
commit841153fa02afb1e115bfc3dd504c2ee7354c1f56 (patch)
tree2496b24cb7677359159eda40dcf26a3c97ac2c72
parentf4089ca1d62c68c980d36147b220261bd9e22ae5 (diff)
downloadglibc-841153fa02afb1e115bfc3dd504c2ee7354c1f56.tar.gz
glibc-841153fa02afb1e115bfc3dd504c2ee7354c1f56.tar.xz
glibc-841153fa02afb1e115bfc3dd504c2ee7354c1f56.zip
* sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h: Propagate oldvalue from CENABLE to CDISABLE.
2004-03-12  Richard Henderson  <rth@redhat.com>

        * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h: Propagate
        oldvalue from CENABLE to CDISABLE.
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 755d6fee3d..91b8205366 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-12  Richard Henderson  <rth@redhat.com>
+
+        * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h: Propagate
+        oldvalue from CENABLE to CDISABLE.
+
 2004-03-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/bits/local_lim.h: Define HOST_NAME_MAX.
diff --git a/nptl/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
index 3b08b22c1a..794d7fc442 100644
--- a/nptl/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
+++ b/nptl/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
@@ -63,9 +63,14 @@ __LABEL($pseudo_cancel)						\
 	SAVE_ARGS_##args;					\
 	CENABLE;						\
 	LOAD_ARGS_##args;					\
+	/* Save the CENABLE return value in RA.  That register	\
+	   is preserved across syscall and the real return 	\
+	   address is saved on the stack.  */			\
+	mov	v0, ra;						\
 	lda	v0, SYS_ify(syscall_name);			\
 	call_pal PAL_callsys;					\
 	stq	v0, 8(sp);					\
+	mov	ra, a0;						\
 	bne	a3, $multi_error;				\
 	CDISABLE;						\
 	ldq	ra, 0(sp);					\