diff mbox

New remainder of front end header reduction

Message ID 56376BED.2040804@redhat.com
State New
Headers show

Commit Message

Andrew MacLeod Nov. 2, 2015, 1:58 p.m. UTC
On 11/02/2015 01:41 AM, Jeff Law wrote:
> On 10/30/2015 07:37 AM, Andrew MacLeod wrote:
>> OK, here's the much delayed front end reduction patch based on the
>> reordering already being checked in.
>>
>> I discovered that my targets builds were only building c/c++, so the
>> other languages were being reduced based only on the host
>> x86_64-pc-linux-gnu build.   Thats *probably* ok, but I wanted to be
>> sure.  This is when I discovered that the other languages have varying
>> amounts of support amongst the targets. Simply building all the targets
>> to compile, say ada, doesn't actually work quite right.
>>
>> So this patch covers all the languages which do have full support.. the
>> ones enabled by 'all' languages.
>>
>> I am determining which targets build the other languages now, and will
>> submit separate reduction patches for those languages.
>>
Here's the rest of the front end files.  I will temporarily hold off 
checking in the other front end file due to the ENABLE_OFFLOADING and 
ENABLE_FOLD_CHECKING issues brought up.  I'll rerun the tool with all 
the ENABLE_* macros I can fine predefined in the tool to avoid this 
issue, and adjust he front end patches if necessary.. ie, if the tool 
finds a reduction that shouldnt happen.

Anyway, here's the rest of the header files which should be the final 
patch  I ran the tool on the coverage components of config-list.mk that 
supported each of the languages, then did a full build of all targets.

bootstraps on x86_64-pc-linux-gnu with no new regressions, and passes 
all of config-list.mk

Andrew

Comments

Jeff Law Nov. 9, 2015, 9:33 p.m. UTC | #1
On 11/02/2015 06:58 AM, Andrew MacLeod wrote:
> On 11/02/2015 01:41 AM, Jeff Law wrote:
>> On 10/30/2015 07:37 AM, Andrew MacLeod wrote:
>>> OK, here's the much delayed front end reduction patch based on the
>>> reordering already being checked in.
>>>
>>> I discovered that my targets builds were only building c/c++, so the
>>> other languages were being reduced based only on the host
>>> x86_64-pc-linux-gnu build.   Thats *probably* ok, but I wanted to be
>>> sure.  This is when I discovered that the other languages have varying
>>> amounts of support amongst the targets. Simply building all the targets
>>> to compile, say ada, doesn't actually work quite right.
>>>
>>> So this patch covers all the languages which do have full support.. the
>>> ones enabled by 'all' languages.
>>>
>>> I am determining which targets build the other languages now, and will
>>> submit separate reduction patches for those languages.
>>>
> Here's the rest of the front end files.  I will temporarily hold off
> checking in the other front end file due to the ENABLE_OFFLOADING and
> ENABLE_FOLD_CHECKING issues brought up.  I'll rerun the tool with all
> the ENABLE_* macros I can fine predefined in the tool to avoid this
> issue, and adjust he front end patches if necessary.. ie, if the tool
> finds a reduction that shouldnt happen.
>
> Anyway, here's the rest of the header files which should be the final
> patch  I ran the tool on the coverage components of config-list.mk that
> supported each of the languages, then did a full build of all targets.
>
> bootstraps on x86_64-pc-linux-gnu with no new regressions, and passes
> all of config-list.mk
The remaining header file removals are fine.

jeff
diff mbox

Patch

ada
	* gcc-interface/decl.c: Remove unused header files.
	* gcc-interface/misc.c: Likewise.
	* gcc-interface/targtyps.c: Likewise.
	* gcc-interface/trans.c: Likewise.
	* gcc-interface/utils.c: Likewise.

go
	* go-backend.c: Remove unused header files.
	* go-gcc.cc: Likewise.
	* go-lang.c: Likewise.
	* gospec.c: Likewise.

