diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d3aca48cbec..ca4d2ca2e95 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 Mon Jun 28 05:28:12 1999  Jeffrey A Law  (law@cygnus.com)
 
+	* m68k.h (CONDITIONAL_REGISTER_USAGE): Define for !SUN_FPA
+	case.  Also make the PIC register call_used.
+
 	* m68k.h (FINALIZE_PIC): Delete.
 	* m68k.c (finalize_pic): Delete.
 	
diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index 1ec0850d36c..13926c1f104 100644
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -457,7 +457,15 @@ extern int target_flags;
 	fixed_regs[i] = call_used_regs[i] = 1; 	\
     } 						\
   if (flag_pic)					\
-    fixed_regs[PIC_OFFSET_TABLE_REGNUM] = 1	\
+    fixed_regs[PIC_OFFSET_TABLE_REGNUM]		\
+      = call_used_regs[PIC_OFFSET_TABLE_REGNUM] = 1;\
+}
+#else
+#define CONDITIONAL_REGISTER_USAGE \
+{ 						\
+  if (flag_pic)					\
+    fixed_regs[PIC_OFFSET_TABLE_REGNUM]		\
+      = call_used_regs[PIC_OFFSET_TABLE_REGNUM] = 1;\
 }
 
 #endif /* defined SUPPORT_SUN_FPA */