aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 9a495170b7..ca31927b61 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-14 Guido Guenther <agx@sigxcpu.org>
+
+ * sysdeps/unix/sysv/linux/mips/sysdep-cancel.h: Add IS_IN_librt,
+ use L() for local labels.
+
2003-07-22 Jakub Jelinek <jakub@redhat.com>
* descr.h (struct _pthread_descr_struct): Provide p_res member
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
index 90dacfe2f2..db30c96c24 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <linuxthreads/internals.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
#ifdef __PIC__
# undef PSEUDO
@@ -35,14 +35,14 @@
.cpload t9; \
.set reorder; \
SINGLE_THREAD_P(t0); \
- bne zero, t0, Lpseudo_cancel; \
+ bne zero, t0, L(pseudo_cancel); \
.set noreorder; \
li v0, SYS_ify(syscall_name); \
syscall; \
.set reorder; \
bne a3, zero, SYSCALL_ERROR_LABEL; \
ret; \
- Lpseudo_cancel: \
+ L(pseudo_cancel): \
SAVESTK_##args; \
sw ra, 28(sp); \
sw gp, 32(sp); \
@@ -65,7 +65,7 @@
lw ra, 28(sp); /* restore return address */ \
RESTORESTK; \
bne a3, zero, SYSCALL_ERROR_LABEL; \
- Lpseudo_end:
+ L(pseudo_end):
#endif
# define PUSHARGS_0 /* nothing to do */