java
	* boehm.c: Remove unused header files.
	* builtins.c: Likewise.
	* class.c: Likewise.
	* constants.c: Likewise.
	* decl.c: Likewise.
	* except.c: Likewise.
	* expr.c: Likewise.
	* java-gimplify.c: Likewise.
	* jcf-dump.c: Likewise.
	* jcf-io.c: Likewise.
	* jcf-parse.c: Likewise.
	* jvgenmain.c: Likewise.
	* lang.c: Likewise.
	* mangle.c: Likewise.
	* mangle_name.c: Likewise.
	* resource.c: Likewise.
	* typeck.c: Likewise.
	* verify-glue.c: Likewise.
	* verify-impl.c: Likewise.
	* zextract.c: Likewise.

jit
	* dummy-frontend.c: Remove unused header files.
	* jit-builtins.c: Likewise.
	* jit-playback.c: Likewise.
	* jit-recording.c: Likewise.
	* jit-spec.c: Likewise.
	* libgccjit.c: Likewise.

objcp
	* objcp-decl.c: Remove unused header files.
	* objcp-lang.c: Likewise.
Index: ada/gcc-interface/decl.c
===================================================================
*** ada/gcc-interface/decl.c	(revision 229584)
--- ada/gcc-interface/decl.c	(working copy)
***************
*** 26,32 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "ggc.h"
  #include "target.h"
  #include "tree.h"
  #include "stringpool.h"
--- 26,31 ----
***************
*** 34,41 ****
  #include "alias.h"
  #include "fold-const.h"
  #include "stor-layout.h"
- #include "flags.h"
- #include "toplev.h"
  #include "tree-inline.h"
  
  #include "ada.h"
--- 33,38 ----
***************
*** 46,52 ****
  #include "nlists.h"
  #include "repinfo.h"
  #include "snames.h"
- #include "stringt.h"
  #include "uintp.h"
  #include "fe.h"
  #include "sinfo.h"
--- 43,48 ----
Index: ada/gcc-interface/misc.c
===================================================================
*** ada/gcc-interface/misc.c	(revision 229584)
--- ada/gcc-interface/misc.c	(working copy)
***************
*** 26,32 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "ggc.h"
  #include "target.h"
  #include "tree.h"
  #include "diagnostic.h"
--- 26,31 ----
***************
*** 35,42 ****
  #include "fold-const.h"
  #include "stor-layout.h"
  #include "print-tree.h"
- #include "flags.h"
- #include "debug.h"
  #include "toplev.h"
  #include "langhooks.h"
  #include "langhooks-def.h"
--- 34,39 ----
***************
*** 48,57 ****
  #include "adadecode.h"
  #include "types.h"
  #include "atree.h"
- #include "elists.h"
  #include "namet.h"
  #include "nlists.h"
- #include "stringt.h"
  #include "uintp.h"
  #include "fe.h"
  #include "sinfo.h"
--- 45,52 ----
Index: ada/gcc-interface/targtyps.c
===================================================================
*** ada/gcc-interface/targtyps.c	(revision 229584)
--- ada/gcc-interface/targtyps.c	(working copy)
***************
*** 30,51 ****
  #include "coretypes.h"
  #include "tm.h"
  #include "tree.h"
- #include "tm_p.h"
- #include "alias.h"
  
  #include "ada.h"
  #include "types.h"
- #include "atree.h"
- #include "elists.h"
- #include "namet.h"
- #include "nlists.h"
- #include "snames.h"
- #include "stringt.h"
- #include "uintp.h"
- #include "urealp.h"
- #include "fe.h"
- #include "sinfo.h"
- #include "einfo.h"
  #include "ada-tree.h"
  #include "gigi.h"
  
--- 30,38 ----
Index: ada/gcc-interface/trans.c
===================================================================
*** ada/gcc-interface/trans.c	(revision 229584)
--- ada/gcc-interface/trans.c	(working copy)
***************
*** 39,45 ****
  #include "stor-layout.h"
  #include "stmt.h"
  #include "varasm.h"
