diff mbox

[9/9] Final patch with all changes

Message ID 559BD977.4060907@redhat.com
State New
Headers show

Commit Message

Andrew MacLeod July 7, 2015, 1:51 p.m. UTC 
This is the big daddy. THe first patch is an aggregation of the header 
file changes from the first 8 patches.

The second patch is adjustments to the gen*.c build files to remove 
duplicate includes and such.

The third patch is the net cumulative effect on all the source files.

Bootstraps from scratch on x86_64-unknown-linux-gnu with no new 
regressions. Also compiles all the files in config-list.mk.

OK for trunk?
Andrew

Comments

Pedro Alves July 7, 2015, 10:03 p.m. UTC | #1 
On 07/07/2015 02:51 PM, Andrew MacLeod wrote:
> *** sel-sched-ir.h	(revision 225452)
> --- sel-sched-ir.h	(working copy)
> *************** along with GCC; see the file COPYING3.
> *** 22,34 ****
>   #define GCC_SEL_SCHED_IR_H
>   
>   /* For state_t.  */
> - #include "insn-attr.h"
> - #include "regset.h"
>   /* For reg_note.  */
> - #include "rtl.h"
> - #include "bitmap.h"
> - #include "sched-int.h"
> - #include "cfgloop.h"
>   

Should probably drop those "For state_t/reg_note." comments too.

Thanks,
Pedro Alves
Andrew MacLeod July 7, 2015, 10:10 p.m. UTC | #2 
On 07/07/2015 06:03 PM, Pedro Alves wrote:
> On 07/07/2015 02:51 PM, Andrew MacLeod wrote:
>> *** sel-sched-ir.h	(revision 225452)
>> --- sel-sched-ir.h	(working copy)
>> *************** along with GCC; see the file COPYING3.
>> *** 22,34 ****
>>    #define GCC_SEL_SCHED_IR_H
>>    
>>    /* For state_t.  */
>> - #include "insn-attr.h"
>> - #include "regset.h"
>>    /* For reg_note.  */
>> - #include "rtl.h"
>> - #include "bitmap.h"
>> - #include "sched-int.h"
>> - #include "cfgloop.h"
>>    
> Should probably drop those "For state_t/reg_note." comments too.
>
> Thanks,
> Pedro Alves
Ah right. Previous version had them removed. Missed them when I rebuilt 
the patch.
Thanks
Andrew
diff mbox

Patch


	* genattrtab.c (write_header): Adjust generated includes.
	* genautomata.c (main): Likewise.
	* genconditions.c (write-header): Likewise.
	* genemit.c (main): Likewise.
	* gengtype.c (open_base_files): Likewise.
	* genopinit.c (main): Likewise.
	* genoutput.c (output_prologue): Likewise.
	* genpeep.c (main): Likewise.
	* genpreds.c (write_insn_preds_c): Likewise.
	* genrecog.c (write_header): Likewise.

Index: genattrtab.c
===================================================================
*** genattrtab.c	(revision 225452)
--- genattrtab.c	(working copy)
*************** write_header (FILE *outf)
*** 5103,5118 ****
    fprintf (outf, "#include \"config.h\"\n");
    fprintf (outf, "#include \"system.h\"\n");
    fprintf (outf, "#include \"coretypes.h\"\n");
!   fprintf (outf, "#include \"tm.h\"\n");
!   fprintf (outf, "#include \"input.h\"\n");
    fprintf (outf, "#include \"alias.h\"\n");
-   fprintf (outf, "#include \"symtab.h\"\n");
    fprintf (outf, "#include \"options.h\"\n");
-   fprintf (outf, "#include \"tree.h\"\n");
    fprintf (outf, "#include \"varasm.h\"\n");
    fprintf (outf, "#include \"stor-layout.h\"\n");
    fprintf (outf, "#include \"calls.h\"\n");
-   fprintf (outf, "#include \"rtl.h\"\n");
    fprintf (outf, "#include \"insn-attr.h\"\n");
    fprintf (outf, "#include \"tm_p.h\"\n");
    fprintf (outf, "#include \"insn-config.h\"\n");
--- 5103,5116 ----
    fprintf (outf, "#include \"config.h\"\n");
    fprintf (outf, "#include \"system.h\"\n");
    fprintf (outf, "#include \"coretypes.h\"\n");
