3 files changed, 9 insertions, 39 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 37a8457..f39011e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-30  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* configure.target: Remove mips from cpu table.
+	* config/cpu/mips/bits/atomicity.h: Remove generic
+	versions. Comment sgidefs include.
+	
 2001-07-25  H.J. Lu <hjl@gnu.org>
 
 	* configure.target (cpu_include_dir): Set to `config/cpu/mips'
diff --git a/libstdc++-v3/config/cpu/mips/bits/atomicity.h b/libstdc++-v3/config/cpu/mips/bits/atomicity.h
index d3e7743..cab43eb 100644
--- a/libstdc++-v3/config/cpu/mips/bits/atomicity.h
+++ b/libstdc++-v3/config/cpu/mips/bits/atomicity.h
@@ -1,4 +1,4 @@
-// Low-level functions for atomic operations. Mips version.
+// Low-level functions for atomic operations. MIPS II version.
 
 // Copyright (C) 2001 Free Software Foundation, Inc.
 //
@@ -30,12 +30,11 @@
 #ifndef _BITS_ATOMICITY_H 
 #define _BITS_ATOMICITY_H 1
 
-#include <sgidefs.h>
+// #include <sgidefs.h>
+// #ifdef (_MIPS_ISA_MIPS2)
 
 typedef int _Atomic_word;
 
-#if (_MIPS_ISA >= _MIPS_ISA_MIPS2)
-
 static inline int
 __attribute__ ((unused))
 __exchange_and_add (volatile _Atomic_word *__mem, int __val)
@@ -103,36 +102,4 @@ __compare_and_swap (volatile long int *__p, long int __oldval,
   return __ret;
 }
 
-#else /* (_MIPS_ISA >= _MIPS_ISA_MIPS2) */
-
-static inline int
-__attribute__ ((unused))
-__exchange_and_add (volatile _Atomic_word *__mem, int __val)
-{
-  int __result = *__mem;
-  *__mem += __val;
-  return __result;
-}
-
-static inline void
-__attribute__ ((unused))
-__atomic_add (volatile _Atomic_word *__mem, int __val)
-{
-  *__mem += __val;
-}
-
-static inline int
-__attribute__ ((unused))
-__compare_and_swap (volatile long int *__p, long int __oldval,
-		    long int __newval)
-{
-  if (*__p != __oldval)
-    return 0;
-
-  *__p = __newval;
-  return 1;
-}
-
-#endif /* !(_MIPS_ISA >= _MIPS_ISA_MIPS2) */
-
 #endif /* atomicity.h */
diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target
index 6d6259c..5e619d0 100644
--- a/libstdc++-v3/configure.target
+++ b/libstdc++-v3/configure.target
@@ -39,9 +39,6 @@ case "${target_cpu}" in
   i486 | i586 | i686 | i786)
     cpu_include_dir="config/cpu/i486"
     ;;
-  mips*)
-    cpu_include_dir="config/cpu/mips"
-    ;;
   powerpc | rs6000)
     cpu_include_dir="config/cpu/powerpc"
     ;;