- #include "flags.h"
  #include "output.h"
  #include "libfuncs.h"	/* For set_stack_check_libfunc.  */
  #include "tree-iterator.h"
--- 39,44 ----
***************
*** 51,57 ****
  #include "adadecode.h"
  #include "types.h"
  #include "atree.h"
- #include "elists.h"
  #include "namet.h"
  #include "nlists.h"
  #include "snames.h"
--- 50,55 ----
Index: ada/gcc-interface/utils.c
===================================================================
*** ada/gcc-interface/utils.c	(revision 229584)
--- ada/gcc-interface/utils.c	(working copy)
***************
*** 26,36 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "ggc.h"
  #include "target.h"
  #include "function.h"
  #include "tree.h"
- #include "timevar.h"
  #include "stringpool.h"
  #include "cgraph.h"
  #include "diagnostic.h"
--- 26,34 ----
***************
*** 39,45 ****
  #include "stor-layout.h"
  #include "attribs.h"
  #include "varasm.h"
- #include "flags.h"
  #include "toplev.h"
  #include "output.h"
  #include "debug.h"
--- 37,42 ----
***************
*** 48,62 ****
  #include "langhooks.h"
  #include "tree-dump.h"
  #include "tree-inline.h"
- #include "tree-iterator.h"
  
  #include "ada.h"
  #include "types.h"
  #include "atree.h"
- #include "elists.h"
- #include "namet.h"
  #include "nlists.h"
- #include "stringt.h"
  #include "uintp.h"
  #include "fe.h"
  #include "sinfo.h"
--- 45,55 ----
Index: go/go-backend.c
===================================================================
*** go/go-backend.c	(revision 229584)
--- go/go-backend.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 25,37 ****
  #include "tm_p.h"
  #include "diagnostic.h"
  #include "simple-object.h"
- #include "alias.h"
- #include "stor-layout.h"
  #include "intl.h"
  #include "output.h"	/* for assemble_string */
  #include "common/common-target.h"
  
- #include "go-c.h"
  
  /* The segment name we pass to simple_object_start_read to find Go
     export data.  */
--- 25,34 ----
Index: go/go-gcc.cc
===================================================================
*** go/go-gcc.cc	(revision 229584)
--- go/go-gcc.cc	(working copy)
***************
*** 24,42 ****
  // include it here before tree.h includes it later.
  #include <gmp.h>
  
- #include "vec.h"
- #include "alias.h"
  #include "tree.h"
- #include "options.h"
- #include "inchash.h"
  #include "fold-const.h"
  #include "stringpool.h"
  #include "stor-layout.h"
  #include "varasm.h"
  #include "tree-iterator.h"
- #include "hash-map.h"
  #include "tm.h"
- #include "hard-reg-set.h"
  #include "function.h"
  #include "cgraph.h"
  #include "convert.h"
--- 24,36 ----
Index: go/go-lang.c
===================================================================
*** go/go-lang.c	(revision 229584)
--- go/go-lang.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 21,39 ****
  #include "system.h"
  #include "coretypes.h"
  #include "target.h"
- #include "function.h"
  #include "tree.h"
  #include "gimple-expr.h"
  #include "diagnostic.h"
- #include "ansidecl.h"
  #include "opts.h"
- #include "alias.h"
  #include "fold-const.h"
  #include "gimplify.h"
  #include "stor-layout.h"
- #include "toplev.h"
  #include "debug.h"
- #include "flags.h"
  #include "convert.h"
  #include "langhooks.h"
  #include "langhooks-def.h"
--- 21,34 ----
Index: go/gospec.c
===================================================================
*** go/gospec.c	(revision 229584)
--- go/gospec.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 21,27 ****
  #include "system.h"
  #include "coretypes.h"
  #include "tm.h"
- #include "gcc.h"
  #include "opts.h"
  
  /* This bit is set if we saw a `-xfoo' language specification.  */
