* sysdeps/unix/sysv/linux/mips/sys/tas.h (_test_and_set): Don't .set mips2 on new...

2003-03-14  Alexandre Oliva  <aoliva@redhat.com>

	* sysdeps/unix/sysv/linux/mips/sys/tas.h (_test_and_set): Don't
	.set mips2 on new abis.

diff --git a/ChangeLog b/ChangeLog
index caaeed936c2bd79ef43e2e5de22f44570a4db06c..811babc9bf114bf87c6ef4996a1c99832fd2c89e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-14  Alexandre Oliva  <aoliva@redhat.com>
+
+       * sysdeps/unix/sysv/linux/mips/sys/tas.h (_test_and_set): Don't
+       .set mips2 on new abis.
+
 2003-03-13  Ulrich Drepper  <drepper@redhat.com>
 
        * posix/getconf.c: Recognize POSIX2_SYMLINKS.
@@ -17,8 +22,6 @@
        * stdlib/strtod.c: Include gmp-mparam.h before gmp.h and
        gmp-impl.h.
 
-2003-03-14  Alexandre Oliva  <aoliva@redhat.com>
-
        * elf/dl-conflict.c: Don't compile _dl_resolve_conflicts if
        ELF_MACHINE_NO_RELA is set.
        * elf/rtld.c (dl_main): No prelink support for REL-only.

diff --git a/sysdeps/unix/sysv/linux/mips/sys/tas.h b/sysdeps/unix/sysv/linux/mips/sys/tas.h
index 7ad916c3c9e0fbca6612f7cc9f49a663bd1c6b1d..a840a9427a42bcfe3744c96e7653451e5a8b06da 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/sys/tas.h
+++ b/sysdeps/unix/sysv/linux/mips/sys/tas.h
@@ -1,4 +1,4 @@
-/* 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.
    Contributed by Maciej W. Rozycki <macro@ds2.pg.gda.pl>, 2000.
 
@@ -41,7 +41,9 @@ _test_and_set (int *p, int v) __THROW
     ("/* Inline test and set */\n"
      "1:\n\t"
      ".set     push\n\t"
+#if _MIPS_SIM == _MIPS_SIM_ABI32
      ".set     mips2\n\t"
+#endif
      "ll       %0,%3\n\t"
      "move     %1,%4\n\t"
      "beq      %0,%4,2f\n\t"