From: Richard Henderson <rth@redhat.com>
Date: Sat, 13 Mar 2004 05:29:24 +0000 (+0000)
Subject:         * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h: Propagate
X-Git-Tag: glibc-2.16-ports-before-merge~1211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5e72ef81aad6662c1281bc0df26f55c23a419dd;p=thirdparty%2Fglibc.git

    * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h: Propagate
        oldvalue from CENABLE to CDISABLE.
---

diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/alpha/nptl/sysdep-cancel.h
index 3b08b22c1a8..794d7fc4420 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/alpha/nptl/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);					\