--- 21,26 ----
Index: java/boehm.c
===================================================================
*** java/boehm.c	(revision 229584)
--- java/boehm.c	(working copy)
*************** The Free Software Foundation is independ
*** 28,35 ****
  #include "coretypes.h"
  #include "tm.h"
  #include "tree.h"
- #include "diagnostic-core.h"
- #include "alias.h"
  #include "java-tree.h"
  #include "parse.h"
  
--- 28,33 ----
Index: java/builtins.c
===================================================================
*** java/builtins.c	(revision 229584)
--- java/builtins.c	(working copy)
*************** The Free Software Foundation is independ
*** 30,57 ****
  #include "system.h"
  #include "coretypes.h"
  #include "tm.h"
- #include "function.h"
  #include "rtl.h"
  #include "tree.h"
  #include "stringpool.h"
  #include "expmed.h"
  #include "optabs.h"
- #include "emit-rtl.h"
- #include "alias.h"
  #include "fold-const.h"
  #include "stor-layout.h"
- #include "flags.h"
- #include "langhooks.h"
  #include "java-tree.h"
  
  /* FIXME: All these headers are necessary for sync_compare_and_swap.
     Front ends should never have to look at that.  */
- #include "dojump.h"
- #include "explow.h"
- #include "calls.h"
- #include "varasm.h"
- #include "stmt.h"
- #include "expr.h"
  
  static tree max_builtin (tree, tree);
  static tree min_builtin (tree, tree);
--- 30,46 ----
Index: java/class.c
===================================================================
*** java/class.c	(revision 229584)
--- java/class.c	(working copy)
*************** The Free Software Foundation is independ
*** 28,43 ****
  #include "coretypes.h"
  #include "target.h"
  #include "function.h"
- #include "obstack.h"
  #include "tree.h"
  #include "stringpool.h"
- #include "cgraph.h"
  #include "diagnostic-core.h"
- #include "alias.h"
  #include "fold-const.h"
  #include "stor-layout.h"
  #include "varasm.h"
- #include "flags.h"
  #include "java-tree.h"
  #include "jcf.h"
  #include "toplev.h"
--- 28,39 ----
Index: java/constants.c
===================================================================
*** java/constants.c	(revision 229584)
--- java/constants.c	(working copy)
*************** The Free Software Foundation is independ
*** 26,34 ****
  #include "tm.h"
  #include "tree.h"
  #include "stringpool.h"
- #include "diagnostic-core.h"
  #include "jcf.h"
- #include "alias.h"
  #include "fold-const.h"
  #include "stor-layout.h"
  #include "java-tree.h"
--- 26,32 ----
Index: java/decl.c
===================================================================
*** java/decl.c	(revision 229584)
--- java/decl.c	(working copy)
*************** The Free Software Foundation is independ
*** 33,47 ****
  #include "stringpool.h"
  #include "cgraph.h"
  #include "diagnostic-core.h"
- #include "alias.h"
  #include "stor-layout.h"
  #include "varasm.h"
  #include "toplev.h"
- #include "flags.h"
  #include "java-tree.h"
  #include "jcf.h"
  #include "java-except.h"
- #include "tree-inline.h"
  #include "version.h"
  #include "tree-iterator.h"
  #include "langhooks.h"
--- 33,44 ----
Index: java/except.c
===================================================================
*** java/except.c	(revision 229584)
--- java/except.c	(working copy)
*************** The Free Software Foundation is independ
*** 28,40 ****
  #include "tree.h"
  #include "stringpool.h"
  #include "diagnostic-core.h"
- #include "alias.h"
  #include "fold-const.h"
  #include "stor-layout.h"
  #include "java-tree.h"
- #include "javaop.h"
- #include "java-opcodes.h"
- #include "jcf.h"
  #include "java-except.h"
  #include "toplev.h"
  #include "tree-iterator.h"