!   fprintf (outf, "#include \"backend.h\"\n");
!   fprintf (outf, "#include \"tree.h\"\n");
!   fprintf (outf, "#include \"rtl.h\"\n");
    fprintf (outf, "#include \"alias.h\"\n");
    fprintf (outf, "#include \"options.h\"\n");
    fprintf (outf, "#include \"varasm.h\"\n");
    fprintf (outf, "#include \"stor-layout.h\"\n");
    fprintf (outf, "#include \"calls.h\"\n");
    fprintf (outf, "#include \"insn-attr.h\"\n");
    fprintf (outf, "#include \"tm_p.h\"\n");
    fprintf (outf, "#include \"insn-config.h\"\n");
*************** write_header (FILE *outf)
*** 5122,5130 ****
    fprintf (outf, "#include \"output.h\"\n");
    fprintf (outf, "#include \"toplev.h\"\n");
    fprintf (outf, "#include \"flags.h\"\n");
-   fprintf (outf, "#include \"function.h\"\n");
    fprintf (outf, "#include \"emit-rtl.h\"\n");
-   fprintf (outf, "#include \"predict.h\"\n");
    fprintf (outf, "\n");
    fprintf (outf, "#define operands recog_data.operand\n\n");
  }
--- 5120,5126 ----
Index: genautomata.c
===================================================================
*** genautomata.c	(revision 225452)
--- genautomata.c	(working copy)
*************** main (int argc, char **argv)
*** 9673,9681 ****
  		"#include \"system.h\"\n"
  		"#include \"coretypes.h\"\n"
  		"#include \"tm.h\"\n"
- 		"#include \"input.h\"\n"
  		"#include \"alias.h\"\n"
- 		"#include \"symtab.h\"\n"
  		"#include \"tree.h\"\n"
  		"#include \"varasm.h\"\n"
  		"#include \"stor-layout.h\"\n"
--- 9673,9679 ----
Index: genconditions.c
===================================================================
*** genconditions.c	(revision 225452)
--- genconditions.c	(working copy)
*************** write_header (void)
*** 87,92 ****
--- 87,94 ----
  #include \"hard-reg-set.h\"\n\
  #include \"predict.h\"\n\
  #include \"basic-block.h\"\n\
+ #include \"bitmap.h\"\n\
+ #include \"df.h\"\n\
  #include \"resource.h\"\n\
  #include \"diagnostic-core.h\"\n\
  #include \"reload.h\"\n\
Index: genemit.c
===================================================================
*** genemit.c	(revision 225452)
--- genemit.c	(working copy)
*************** from the machine description file `md'.
*** 744,761 ****
    printf ("#include \"config.h\"\n");
    printf ("#include \"system.h\"\n");
    printf ("#include \"coretypes.h\"\n");
!   printf ("#include \"tm.h\"\n");
!   printf ("#include \"input.h\"\n");
!   printf ("#include \"alias.h\"\n");
!   printf ("#include \"symtab.h\"\n");
    printf ("#include \"tree.h\"\n");
    printf ("#include \"varasm.h\"\n");
    printf ("#include \"stor-layout.h\"\n");
    printf ("#include \"calls.h\"\n");
-   printf ("#include \"rtl.h\"\n");
    printf ("#include \"tm_p.h\"\n");
-   printf ("#include \"hard-reg-set.h\"\n");
-   printf ("#include \"function.h\"\n");
    printf ("#include \"flags.h\"\n");
    printf ("#include \"insn-config.h\"\n");
    printf ("#include \"expmed.h\"\n");
--- 744,757 ----
    printf ("#include \"config.h\"\n");
    printf ("#include \"system.h\"\n");
    printf ("#include \"coretypes.h\"\n");
!   printf ("#include \"backend.h\"\n");
    printf ("#include \"tree.h\"\n");
+   printf ("#include \"rtl.h\"\n");
+   printf ("#include \"alias.h\"\n");
    printf ("#include \"varasm.h\"\n");
    printf ("#include \"stor-layout.h\"\n");
    printf ("#include \"calls.h\"\n");
    printf ("#include \"tm_p.h\"\n");
    printf ("#include \"flags.h\"\n");
    printf ("#include \"insn-config.h\"\n");
    printf ("#include \"expmed.h\"\n");
*************** from the machine description file `md'.
*** 769,783 ****
    printf ("#include \"dfp.h\"\n");
    printf ("#include \"output.h\"\n");
    printf ("#include \"recog.h\"\n");
