diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3a5bae7d70b2dbee90ddddf592a3e6afe468140a..95987efeb569b2ac9d3705f5cbc3be00f7e0e156 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-02  Kazu Hirata  <kazu@codesourcery.com>
+
+	* emit-rtl.c (renumber_insns): Remove.
+	* flags.h: Remove the extern for flag_renumber_insns.
+	* rtl.h: Remove the prototype for renumber_insns.
+	* toplev.c (flag_renumber_insns): Remove.
+
 2007-02-02  Hui-May Chang  <hm.chang@apple.com>
 
 	Revert for x86 darwin:
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 871ca386b02368a3938217e25a4239da3dc8b989..94381a9e16c1b5dc02584f9112ba25fa4f6c3432 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -2806,33 +2806,6 @@ get_max_uid (void)
 {
   return cur_insn_uid;
 }
-
-/* Renumber instructions so that no instruction UIDs are wasted.  */
-
-void
-renumber_insns (void)
-{
-  rtx insn;
-
-  /* If we're not supposed to renumber instructions, don't.  */
-  if (!flag_renumber_insns)
-    return;
-
-  /* If there aren't that many instructions, then it's not really
-     worth renumbering them.  */
-  if (flag_renumber_insns == 1 && get_max_uid () < 25000)
-    return;
-
-  cur_insn_uid = 1;
-
-  for (insn = get_insns (); insn; insn = NEXT_INSN (insn))
-    {
-      if (dump_file)
-	fprintf (dump_file, "Renumbering insn %d to %d\n",
-		 INSN_UID (insn), cur_insn_uid);
-      INSN_UID (insn) = cur_insn_uid++;
-    }
-}
 
 /* Return the next insn.  If it is a SEQUENCE, return the first insn
    of the sequence.  */
diff --git a/gcc/flags.h b/gcc/flags.h
index d2c1ca02cf083d3157c87275aded68545da0b847..2671ec38a09b04b90b3085d914ab7ee0a4e83fac 100644
--- a/gcc/flags.h
+++ b/gcc/flags.h
@@ -187,11 +187,6 @@ extern int flag_debug_asm;
 extern int flag_next_runtime;
 
 extern int flag_dump_rtl_in_asm;
-
-/* If one, renumber instruction UIDs to reduce the number of
-   unused UIDs if there are a lot of instructions.  If greater than
-   one, unconditionally renumber instruction UIDs.  */
-extern int flag_renumber_insns;
 
 /* Other basic status info about current function.  */
 
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 5cf87b8427d7f326e2a98ac374f1f2a28ff2256c..80c3114c5e7beed928087dfb6b31df77f5d5d121 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2059,7 +2059,6 @@ extern void add_insn_before (rtx, rtx);
 extern void add_insn_after (rtx, rtx);
 extern void remove_insn (rtx);
 extern rtx emit (rtx);
-extern void renumber_insns (void);
 extern rtx delete_insn (rtx);
 extern rtx entry_of_function (void);
 extern void emit_insn_at_entry (rtx);
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 28d93b3e87385ed69c4a29bd05b048ec8b2511f5..56a78b44e60c0e37601cb3037e712af0665eaeac 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -333,11 +333,6 @@ int flag_dump_rtl_in_asm = 0;
    the support provided depends on the backend.  */
 rtx stack_limit_rtx;
 
-/* If one, renumber instruction UIDs to reduce the number of
-   unused UIDs if there are a lot of instructions.  If greater than
-   one, unconditionally renumber instruction UIDs.  */
-int flag_renumber_insns = 1;
-
 /* Nonzero if we should track variables.  When
    flag_var_tracking == AUTODETECT_VALUE it will be set according
    to optimize, debug_info_level and debug_hooks in process_options ().  */