--- 28,36 ----
Index: java/expr.c
===================================================================
*** java/expr.c	(revision 229584)
--- java/expr.c	(working copy)
*************** The Free Software Foundation is independ
*** 30,44 ****
  #include "tree.h"
  #include "stringpool.h"
  #include "diagnostic-core.h"
- #include "alias.h"
  #include "fold-const.h"
  #include "stor-layout.h"
- #include "flags.h"
  #include "java-tree.h"
- #include "javaop.h"
  #include "java-opcodes.h"
  #include "jcf.h"
- #include "java-except.h"
  #include "parse.h"
  #include "tree-iterator.h"
  
--- 30,40 ----
Index: java/java-gimplify.c
===================================================================
*** java/java-gimplify.c	(revision 229584)
--- java/java-gimplify.c	(working copy)
*************** The Free Software Foundation is independ
*** 24,41 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "tm.h"
  #include "function.h"
  #include "basic-block.h"
- #include "hard-reg-set.h"
  #include "tree.h"
  #include "gimple.h"
- #include "cfghooks.h"
- #include "alias.h"
- #include "fold-const.h"
  #include "java-tree.h"
  #include "dumpfile.h"
- #include "internal-fn.h"
  #include "gimplify.h"
  
  static tree java_gimplify_block (tree);
--- 24,35 ----
Index: java/jcf-dump.c
===================================================================
*** java/jcf-dump.c	(revision 229584)
--- java/jcf-dump.c	(working copy)
*************** The Free Software Foundation is independ
*** 50,62 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "options.h"
  #include "tree.h"
  #include "diagnostic.h"
  #include "intl.h"
  
  #include "jcf.h"
- #include "alias.h"
  #include "java-tree.h"
  
  #include "version.h"
--- 50,60 ----
Index: java/jcf-io.c
===================================================================
*** java/jcf-io.c	(revision 229584)
--- java/jcf-io.c	(working copy)
*************** The Free Software Foundation is independ
*** 26,37 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "options.h"
- #include "tree.h"
  
  #include "jcf.h"
- #include "alias.h"
- #include "java-tree.h"
  #include <dirent.h>
  
  #include "zlib.h"
--- 26,33 ----
Index: java/jcf-parse.c
===================================================================
*** java/jcf-parse.c	(revision 229584)
--- java/jcf-parse.c	(working copy)
*************** The Free Software Foundation is independ
*** 28,45 ****
  #include "coretypes.h"
  #include "target.h"
  #include "function.h"
- #include "obstack.h"
  #include "bitmap.h"
  #include "tree.h"
  #include "stringpool.h"
  #include "cgraph.h"
  #include "diagnostic-core.h"
- #include "alias.h"
- #include "flags.h"
- #include "java-except.h"
  #include "javaop.h"
  #include "java-tree.h"
- #include "parse.h"
  #include "debug.h"
  #include "toplev.h"
  
--- 28,40 ----
Index: java/jvgenmain.c
===================================================================
*** java/jvgenmain.c	(revision 229584)
--- java/jvgenmain.c	(working copy)
*************** The Free Software Foundation is independ
*** 26,37 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "options.h"
- #include "obstack.h"
  #include "tree.h"
  #include "diagnostic.h"
- #include "jcf.h"
- #include "alias.h"
  #include "java-tree.h"
  #include "intl.h"
  
--- 26,33 ----
Index: java/lang.c
===================================================================
*** java/lang.c	(revision 229584)
--- java/lang.c	(working copy)
*************** The Free Software Foundation is independ
*** 29,42 ****
  #include "target.h"
  #include "tree.h"
  #include "diagnostic.h"
- #include "alias.h"
  #include "java-tree.h"
  #include "jcf.h"
  #include "langhooks.h"
  #include "langhooks-def.h"
- #include "flags.h"
- #include "tree-inline.h"
- #include "splay-tree.h"
  #include "tree-dump.h"
  #include "opts.h"
  #include "context.h"