!   printf ("#include \"predict.h\"\n");
!   printf ("#include \"basic-block.h\"\n");
    printf ("#include \"resource.h\"\n");
    printf ("#include \"reload.h\"\n");
    printf ("#include \"diagnostic-core.h\"\n");
    printf ("#include \"regs.h\"\n");
    printf ("#include \"tm-constrs.h\"\n");
    printf ("#include \"ggc.h\"\n");
-   printf ("#include \"basic-block.h\"\n");
    printf ("#include \"dumpfile.h\"\n");
    printf ("#include \"target.h\"\n\n");
    printf ("#define FAIL return (end_sequence (), _val)\n");
--- 765,777 ----
    printf ("#include \"dfp.h\"\n");
    printf ("#include \"output.h\"\n");
    printf ("#include \"recog.h\"\n");
!   printf ("#include \"df.h\"\n");
    printf ("#include \"resource.h\"\n");
    printf ("#include \"reload.h\"\n");
    printf ("#include \"diagnostic-core.h\"\n");
    printf ("#include \"regs.h\"\n");
    printf ("#include \"tm-constrs.h\"\n");
    printf ("#include \"ggc.h\"\n");
    printf ("#include \"dumpfile.h\"\n");
    printf ("#include \"target.h\"\n\n");
    printf ("#define FAIL return (end_sequence (), _val)\n");
