aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads
diff options
context:
space:
mode:
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog6
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h12
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h12
3 files changed, 16 insertions, 14 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 0faf95f01e..69dbacf4d2 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-25 Richard Sandiford <rsandifo@redhat.com>
+
+ * sysdeps/unix/sysv/linux/mips/sysdep-cancel.h (CENABLE, CDISABLE,
+ __local_multiple_threads): Fix definitions for IS_IN_librt.
+ * sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h: Likewise.
+
2004-08-22 Andreas Schwab <schwab@suse.de>
* sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (PSEUDO) [IS_IN_librt]:
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
index 8949877963..fc51774252 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
@@ -1,5 +1,5 @@
/* system call stubs with cancellation handling. Linux/MIPS version.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Chris Demetriou of Broadcom Corporation,
based on work by Guido Guenther <agx@sigxcpu.org>.
@@ -119,18 +119,16 @@
# define CENABLE PTR_LA t9, __pthread_enable_asynccancel; jalr t9;
# define CDISABLE PTR_LA t9, __pthread_disable_asynccancel; jalr t9;
# define __local_multiple_threads __pthread_multiple_threads
+# elif defined IS_IN_librt
+# define CENABLE PTR_LA t9, __librt_enable_asynccancel; jalr t9;
+# define CDISABLE PTR_LA t9, __librt_disable_asynccancel; jalr t9;
+# define __local_multiple_threads __librt_multiple_threads
# else
# define CENABLE PTR_LA t9, __libc_enable_asynccancel; jalr t9;
# define CDISABLE PTR_LA t9, __libc_disable_asynccancel; jalr t9;
# define __local_multiple_threads __libc_multiple_threads
# endif
-# if !defined NOT_IN_libc
-# define __local_multiple_threads __libc_multiple_threads
-# else
-# define __local_multiple_threads __pthread_multiple_threads
-# endif
-
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
index db30c96c24..1fff782397 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Guido Guenther <agx@sigxcpu.org>, 2003.
@@ -118,18 +118,16 @@
# define CENABLE la t9, __pthread_enable_asynccancel; jalr t9;
# define CDISABLE la t9, __pthread_disable_asynccancel; jalr t9;
# define __local_multiple_threads __pthread_multiple_threads
+# elif defined IS_IN_librt
+# define CENABLE la t9, __librt_enable_asynccancel; jalr t9;
+# define CDISABLE la t9, __librt_disable_asynccancel; jalr t9;
+# define __local_multiple_threads __librt_multiple_threads
# else
# define CENABLE la t9, __libc_enable_asynccancel; jalr t9;
# define CDISABLE la t9, __libc_disable_asynccancel; jalr t9;
# define __local_multiple_threads __libc_multiple_threads
# endif
-# if !defined NOT_IN_libc
-# define __local_multiple_threads __libc_multiple_threads
-# else
-# define __local_multiple_threads __pthread_multiple_threads
-# endif
-
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)