diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ad457a60adf0b7a4ea162a93afe01156e94d99c5..5a20902efbe3120bcced6414798f85a6df926a6b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-13  John David Anglin  <dave.anglin@nrc-cnrc.gc>
+
+	* config/cpu/hppa/atomicity.h (__exchange_and_add): Don't use ordered
+	store.
+	(__atomic_add): Likewise.
+
 2007-01-13  Paolo Carlini  <pcarlini@suse.de>
 
 	PR libstdc++/14991
diff --git a/libstdc++-v3/config/cpu/hppa/atomicity.h b/libstdc++-v3/config/cpu/hppa/atomicity.h
index 76c09e046fb5921cb12ca1b3e61287e9b8f6c1a4..dc415ca32a3abe8d240f1afbe3a74f067c471f1b 100644
--- a/libstdc++-v3/config/cpu/hppa/atomicity.h
+++ b/libstdc++-v3/config/cpu/hppa/atomicity.h
@@ -66,8 +66,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
     
     result = *__mem;
     *__mem = result + __val;
-    /* Reset lock with PA 2.0 "ordered" store.  */
-    __asm__ __volatile__ ("stw,ma %1,0(%0)"
+    __asm__ __volatile__ ("stw %1,0(%0)"
 			  : : "r" (&lock), "r" (tmp) : "memory");
     return result;
   }
@@ -90,8 +89,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 			  : "memory");
     
     *__mem += __val;
-    /* Reset lock with PA 2.0 "ordered" store.  */
-    __asm__ __volatile__ ("stw,ma %1,0(%0)"
+    __asm__ __volatile__ ("stw %1,0(%0)"
 			  : : "r" (&lock), "r" (tmp) : "memory");
   }