Index: gengtype.c
===================================================================
*** gengtype.c	(revision 225452)
--- gengtype.c	(working copy)
*************** open_base_files (void)
*** 1710,1730 ****
    {
      /* The order of files here matters very much.  */
      static const char *const ifiles[] = {
!       "config.h", "system.h", "coretypes.h", "tm.h", "insn-codes.h",
!       "splay-tree.h", "obstack.h", "bitmap.h", "input.h",
!       "alias.h", "symtab.h", "options.h", 
!       "tree.h", "fold-const.h", "rtl.h",
!       "hard-reg-set.h", "predict.h",
!       "function.h", "insn-config.h", "flags.h", 
!       "tree.h", "expmed.h", "dojump.h",
        "explow.h", "calls.h", "emit-rtl.h", "varasm.h", "stmt.h",
!       "expr.h", "alloc-pool.h",
!       "basic-block.h", "cselib.h", "insn-addr.h",
!       "optabs.h", "libfuncs.h", "debug.h", 
!       "dominance.h", "cfg.h", "basic-block.h",
!       "tree-ssa-alias.h", "internal-fn.h", "gimple-fold.h", "tree-eh.h",
!       "gimple-expr.h", "is-a.h",
!       "gimple.h", "gimple-iterator.h", "gimple-ssa.h", "tree-cfg.h",
        "tree-phinodes.h", "ssa-iterators.h", "stringpool.h", "tree-ssanames.h",
        "tree-ssa-loop.h", "tree-ssa-loop-ivopts.h", "tree-ssa-loop-manip.h",
        "tree-ssa-loop-niter.h", "tree-into-ssa.h", "tree-dfa.h", 
--- 1710,1722 ----
    {
      /* The order of files here matters very much.  */
      static const char *const ifiles[] = {
!       "config.h", "system.h", "coretypes.h", "backend.h", "tree.h",
!       "rtl.h", "gimple.h", "fold-const.h", "insn-codes.h", "splay-tree.h",
!       "alias.h", "insn-config.h", "flags.h", "expmed.h", "dojump.h",
        "explow.h", "calls.h", "emit-rtl.h", "varasm.h", "stmt.h",
!       "expr.h", "alloc-pool.h", "cselib.h", "insn-addr.h", "optabs.h",
!       "libfuncs.h", "debug.h", "internal-fn.h", "gimple-fold.h", "tree-eh.h",
!       "gimple-iterator.h", "gimple-ssa.h", "tree-cfg.h",
        "tree-phinodes.h", "ssa-iterators.h", "stringpool.h", "tree-ssanames.h",
        "tree-ssa-loop.h", "tree-ssa-loop-ivopts.h", "tree-ssa-loop-manip.h",
        "tree-ssa-loop-niter.h", "tree-into-ssa.h", "tree-dfa.h", 
Index: genopinit.c
===================================================================
*** genopinit.c	(revision 225452)
--- genopinit.c	(working copy)
*************** main (int argc, char **argv)
*** 464,494 ****
  	   "#include \"config.h\"\n"
  	   "#include \"system.h\"\n"
  	   "#include \"coretypes.h\"\n"
! 	   "#include \"tm.h\"\n"
! 	   "#include \"hash-set.h\"\n"
! 	   "#include \"machmode.h\"\n"
! 	   "#include \"vec.h\"\n"
! 	   "#include \"double-int.h\"\n"
! 	   "#include \"input.h\"\n"
! 	   "#include \"alias.h\"\n"
! 	   "#include \"symtab.h\"\n"
! 	   "#include \"wide-int.h\"\n"
! 	   "#include \"inchash.h\"\n"
  	   "#include \"tree.h\"\n"
  	   "#include \"varasm.h\"\n"
  	   "#include \"stor-layout.h\"\n"
  	   "#include \"calls.h\"\n"
- 	   "#include \"rtl.h\"\n"
- 	   "#include \"predict.h\"\n"
  	   "#include \"tm_p.h\"\n"
  	   "#include \"flags.h\"\n"
  	   "#include \"insn-config.h\"\n"
- 	   "#include \"hashtab.h\"\n"
- 	   "#include \"hard-reg-set.h\"\n"
- 	   "#include \"function.h\"\n"
- 	   "#include \"statistics.h\"\n"
- 	   "#include \"real.h\"\n"
- 	   "#include \"fixed-value.h\"\n"
  	   "#include \"expmed.h\"\n"
  	   "#include \"dojump.h\"\n"
  	   "#include \"explow.h\"\n"
--- 464,479 ----
  	   "#include \"config.h\"\n"
  	   "#include \"system.h\"\n"
  	   "#include \"coretypes.h\"\n"
! 	   "#include \"backend.h\"\n"
  	   "#include \"tree.h\"\n"
+ 	   "#include \"rtl.h\"\n"
+ 	   "#include \"alias.h\"\n"
  	   "#include \"varasm.h\"\n"
  	   "#include \"stor-layout.h\"\n"
  	   "#include \"calls.h\"\n"
  	   "#include \"tm_p.h\"\n"
  	   "#include \"flags.h\"\n"
  	   "#include \"insn-config.h\"\n"
  	   "#include \"expmed.h\"\n"
  	   "#include \"dojump.h\"\n"
  	   "#include \"explow.h\"\n"
Index: genoutput.c
===================================================================
*** genoutput.c	(revision 225452)
--- genoutput.c	(working copy)
*************** output_prologue (void)
*** 226,254 ****
    printf ("#include \"config.h\"\n");
    printf ("#include \"system.h\"\n");
    printf ("#include \"coretypes.h\"\n");
!   printf ("#include \"tm.h\"\n");
    printf ("#include \"flags.h\"\n");
-   printf ("#include \"ggc.h\"\n");
-   printf ("#include \"hash-set.h\"\n");
-   printf ("#include \"machmode.h\"\n");
-   printf ("#include \"vec.h\"\n");
-   printf ("#include \"double-int.h\"\n");
-   printf ("#include \"input.h\"\n");
    printf ("#include \"alias.h\"\n");
-   printf ("#include \"symtab.h\"\n");
-   printf ("#include \"wide-int.h\"\n");
-   printf ("#include \"inchash.h\"\n");
-   printf ("#include \"tree.h\"\n");
    printf ("#include \"varasm.h\"\n");
    printf ("#include \"stor-layout.h\"\n");
    printf ("#include \"calls.h\"\n");
-   printf ("#include \"rtl.h\"\n");
-   printf ("#include \"hashtab.h\"\n");
-   printf ("#include \"hard-reg-set.h\"\n");
-   printf ("#include \"function.h\"\n");
-   printf ("#include \"statistics.h\"\n");
-   printf ("#include \"real.h\"\n");
-   printf ("#include \"fixed-value.h\"\n");
    printf ("#include \"insn-config.h\"\n");
    printf ("#include \"expmed.h\"\n");
    printf ("#include \"dojump.h\"\n");
--- 226,239 ----
    printf ("#include \"config.h\"\n");
    printf ("#include \"system.h\"\n");
    printf ("#include \"coretypes.h\"\n");
!   printf ("#include \"backend.h\"\n");
!   printf ("#include \"tree.h\"\n");
!   printf ("#include \"rtl.h\"\n");
    printf ("#include \"flags.h\"\n");
    printf ("#include \"alias.h\"\n");
    printf ("#include \"varasm.h\"\n");
    printf ("#include \"stor-layout.h\"\n");
    printf ("#include \"calls.h\"\n");
    printf ("#include \"insn-config.h\"\n");
    printf ("#include \"expmed.h\"\n");
    printf ("#include \"dojump.h\"\n");
*************** output_prologue (void)
*** 266,272 ****
    printf ("#include \"output.h\"\n");
    printf ("#include \"target.h\"\n");
    printf ("#include \"tm-constrs.h\"\n");
-   printf ("#include \"predict.h\"\n");
  }
  
  static void
--- 251,256 ----
Index: genpeep.c
===================================================================
*** genpeep.c	(revision 225452)
--- genpeep.c	(working copy)
*************** from the machine description file `md'.
*** 363,390 ****
    printf ("#include \"config.h\"\n");
    printf ("#include \"system.h\"\n");
    printf ("#include \"coretypes.h\"\n");
!   printf ("#include \"tm.h\"\n");
    printf ("#include \"insn-config.h\"\n");
-   printf ("#include \"hash-set.h\"\n");
-   printf ("#include \"machmode.h\"\n");
-   printf ("#include \"vec.h\"\n");
-   printf ("#include \"double-int.h\"\n");
-   printf ("#include \"input.h\"\n");
    printf ("#include \"alias.h\"\n");
-   printf ("#include \"symtab.h\"\n");
-   printf ("#include \"wide-int.h\"\n");
-   printf ("#include \"inchash.h\"\n");
-   printf ("#include \"tree.h\"\n");
    printf ("#include \"varasm.h\"\n");
    printf ("#include \"stor-layout.h\"\n");
    printf ("#include \"calls.h\"\n");
-   printf ("#include \"rtl.h\"\n");
    printf ("#include \"tm_p.h\"\n");
    printf ("#include \"regs.h\"\n");
    printf ("#include \"output.h\"\n");
    printf ("#include \"recog.h\"\n");
    printf ("#include \"except.h\"\n");
-   printf ("#include \"function.h\"\n");
    printf ("#include \"diagnostic-core.h\"\n");
    printf ("#include \"flags.h\"\n");
    printf ("#include \"tm-constrs.h\"\n\n");
--- 363,381 ----
    printf ("#include \"config.h\"\n");
    printf ("#include \"system.h\"\n");
    printf ("#include \"coretypes.h\"\n");
!   printf ("#include \"backend.h\"\n");
!   printf ("#include \"tree.h\"\n");
!   printf ("#include \"rtl.h\"\n");
    printf ("#include \"insn-config.h\"\n");
    printf ("#include \"alias.h\"\n");
    printf ("#include \"varasm.h\"\n");
    printf ("#include \"stor-layout.h\"\n");
    printf ("#include \"calls.h\"\n");
    printf ("#include \"tm_p.h\"\n");
    printf ("#include \"regs.h\"\n");
    printf ("#include \"output.h\"\n");
    printf ("#include \"recog.h\"\n");
    printf ("#include \"except.h\"\n");
    printf ("#include \"diagnostic-core.h\"\n");
    printf ("#include \"flags.h\"\n");
    printf ("#include \"tm-constrs.h\"\n\n");
Index: genpreds.c
===================================================================
*** genpreds.c	(revision 225452)
--- genpreds.c	(working copy)
*************** write_insn_preds_c (void)
*** 1523,1559 ****
  #include \"config.h\"\n\
  #include \"system.h\"\n\
  #include \"coretypes.h\"\n\
! #include \"tm.h\"\n\
  #include \"rtl.h\"\n\
- #include \"hash-set.h\"\n\
- #include \"machmode.h\"\n\
- #include \"hash-map.h\"\n\
- #include \"vec.h\"\n\
- #include \"double-int.h\"\n\
- #include \"input.h\"\n\
  #include \"alias.h\"\n\
- #include \"symtab.h\"\n\
- #include \"wide-int.h\"\n\
- #include \"inchash.h\"\n\
- #include \"tree.h\"\n\
  #include \"varasm.h\"\n\
  #include \"stor-layout.h\"\n\
  #include \"calls.h\"\n\
  #include \"tm_p.h\"\n\
- #include \"hashtab.h\"\n\
- #include \"hash-set.h\"\n\
- #include \"vec.h\"\n\
- #include \"machmode.h\"\n\
- #include \"hard-reg-set.h\"\n\
- #include \"input.h\"\n\
- #include \"function.h\"\n\
  #include \"insn-config.h\"\n\
  #include \"recog.h\"\n\
  #include \"output.h\"\n\
  #include \"flags.h\"\n\
! #include \"hard-reg-set.h\"\n\
! #include \"predict.h\"\n\
! #include \"basic-block.h\"\n\
  #include \"resource.h\"\n\
  #include \"diagnostic-core.h\"\n\
  #include \"reload.h\"\n\
--- 1523,1541 ----
  #include \"config.h\"\n\
  #include \"system.h\"\n\
  #include \"coretypes.h\"\n\
! #include \"backend.h\"\n\
! #include \"tree.h\"\n\
  #include \"rtl.h\"\n\
  #include \"alias.h\"\n\
  #include \"varasm.h\"\n\
  #include \"stor-layout.h\"\n\
  #include \"calls.h\"\n\
  #include \"tm_p.h\"\n\
  #include \"insn-config.h\"\n\
  #include \"recog.h\"\n\
  #include \"output.h\"\n\
  #include \"flags.h\"\n\
! #include \"df.h\"\n\
  #include \"resource.h\"\n\
  #include \"diagnostic-core.h\"\n\
  #include \"reload.h\"\n\
Index: genrecog.c
===================================================================
*** genrecog.c	(revision 225452)
--- genrecog.c	(working copy)
*************** write_header (void)
*** 4179,4208 ****
  #include \"config.h\"\n\
  #include \"system.h\"\n\
  #include \"coretypes.h\"\n\
! #include \"tm.h\"\n\
  #include \"rtl.h\"\n\
  #include \"tm_p.h\"\n\
- #include \"hashtab.h\"\n\
- #include \"hash-set.h\"\n\
- #include \"vec.h\"\n\
- #include \"machmode.h\"\n\
- #include \"hard-reg-set.h\"\n\
- #include \"input.h\"\n\
- #include \"function.h\"\n\
  #include \"emit-rtl.h\"\n\
  #include \"insn-config.h\"\n\
  #include \"recog.h\"\n\
  #include \"output.h\"\n\
  #include \"flags.h\"\n\
! #include \"hard-reg-set.h\"\n\
! #include \"predict.h\"\n\
! #include \"basic-block.h\"\n\
  #include \"resource.h\"\n\
  #include \"diagnostic-core.h\"\n\
  #include \"reload.h\"\n\
  #include \"regs.h\"\n\
  #include \"tm-constrs.h\"\n\
- #include \"predict.h\"\n\
  \n");
  
    puts ("\n\
--- 4179,4198 ----
  #include \"config.h\"\n\
  #include \"system.h\"\n\
  #include \"coretypes.h\"\n\
! #include \"backend.h\"\n\
  #include \"rtl.h\"\n\
  #include \"tm_p.h\"\n\
  #include \"emit-rtl.h\"\n\
  #include \"insn-config.h\"\n\
  #include \"recog.h\"\n\
  #include \"output.h\"\n\
  #include \"flags.h\"\n\
! #include \"df.h\"\n\
  #include \"resource.h\"\n\
  #include \"diagnostic-core.h\"\n\
  #include \"reload.h\"\n\
  #include \"regs.h\"\n\
  #include \"tm-constrs.h\"\n\
  \n");
  
    puts ("\n\