diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 48fd0a83c53..1196983dcaa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep  8 18:26:35 1997  Jim Wilson  <wilson@cygnus.com>
+
+	* m68k.h (MACHINE_STATE_SAVE, MACHINE_STATE_RESTORE): In MOTOROLA
+	cases, add %# and %/, and add : to make them into extended asms.
+
 Sun Sep  7 23:57:50 1997  Weiwen Liu  <liu@hepunix.physics.yale.edu>
 
 	* alias.c (init_alias_analysis): Clean up incompatible pointer
diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index eadcee9e21b..0ac38cb7797 100644
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -1081,23 +1081,23 @@ while(0)
 #if defined(__mcf5200__)
 #define MACHINE_STATE_SAVE(id)		\
     {					\
-      asm ("subl 20,sp");		\
-      asm ("movml d0/d1/a0/a1,sp@(4)");	\
-      asm ("movew cc,d0");		\
-      asm ("movml d0,sp@");		\
+      asm ("subl %#20,%/sp" : );	\
+      asm ("movml %/d0/%/d1/%/a0/%/a1,%/sp@(4)" : ); \
+      asm ("movew %/cc,%/d0" : );	\
+      asm ("movml %/d0,%/sp@" : );	\
     }
 #else /* !__mcf5200__ */
 #if defined(MACHINE_STATE_m68010_up)
 #define MACHINE_STATE_SAVE(id)		\
     {					\
-      asm ("movew cc,sp@-");		\
-      asm ("moveml d0/d1/a0/a1,sp@-");	\
+      asm ("movew %/cc,%/sp@-" : );	\
+      asm ("moveml %/d0/%/d1/%/a0/%/a1,%/sp@-" : ); \
     }
 #else /* !MACHINE_STATE_m68010_up */
 #define MACHINE_STATE_SAVE(id)		\
     {					\
-      asm ("movew sr,sp@-");		\
-      asm ("moveml d0/d1/a0/a1,sp@-");	\
+      asm ("movew %/sr,%/sp@-" : );	\
+      asm ("moveml %/d0/%/d1/%/a0/%/a1,%/sp@-" : ); \
     }
 #endif /* MACHINE_STATE_m68010_up */
 #endif /* __mcf5200__ */
@@ -1134,16 +1134,16 @@ while(0)
 #if defined(__mcf5200__)
 #define MACHINE_STATE_RESTORE(id)	\
     {					\
-      asm ("movml sp@,d0");		\
-      asm ("movew d0,cc");		\
-      asm ("movml sp@(4),d0/d1/a0/a1");	\
-      asm ("addl 20,sp");		\
+      asm ("movml %/sp@,%/d0" : );	\
+      asm ("movew %/d0,%/cc" : );	\
+      asm ("movml %/sp@(4),%/d0/%/d1/%/a0/%/a1" : ); \
+      asm ("addl %#20,%/sp" : );	\
     }
 #else /* !__mcf5200__ */
 #define MACHINE_STATE_RESTORE(id)	\
     {					\
-      asm ("moveml sp@+,d0/d1/a0/a1");	\
-      asm ("movew sp@+,cc");		\
+      asm ("moveml %/sp@+,%/d0/%/d1/%/a0/%/a1" : ); \
+      asm ("movew %/sp@+,%/cc" : );	\
     }
 #endif /* __mcf5200__ */
 #endif /* MOTOROLA */