--- 29,38 ----
Index: java/mangle.c
===================================================================
*** java/mangle.c	(revision 229584)
--- java/mangle.c	(working copy)
*************** The Free Software Foundation is independ
*** 27,39 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "options.h"
- #include "obstack.h"
  #include "tree.h"
  #include "stringpool.h"
- #include "diagnostic-core.h"
  #include "jcf.h"
- #include "alias.h"
  #include "java-tree.h"
  #include "langhooks-def.h"
  
--- 27,35 ----
Index: java/mangle_name.c
===================================================================
*** java/mangle_name.c	(revision 229584)
--- java/mangle_name.c	(working copy)
*************** The Free Software Foundation is independ
*** 27,39 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "options.h"
  #include "obstack.h"
- #include "tree.h"
  #include "diagnostic-core.h"
  #include "jcf.h"
- #include "alias.h"
- #include "java-tree.h"
  
  static void append_unicode_mangled_name (const char *, int);
  #ifndef HAVE_AS_UTF8
--- 27,35 ----
Index: java/resource.c
===================================================================
*** java/resource.c	(revision 229584)
--- java/resource.c	(working copy)
*************** The Free Software Foundation is independ
*** 25,43 ****
  #include "system.h"
  #include "coretypes.h"
  #include "tm.h"
- #include "function.h"
- #include "hard-reg-set.h"
  #include "tree.h"
  #include "stringpool.h"
  #include "cgraph.h"
- #include "diagnostic-core.h"
- #include "alias.h"
  #include "fold-const.h"
  #include "stor-layout.h"
  #include "java-tree.h"
- #include "jcf.h"
  #include "toplev.h"
- #include "parse.h"
  #include "tree-iterator.h"
  
  /* A list of all the resources files.  */
--- 25,37 ----
Index: java/typeck.c
===================================================================
*** java/typeck.c	(revision 229584)
--- java/typeck.c	(working copy)
*************** The Free Software Foundation is independ
*** 27,42 ****
  #include "system.h"
  #include "coretypes.h"
  #include "options.h"
- #include "obstack.h"
  #include "tree.h"
  #include "stringpool.h"
  #include "diagnostic-core.h"
- #include "alias.h"
  #include "fold-const.h"
  #include "stor-layout.h"
- #include "flags.h"
  #include "java-tree.h"
- #include "jcf.h"
  #include "convert.h"
  
  static tree convert_ieee_real_to_integer (tree, tree);
--- 27,38 ----
Index: java/verify-glue.c
===================================================================
*** java/verify-glue.c	(revision 229584)
--- java/verify-glue.c	(working copy)
*************** The Free Software Foundation is independ
*** 28,37 ****
  #include "system.h"
  #include "coretypes.h"
  #include "options.h"
- #include "tree.h"
  #include "stringpool.h"
  #include "diagnostic-core.h"
- #include "alias.h"
  #include "parse.h"
  
  #include "verify.h"
--- 28,35 ----
Index: java/verify-impl.c
===================================================================
*** java/verify-impl.c	(revision 229584)
--- java/verify-impl.c	(working copy)
*************** details.  */
*** 14,24 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "options.h"
- #include "symtab.h"
  #include "verify.h"
  
- #include "alias.h"
  
  /* Hack to work around namespace pollution from java-tree.h.  */
  #undef current_class
