summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/haifa-sched.c7
-rw-r--r--gcc/sched-ebb.c4
-rw-r--r--gcc/sched-int.h4
-rw-r--r--gcc/sched-rgn.c2
5 files changed, 14 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1e6eed144bc..06feedc0240 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2001-01-12 Andreas Jaeger <aj@suse.de>
+ * haifa-sched.c (restore_line_notes): Remove argument block B
+ since it's unused.
+ * sched-ebb.c (schedule_ebb): Change caller.
+ * sched-rgn.c (schedule_region): Likewise.
+ * sched-int.h (restore_line_notes): Adjust prototype.
+
* loop.h: Remove wrong declaration of doloop_condition_get.
2001-01-12 Phil Edwards <pme@sources.redhat.com>
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 06480456269..b4053b5e90c 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -1,6 +1,6 @@
/* Instruction scheduling pass.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000 Free Software Foundation, Inc.
+ 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by Michael Tiemann (tiemann@cygnus.com) Enhanced by,
and currently maintained by, Jim Wilson (wilson@cygnus.com)
@@ -1225,13 +1225,12 @@ save_line_notes (b, head, tail)
LINE_NOTE (insn) = line;
}
-/* After block B was scheduled, insert line notes into the insns list.
+/* After a block was scheduled, insert line notes into the insns list.
HEAD and TAIL are the boundaries of the block in which notes should
be processed.*/
void
-restore_line_notes (b, head, tail)
- int b;
+restore_line_notes (head, tail)
rtx head, tail;
{
rtx line, note, prev, new;
diff --git a/gcc/sched-ebb.c b/gcc/sched-ebb.c
index 1ff7cea79f5..56d96612be6 100644
--- a/gcc/sched-ebb.c
+++ b/gcc/sched-ebb.c
@@ -1,6 +1,6 @@
/* Instruction scheduling pass.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000 Free Software Foundation, Inc.
+ 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by Michael Tiemann (tiemann@cygnus.com) Enhanced by,
and currently maintained by, Jim Wilson (wilson@cygnus.com)
@@ -274,7 +274,7 @@ schedule_ebb (head, tail)
tail = current_sched_info->tail;
if (write_symbols != NO_DEBUG)
- restore_line_notes (0, head, tail);
+ restore_line_notes (head, tail);
finish_deps_global ();
}
diff --git a/gcc/sched-int.h b/gcc/sched-int.h
index fdd49eadca7..2a7eb6a0384 100644
--- a/gcc/sched-int.h
+++ b/gcc/sched-int.h
@@ -1,7 +1,7 @@
/* Instruction scheduling pass. This file contains definitions used
internally in the scheduler.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000 Free Software Foundation, Inc.
+ 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of GNU CC.
@@ -272,7 +272,7 @@ extern int no_real_insns_p PARAMS ((rtx, rtx));
extern void rm_line_notes PARAMS ((rtx, rtx));
extern void save_line_notes PARAMS ((int, rtx, rtx));
-extern void restore_line_notes PARAMS ((int, rtx, rtx));
+extern void restore_line_notes PARAMS ((rtx, rtx));
extern void rm_redundant_line_notes PARAMS ((void));
extern void rm_other_notes PARAMS ((rtx, rtx));
diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 13c358816b7..46c734cf7da 100644
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -2864,7 +2864,7 @@ schedule_region (rgn)
{
rtx head, tail;
get_block_head_tail (BB_TO_BLOCK (bb), &head, &tail);
- restore_line_notes (BB_TO_BLOCK (bb), head, tail);
+ restore_line_notes (head, tail);
}
}