diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c2180150d74b..0afb262ca704 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-06  Richard Sandiford  <rsandifo@redhat.com>
+
+	* configure.target (mips*): Use the generic atomicity.h by default.
+
 2003-05-05  Loren J. Rittle  <ljrittle@acm.org>
 	    (Inspired by an alternate patch from Danny Smith.)
 
diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target
index 526d300200f0..e3da7bc87c1d 100644
--- a/libstdc++-v3/configure.target
+++ b/libstdc++-v3/configure.target
@@ -75,6 +75,11 @@ case "${target_cpu}" in
   hppa*)
     cpu_include_dir="cpu/hppa"
     ;;
+  mips*)
+    # cpu/mips/atomicity.h needs MIPS II or above.  Only use it
+    # where it is known to be safe.
+    ATOMICITYH="cpu/generic"
+    ;;
   m680[246]0)
     cpu_include_dir="cpu/m68k"
     ;;