* sysdeps/mips/pspinlock.c (__pthread_spin_lock): Don't .set mips2 on new abi. *...

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.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index e226fa7566d0c483b1c353794a2e2c29aecb1913..ae149bd468764ae7fada596b132cd39e100ea744 100644 (file)
--- 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 da4b5c19a3fb24d037f7bdba6009b290ebc9a566..a9fb19f674424ec214f047eef0020c8e0d383594 100644 (file)
--- 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 59d26740f37f64f53d0b3cdd8db6f174887e1d64..b1375d5cb7af7b4ebb4fd0ede923096e6777d014 100644 (file)
--- 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"