This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: new-regalloc merge broke target sh-elf, MEMORY_MOVE_COST undefined
- From: Daniel Berlin <dberlin at dberlin dot org>
- To: tm <tm at mail dot kloo dot net>
- Cc: matz at suse dot de, <gcc-patches at gcc dot gnu dot org>
- Date: Mon, 15 Jul 2002 18:28:50 -0400 (EDT)
- Subject: Re: new-regalloc merge broke target sh-elf, MEMORY_MOVE_COST undefined
> When Michael split the ra.c into multiple files, he forgot to include
> reload.h where MEMORY_MOVE_COST is used.
>
> This ought to fix it.
> Let me know, and if so, i'll commit it as obvious.
Whoops, i missed another include for ra-rewrite.c that reload.h uses
(that'll teach me to send the patch before compiling).
Try this instead.
Index: ra-build.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ra-build.c,v
retrieving revision 1.2
diff -c -3 -p -w -B -b -r1.2 ra-build.c
*** ra-build.c 15 Jul 2002 14:07:05 -0000 1.2
--- ra-build.c 15 Jul 2002 22:28:01 -0000
***************
*** 24,29 ****
--- 24,30 ----
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
+ #include "reload.h"
#include "function.h"
#include "regs.h"
#include "hard-reg-set.h"
Index: ra-rewrite.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ra-rewrite.c,v
retrieving revision 1.2
diff -c -3 -p -w -B -b -r1.2 ra-rewrite.c
*** ra-rewrite.c 15 Jul 2002 14:07:05 -0000 1.2
--- ra-rewrite.c 15 Jul 2002 22:28:01 -0000
***************
*** 31,36 ****
--- 31,38 ----
#include "output.h"
#include "except.h"
#include "ra.h"
+ #include "insn-config.h"
+ #include "reload.h"
/* This file is part of the graph coloring register allocator, and
contains the functions to change the insn stream. I.e. it adds
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ChangeLog,v
retrieving revision 1.14835
diff -c -3 -p -w -B -b -r1.14835 ChangeLog
*** ChangeLog 15 Jul 2002 18:15:44 -0000 1.14835
--- ChangeLog 15 Jul 2002 22:28:06 -0000
***************
*** 1,3 ****
--- 1,10 ----
+ 2002-07-15 Daniel Berlin <dberlin@dberlin.org>
+
+ * ra-rewrite.c: #include reload.h, insn-config.h
+ * ra-build.c: #include reload.h
+ * Makefile.in: Update ra-rewrite.o, ra-build.o dependencies to
+ depend on reload.h, insn-config.h.
+
2002-07-15 Jason Thorpe <thorpej@wasabisystems.com>
* config/sparc/netbsd-elf.h (TRANSFER_FROM_TRAMPOLINE): Remove.
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.910
diff -c -3 -p -w -B -b -r1.910 Makefile.in
*** Makefile.in 15 Jul 2002 14:07:05 -0000 1.910
--- Makefile.in 15 Jul 2002 22:28:07 -0000
*************** ra.o : ra.c $(CONFIG_H) $(SYSTEM_H) $(RT
*** 1568,1581 ****
$(BASIC_BLOCK_H) df.h expr.h output.h toplev.h flags.h reload.h ra.h
ra-build.o : ra-build.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TM_P_H) \
insn-config.h $(RECOG_H) function.h $(REGS_H) hard-reg-set.h \
! $(BASIC_BLOCK_H) df.h output.h ggc.h ra.h gt-ra-build.h
ra-colorize.o : ra-colorize.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TM_P_H) \
function.h $(REGS_H) hard-reg-set.h $(BASIC_BLOCK_H) df.h output.h ra.h
ra-debug.o : ra-debug.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) insn-config.h \
$(RECOG_H) function.h hard-reg-set.h $(BASIC_BLOCK_H) df.h output.h ra.h
ra-rewrite.o : ra-rewrite.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TM_P_H) \
function.h $(REGS_H) hard-reg-set.h $(BASIC_BLOCK_H) df.h expr.h \
! output.h except.h ra.h
reload.o : reload.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) flags.h output.h \
$(EXPR_H) $(OPTABS_H) reload.h $(RECOG_H) hard-reg-set.h insn-config.h \
$(REGS_H) function.h real.h toplev.h $(TM_P_H)
--- 1568,1581 ----
$(BASIC_BLOCK_H) df.h expr.h output.h toplev.h flags.h reload.h ra.h
ra-build.o : ra-build.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TM_P_H) \
insn-config.h $(RECOG_H) function.h $(REGS_H) hard-reg-set.h \
! $(BASIC_BLOCK_H) df.h output.h ggc.h ra.h gt-ra-build.h reload.h
ra-colorize.o : ra-colorize.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TM_P_H) \
function.h $(REGS_H) hard-reg-set.h $(BASIC_BLOCK_H) df.h output.h ra.h
ra-debug.o : ra-debug.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) insn-config.h \
$(RECOG_H) function.h hard-reg-set.h $(BASIC_BLOCK_H) df.h output.h ra.h
ra-rewrite.o : ra-rewrite.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TM_P_H) \
function.h $(REGS_H) hard-reg-set.h $(BASIC_BLOCK_H) df.h expr.h \
! output.h except.h ra.h reload.h insn-config.h
reload.o : reload.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) flags.h output.h \
$(EXPR_H) $(OPTABS_H) reload.h $(RECOG_H) hard-reg-set.h insn-config.h \
$(REGS_H) function.h real.h toplev.h $(TM_P_H)