public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [gcc-in-cxx] FYI: remove duplicate definitions
@ 2008-10-05 17:23 Tom Tromey
  0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2008-10-05 17:23 UTC (permalink / raw)
  To: Gcc Patch List

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 

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-10-05 17:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-10-05 17:23 [gcc-in-cxx] FYI: remove duplicate definitions Tom Tromey

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).