diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 78f23707edf2..60996fd19138 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-06  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* config/cpu/s390/atomicity.h (__exchange_and_add): Add "memory"
+	clobber to inline assembly statement.
+
 2005-04-06  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* acinclude.m4 (_GLIBCXX_USE_LONG_LONG,
diff --git a/libstdc++-v3/config/cpu/s390/atomicity.h b/libstdc++-v3/config/cpu/s390/atomicity.h
index b979e3abd33c..cf903b321f4d 100644
--- a/libstdc++-v3/config/cpu/s390/atomicity.h
+++ b/libstdc++-v3/config/cpu/s390/atomicity.h
@@ -43,7 +43,8 @@ namespace __gnu_cxx
 			  "   cs    %0,%1,0(%3)\n"
 			  "   jl    0b"
 			  : "=&d" (__old_val), "=&d" (__new_val), "=m" (*__mem)
-			  : "a" (__mem), "d" (__val), "m" (*__mem) : "cc");
+			  : "a" (__mem), "d" (__val), "m" (*__mem)
+			  : "cc", "memory");
     return __old_val;
   }