--- 14,21 ----
Index: java/zextract.c
===================================================================
*** java/zextract.c	(revision 229584)
--- java/zextract.c	(working copy)
*************** The Free Software Foundation is independ
*** 28,34 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "tm.h"
  #include "zipfile.h"
  
  /* This stuff is partly based on the 28 August 1994 public release of the
--- 28,33 ----
Index: jit/dummy-frontend.c
===================================================================
*** jit/dummy-frontend.c	(revision 229584)
--- jit/dummy-frontend.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 20,41 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "tm.h"
- #include "function.h"
- #include "hard-reg-set.h"
- #include "tree.h"
  #include "jit-playback.h"
- #include "cgraph.h"
- #include "opts.h"
- #include "alias.h"
  #include "stor-layout.h"
  #include "debug.h"
  #include "langhooks.h"
  #include "langhooks-def.h"
- #include "dumpfile.h"
  
- #include "jit-common.h"
- #include "jit-logging.h"
  
  #include <mpfr.h>
  
--- 20,31 ----
Index: jit/jit-builtins.c
===================================================================
*** jit/jit-builtins.c	(revision 229584)
--- jit/jit-builtins.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 21,32 ****
  #include "system.h"
  #include "coretypes.h"
  #include "target.h"
- #include "jit-common.h"
  #include "jit-playback.h"
  #include "stringpool.h"
  
  #include "jit-builtins.h"
- #include "jit-recording.h"
  
  namespace gcc {
  
--- 21,30 ----
Index: jit/jit-playback.c
===================================================================
*** jit/jit-playback.c	(revision 229584)
--- jit/jit-playback.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 22,34 ****
  #include "system.h"
  #include "coretypes.h"
  #include "target.h"
- #include "function.h"
  #include "tree.h"
- #include "timevar.h"
  #include "stringpool.h"
  #include "cgraph.h"
- #include "opts.h"
- #include "alias.h"
  #include "dumpfile.h"
  #include "toplev.h"
  #include "tree-cfg.h"
--- 22,30 ----
*************** along with GCC; see the file COPYING3.
*** 40,50 ****
  #include "attribs.h"
  #include "context.h"
  #include "fold-const.h"
- #include "debug.h"
  #include "gcc.h"
  
- #include "jit-common.h"
- #include "jit-logging.h"
  #include "jit-playback.h"
  #include "jit-result.h"
  #include "jit-builtins.h"
--- 36,43 ----
Index: jit/jit-recording.c
===================================================================
*** jit/jit-recording.c	(revision 229584)
--- jit/jit-recording.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 22,36 ****
  #include "system.h"
  #include "coretypes.h"
  #include "tm.h"
- #include "jit-common.h"
- #include "timevar.h"
  #include "pretty-print.h"
  #include "toplev.h"
  
  #include <pthread.h>
  
  #include "jit-builtins.h"
- #include "jit-logging.h"
  #include "jit-recording.h"
  #include "jit-playback.h"
  
--- 22,33 ----
Index: jit/jit-spec.c
===================================================================
*** jit/jit-spec.c	(revision 229584)
--- jit/jit-spec.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 20,28 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "tm.h"
- #include "gcc.h"
- #include "opts.h"
  
  /* Filter command line before processing by the gcc driver proper.  */
  void
--- 20,25 ----
Index: jit/libgccjit.c
===================================================================
*** jit/libgccjit.c	(revision 229584)
--- jit/libgccjit.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 21,33 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "jit-common.h"
  #include "timevar.h"
- #include "opts.h"
  #include "typed-splay-tree.h"
  
  #include "libgccjit.h"
- #include "jit-logging.h"
  #include "jit-recording.h"
  #include "jit-result.h"
  
--- 21,30 ----
Index: objcp/objcp-decl.c
===================================================================
*** objcp/objcp-decl.c	(revision 229584)
--- objcp/objcp-decl.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 22,34 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "tm.h"
- #include "tree.h"
  #include "cp-tree.h"
- #include "alias.h"
  
  #include "c-family/c-objc.h"
- #include "objc-act.h"
  #include "objcp-decl.h"
  
  /* Hacks to simulate start_struct() and finish_struct(). */
--- 22,30 ----
Index: objcp/objcp-lang.c
===================================================================
*** objcp/objcp-lang.c	(revision 229584)
--- objcp/objcp-lang.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 21,30 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
- #include "target.h"
- #include "tree.h"
  #include "cp-tree.h"
- #include "c-family/c-common.h"
  #include "c-family/c-objc.h"
  #include "objc-act.h"
  #include "langhooks.h"
--- 21,27 ----