diff options
Diffstat (limited to 'linuxthreads')
-rw-r--r-- | linuxthreads/ChangeLog | 5 | ||||
-rw-r--r-- | linuxthreads/sysdeps/mips/pspinlock.c | 4 | ||||
-rw-r--r-- | linuxthreads/sysdeps/mips/pt-machine.h | 8 |
3 files changed, 13 insertions, 4 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 60ef3f7968..a9600871e5 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2004-07-20 Alexandre Oliva <aoliva@redhat.com> + + * sysdeps/mips/atomicity.h, sysdeps/mips/pt-machine.h: Use + standard names for ABI macros, include sgidefs.h where appropriate. + 2004-07-19 Alexandre Oliva <aoliva@redhat.com> * sysdeps/unix/sysv/linux/mips/Makefile (CFLAGS-pt-initfini.s): diff --git a/linuxthreads/sysdeps/mips/pspinlock.c b/linuxthreads/sysdeps/mips/pspinlock.c index a9fb19f674..b04b9ffea9 100644 --- a/linuxthreads/sysdeps/mips/pspinlock.c +++ b/linuxthreads/sysdeps/mips/pspinlock.c @@ -1,5 +1,5 @@ /* POSIX spinlock implementation. MIPS version. - Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,6 +22,8 @@ #include <sys/tas.h> #include "internals.h" +#include <sgidefs.h> + /* This implementation is similar to the one used in the Linux kernel. */ int __pthread_spin_lock (pthread_spinlock_t *lock) diff --git a/linuxthreads/sysdeps/mips/pt-machine.h b/linuxthreads/sysdeps/mips/pt-machine.h index f9028d2640..c2f448e4be 100644 --- a/linuxthreads/sysdeps/mips/pt-machine.h +++ b/linuxthreads/sysdeps/mips/pt-machine.h @@ -1,6 +1,6 @@ /* Machine-dependent pthreads configuration and inline functions. - Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003 + Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ralf Baechle <ralf@gnu.org>. @@ -26,6 +26,8 @@ #include <sys/tas.h> +#include <sgidefs.h> + #ifndef PT_EI # define PT_EI extern inline __attribute__ ((always_inline)) #endif @@ -64,7 +66,7 @@ __compare_and_swap (long int *p, long int oldval, long int newval) #if _MIPS_SIM == _MIPS_SIM_ABI32 ".set mips2\n\t" #endif -#if defined _ABI64 && _MIPS_SIM == _ABI64 +#if _MIPS_SIM == _MIPS_SIM_ABI64 "lld %1,%5\n\t" #else "ll %1,%5\n\t" @@ -72,7 +74,7 @@ __compare_and_swap (long int *p, long int oldval, long int newval) "move %0,$0\n\t" "bne %1,%3,2f\n\t" "move %0,%4\n\t" -#if defined _ABI64 && _MIPS_SIM == _ABI64 +#if _MIPS_SIM == _MIPS_SIM_ABI64 "scd %0,%2\n\t" #else "sc %0,%2\n\t" |