about summary refs log tree commit diff
path: root/linuxthreads
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2003-07-28 18:45:38 +0000
committerAndreas Jaeger <aj@suse.de>2003-07-28 18:45:38 +0000
commit01fd72acb34df05c1c23ac998ae73540d279397e (patch)
treef92ccad498d030f8e6602ff07ead0f07fb2a1407 /linuxthreads
parent35107e0ce4a5ba642890a057ad5fc080d71ed9a4 (diff)
downloadglibc-01fd72acb34df05c1c23ac998ae73540d279397e.tar.gz
glibc-01fd72acb34df05c1c23ac998ae73540d279397e.tar.xz
glibc-01fd72acb34df05c1c23ac998ae73540d279397e.zip
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-14  Guido Guenther  <agx@sigxcpu.org>

	* sysdeps/unix/sysv/linux/mips/sysdep-cancel.h: Add IS_IN_librt,
	use L() for local labels.
Diffstat (limited to 'linuxthreads')
-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 */