diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-11-24 08:05:15 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-11-24 08:05:15 +0000 |
| commit | 945a6124b6aa3047e3d144da4fb47cbbf5da70ee (patch) | |
| tree | 7b7d217428c431919749c4e8280228da5739c25e /linuxthreads | |
| parent | 06bc2b63c861ca3f53e5e98bc0ecd23e4b159531 (diff) | |
| download | glibc-945a6124b6aa3047e3d144da4fb47cbbf5da70ee.tar.gz | |
Updated to fedora-glibc-20041124T0741cvs/fedora-glibc-2_3_3-84
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 7 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/mips/pspinlock.c | 3 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/mips/pt-machine.h | 9 |
3 files changed, 13 insertions, 6 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index e15dc08a10..529d03d2e2 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,10 @@ +2004-11-05 Maciej W. Rozycki <macro@mips.com> + + * sysdeps/mips/pspinlock.c: Include <sgidefs.h>. Use _ABIO32, + _ABIN32 and _ABI64 for ABI selection throughout. + * sysdeps/mips/pt-machine.h: Use _ABIO32, _ABIN32 and _ABI64 for + ABI selection throughout. + 2004-10-18 Roland McGrath <roland@redhat.com> [BZ #406] diff --git a/linuxthreads/sysdeps/mips/pspinlock.c b/linuxthreads/sysdeps/mips/pspinlock.c index b04b9ffea9..350aa7553c 100644 --- a/linuxthreads/sysdeps/mips/pspinlock.c +++ b/linuxthreads/sysdeps/mips/pspinlock.c @@ -19,6 +19,7 @@ #include <errno.h> #include <pthread.h> +#include <sgidefs.h> #include <sys/tas.h> #include "internals.h" @@ -34,7 +35,7 @@ __pthread_spin_lock (pthread_spinlock_t *lock) ("\t\t\t# spin_lock\n" "1:\n\t" ".set push\n\t" -#if _MIPS_SIM == _MIPS_SIM_ABI32 +#if _MIPS_SIM == _ABIO32 ".set mips2\n\t" #endif "ll %1,%3\n\t" diff --git a/linuxthreads/sysdeps/mips/pt-machine.h b/linuxthreads/sysdeps/mips/pt-machine.h index c2f448e4be..96f7a7f8c6 100644 --- a/linuxthreads/sysdeps/mips/pt-machine.h +++ b/linuxthreads/sysdeps/mips/pt-machine.h @@ -24,9 +24,8 @@ #ifndef _PT_MACHINE_H #define _PT_MACHINE_H 1 -#include <sys/tas.h> - #include <sgidefs.h> +#include <sys/tas.h> #ifndef PT_EI # define PT_EI extern inline __attribute__ ((always_inline)) @@ -63,10 +62,10 @@ __compare_and_swap (long int *p, long int oldval, long int newval) ("/* Inline compare & swap */\n" "1:\n\t" ".set push\n\t" -#if _MIPS_SIM == _MIPS_SIM_ABI32 +#if _MIPS_SIM == _ABIO32 ".set mips2\n\t" #endif -#if _MIPS_SIM == _MIPS_SIM_ABI64 +#if _MIPS_SIM == _ABI64 "lld %1,%5\n\t" #else "ll %1,%5\n\t" @@ -74,7 +73,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 _MIPS_SIM == _MIPS_SIM_ABI64 +#if _MIPS_SIM == _ABI64 "scd %0,%2\n\t" #else "sc %0,%2\n\t" |