diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0b386854f..018133733 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-25  Christopher Faylor  <cgf@alum.bu.edu>
+
+	* winbase.h: Add proper attributions for memory operands throughout.
+
 2004-05-24  Christopher Faylor  <cgf@alum.bu.edu>
 
 	* include/cygwin/version.h: Bump api minor version number.
diff --git a/winsup/cygwin/winbase.h b/winsup/cygwin/winbase.h
index fc9af06fb..3b645e50b 100644
--- a/winsup/cygwin/winbase.h
+++ b/winsup/cygwin/winbase.h
@@ -9,9 +9,9 @@ ilockincr (long *m)
   register int __res;
   __asm__ __volatile__ ("\n\
 	movl	$1,%0\n\
-	lock	xadd %0,(%1)\n\
+	lock	xadd %0,%1\n\
 	inc	%0\n\
-	": "=a" (__res), "=q" (m): "1" (m));
+	": "=a" (__res), "+m" (m): : "memory", "cc");
   return __res;
 }
 
@@ -21,9 +21,9 @@ ilockdecr (long *m)
   register int __res;
   __asm__ __volatile__ ("\n\
 	movl	$0xffffffff,%0\n\
-	lock	xadd %0,(%1)\n\
+	lock	xadd %0,%1\n\
 	dec	%0\n\
-	": "=a" (__res), "=q" (m): "1" (m));
+	": "=a" (__res), "+m" (m): : "memory", "cc");
   return __res;
 }
 
@@ -34,7 +34,7 @@ ilockexch (long *t, long v)
   __asm__ __volatile__ ("\n\
 1:	lock	cmpxchgl %3,(%1)\n\
 	jne 1b\n\
- 	": "=a" (__res), "=q" (t): "1" (t), "q" (v), "0" (*t): "memory": "cc");
+ 	": "=a" (__res), "=q" (t): "1" (t), "q" (v), "0" (*t): "memory", "cc");
   return __res;
 }
 
@@ -44,7 +44,7 @@ ilockcmpexch (long *t, long v, long c)
   register int __res;
   __asm__ __volatile__ ("\n\
 	lock cmpxchgl %3,(%1)\n\
-	": "=a" (__res), "=q" (t) : "1" (t), "q" (v), "0" (c): "memory": "cc");
+	": "=a" (__res), "=q" (t) : "1" (t), "q" (v), "0" (c): "memory", "cc");
   return __res;
 }