aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2004-03-13 05:29:45 +0000
committerRichard Henderson <rth@redhat.com>2004-03-13 05:29:45 +0000
commitdacf785541dd3484fdcbdf2867657f6c4999f17b (patch)
tree51cf49492aadb1ace3dad888b02f211426706155
parent841153fa02afb1e115bfc3dd504c2ee7354c1f56 (diff)
downloadglibc-dacf785541dd3484fdcbdf2867657f6c4999f17b.tar
glibc-dacf785541dd3484fdcbdf2867657f6c4999f17b.tar.gz
glibc-dacf785541dd3484fdcbdf2867657f6c4999f17b.tar.bz2
glibc-dacf785541dd3484fdcbdf2867657f6c4999f17b.zip
* sysdeps/unix/sysv/linux/alpha/select.S: Fix unwind. Propagate oldvalue from CENABLE to CDISABLE.
2004-03-12 Richard Henderson <rth@redhat.com> * sysdeps/unix/sysv/linux/alpha/select.S: Fix unwind. Propagate oldvalue from CENABLE to CDISABLE.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/alpha/select.S8
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ffca858c26..82e3246c33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-12 Richard Henderson <rth@redhat.com>
+
+ * sysdeps/unix/sysv/linux/alpha/select.S: Fix unwind. Propagate
+ oldvalue from CENABLE to CDISABLE.
+
2004-03-12 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sysconf.c: New file.
diff --git a/sysdeps/unix/sysv/linux/alpha/select.S b/sysdeps/unix/sysv/linux/alpha/select.S
index 4a0594cbe9..458cda9246 100644
--- a/sysdeps/unix/sysv/linux/alpha/select.S
+++ b/sysdeps/unix/sysv/linux/alpha/select.S
@@ -53,6 +53,8 @@ LEAF(SELECT, 64)
jsr AT, (AT), _mcount
.set at
#endif
+ stq ra, 40(sp)
+ .mask 0x4000000, 40-64
.prologue 1
#ifdef CENABLE
@@ -131,9 +133,9 @@ $do_cancel:
stq a1, 16(sp)
stq a2, 24(sp)
stq a3, 32(sp)
- stq ra, 40(sp)
CENABLE
+ mov v0, ra
ldl t0, __libc_missing_axp_tv64
bne t0, $do_cancel32
@@ -147,6 +149,8 @@ $do_cancel:
ldi v0, SYS_ify(select)
callsys
+
+ mov ra, a0
bne a3, $cancel_err64
stq v0, 8(sp)
@@ -184,6 +188,8 @@ $do_cancel32:
1: ldi v0, SYS_ify(osf_select)
callsys
+
+ mov ra, a0
bne a3, $cancel_error
/* ... and bounce the remaining timeout back. */