diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 68260ebc603..51977804060 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,11 @@
+2002-05-22  David Edelsohn  <edelsohn@gnu.org>
+	    Jeff Law <law@redhat.com>
+
+	* sched-deps.c (sched_analyze): Do not clear SCHED_GROUP_P.
+	* haifa-sched.c (move_insn): Clear SCHED_GROUP_P after it is used.
+
 2002-05-28	Marc Espie <espie@openbsd.org>
+
 	* config/i386/openbsd.h (HAVE_GAS_MAX_SKIP_P2ALIGN):  Remove, 
 	inherited from gas.h.
 	(ASM_QUAD):  Undef.  OpenBSD does not support it.
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 3e0a44588d0..63a31352a5b 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -1775,6 +1775,8 @@ move_insn (insn, last)
 	retval = reemit_notes (insn, insn);
       else
 	reemit_notes (insn, insn);
+      /* Consume SCHED_GROUP_P flag.  */
+      SCHED_GROUP_P (insn) = 0;
       insn = prev;
     }
 
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index 88bf2b7f2e2..0afb21bcf6b 100644
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -1231,9 +1231,6 @@ sched_analyze (deps, head, tail)
 	  /* Clear out the stale LOG_LINKS from flow.  */
 	  free_INSN_LIST_list (&LOG_LINKS (insn));
 
-	  /* Clear out stale SCHED_GROUP_P.  */
-	  SCHED_GROUP_P (insn) = 0;
-
 	  /* Make each JUMP_INSN a scheduling barrier for memory
              references.  */
 	  if (GET_CODE (insn) == JUMP_INSN)