diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2003-03-14 04:22:05 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2003-03-14 04:22:05 +0000 |
| commit | 7fb8033c1f844b6ec8bc20267153c31d99714b8f (patch) | |
| tree | b8d30dcab011f8b3bd63962be0de64b9f7057489 /linuxthreads | |
| parent | 264befa8c2b8029f614f7671a9b10d489a2e43e1 (diff) | |
| download | glibc-7fb8033c1f844b6ec8bc20267153c31d99714b8f.tar.gz glibc-7fb8033c1f844b6ec8bc20267153c31d99714b8f.tar.xz glibc-7fb8033c1f844b6ec8bc20267153c31d99714b8f.zip | |
* sysdeps/mips/pspinlock.c (__pthread_spin_lock): Don't .set mips2 on new abi. * sysdeps/mips/pt-machine.h (__compare_and_swap): Likewise. Handle 64-bit longs on n64.
2003-03-14 Alexandre Oliva <aoliva@redhat.com> * sysdeps/mips/pspinlock.c (__pthread_spin_lock): Don't .set mips2 on new abi. * sysdeps/mips/pt-machine.h (__compare_and_swap): Likewise. Handle 64-bit longs on n64.
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 7 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/mips/pspinlock.c | 4 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/mips/pt-machine.h | 13 |
3 files changed, 22 insertions, 2 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index e226fa7566..ae149bd468 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,10 @@ +2003-03-14 Alexandre Oliva <aoliva@redhat.com> + + * sysdeps/mips/pspinlock.c (__pthread_spin_lock): Don't .set + mips2 on new abi. + * sysdeps/mips/pt-machine.h (__compare_and_swap): Likewise. + Handle 64-bit longs on n64. + 2003-03-07 Jakub Jelinek <jakub@redhat.com> * sysdeps/ia64/pspinlock.c (__pthread_spin_lock, diff --git a/linuxthreads/sysdeps/mips/pspinlock.c b/linuxthreads/sysdeps/mips/pspinlock.c index da4b5c19a3..a9fb19f674 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 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003 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 @@ -32,7 +32,9 @@ __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 ".set mips2\n\t" +#endif "ll %1,%3\n\t" "li %2,1\n\t" "bnez %1,1b\n\t" diff --git a/linuxthreads/sysdeps/mips/pt-machine.h b/linuxthreads/sysdeps/mips/pt-machine.h index 59d26740f3..b1375d5cb7 100644 --- a/linuxthreads/sysdeps/mips/pt-machine.h +++ b/linuxthreads/sysdeps/mips/pt-machine.h @@ -1,6 +1,7 @@ /* Machine-dependent pthreads configuration and inline functions. - Copyright (C) 1996, 1997, 1998, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ralf Baechle <ralf@gnu.org>. Based on the Alpha version by Richard Henderson <rth@tamu.edu>. @@ -60,12 +61,22 @@ __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 ".set mips2\n\t" +#endif +#if defined _ABI64 && _MIPS_SIM == _ABI64 + "lld %1,%5\n\t" +#else "ll %1,%5\n\t" +#endif "move %0,$0\n\t" "bne %1,%3,2f\n\t" "move %0,%4\n\t" +#if defined _ABI64 && _MIPS_SIM == _ABI64 + "scd %0,%2\n\t" +#else "sc %0,%2\n\t" +#endif ".set pop\n\t" "beqz %0,1b\n" "2:\n\t" |