diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 04094617603..1e9249b875e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 10 17:19:02 1999  Jim Wilson  <wilson@cygnus.com>
+
+	* config/sh/sh.c (machine_dependent_reorg): Only call PUT_MODE on
+	note if it is non-NULL.
+
 Tue Aug 10 10:47:42 EDT 1999  Andrew MacLeod  <amacleod@cygnus.com>
 
 	* except.h (eh_nesting_info): Add new structure defintion.
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index b6799d95ff1..dd3db9675aa 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -3123,7 +3123,10 @@ machine_dependent_reorg (first)
 			  rtx note
 			    = find_regno_note (last_float_move, REG_UNUSED, 0);
 
-			  PUT_MODE (note, REG_INC);
+			  /* If we are not optimizing, then there may not be
+			     a note.  */
+			  if (note)
+			    PUT_MODE (note, REG_INC);
 
 			  *last_float_addr = r0_inc_rtx;
 			}