This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[gcc-in-cxx] FYI: remove duplicate definitions
- From: Tom Tromey <tromey at redhat dot com>
- To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Date: Sun, 05 Oct 2008 11:15:27 -0600
- Subject: [gcc-in-cxx] FYI: remove duplicate definitions
- Reply-to: Tom Tromey <tromey at redhat dot com>
I'm checking this in on the gcc-in-cxx branch.
There are a few redefinitions in gcc. This patch fixes them.
The haifa-sched.c one is buried in #ifs. I think the removal is
correct but it is hard to be sure without knowing how to build this
under all the conditions. Since the branch doesn't really build at
all, I'm putting this in on the theory that it will be simple to
re-fix it later, if needed.
Tom
ChangeLog:
2008-10-05 Tom Tromey <tromey@redhat.com>
* sel-sched.c (move_op_hooks, fur_hooks): Mark forward
declarations 'extern'.
* regstat.c (regstat_n_sets_and_refs): Remove duplicate.
* haifa-sched.c (sched_scan_info): Remove duplicate.
Index: regstat.c
===================================================================
--- regstat.c (revision 140884)
+++ regstat.c (working copy)
@@ -1,5 +1,5 @@
/* Scanning of rtl for dataflow analysis.
- Copyright (C) 2007
+ Copyright (C) 2007, 2008
Free Software Foundation, Inc.
Contributed by Kenneth Zadeck (zadeck@naturalbridge.com).
@@ -37,7 +37,6 @@
struct regstat_n_sets_and_refs_t *regstat_n_sets_and_refs;
-struct regstat_n_sets_and_refs_t *regstat_n_sets_and_refs;
/*----------------------------------------------------------------------------
REG_N_SETS and REG_N_REFS.
Index: haifa-sched.c
===================================================================
--- haifa-sched.c (revision 140884)
+++ haifa-sched.c (working copy)
@@ -4703,8 +4703,6 @@
#endif /* ENABLE_CHECKING */
-const struct sched_scan_info_def *sched_scan_info;
-
/* Extend per basic block data structures. */
static void
extend_bb (void)
Index: sel-sched.c
===================================================================
--- sel-sched.c (revision 140884)
+++ sel-sched.c (working copy)
@@ -448,7 +448,7 @@
/* Set of hooks for performing move_op and find_used_regs routines with
code_motion_path_driver. */
-struct code_motion_path_driver_info_def move_op_hooks, fur_hooks;
+extern struct code_motion_path_driver_info_def move_op_hooks, fur_hooks;
/* True if/when we want to emulate Haifa scheduler in the common code.
This is used in sched_rgn_local_init and in various places in