This moves target-def.h includes to the end of the include list, so that the file sees the same header files as the targetm initialisation itself. I've left a gap to emphasise that the placement is deliberate.
This is a prerequisite for the patch I'm about to post. It probably doesn't make much sense otherwise. Bootstrapped & regression-tested on x86_64-linux-gnu. Also tested with config-list.mk. OK to install if the later patch is? Thanks, Richard gcc/ * config/aarch64/aarch64.c, config/alpha/alpha.c, config/arm/arm.c, config/avr/avr.c, config/bfin/bfin.c, config/c6x/c6x.c, config/cr16/cr16.c, config/cris/cris.c, config/fr30/fr30.c, config/frv/frv.c, config/ft32/ft32.c, config/h8300/h8300.c, config/i386/i386.c, config/ia64/ia64.c, config/iq2000/iq2000.c, config/lm32/lm32.c, config/m32c/m32c.c, config/m32r/m32r.c, config/m68k/m68k.c, config/mcore/mcore.c, config/mep/mep.c, config/microblaze/microblaze.c, config/mips/mips.c, config/mmix/mmix.c, config/mn10300/mn10300.c, config/moxie/moxie.c, config/msp430/msp430.c, config/nds32/nds32.c, config/nios2/nios2.c, config/nvptx/nvptx.c, config/pa/pa.c, config/pdp11/pdp11.c, config/rl78/rl78.c, config/rs6000/rs6000.c, config/rx/rx.c, config/s390/s390.c, config/sh/sh.c, config/sparc/sparc.c, config/spu/spu.c, config/stormy16/stormy16.c, config/tilegx/tilegx.c, config/tilepro/tilepro.c, config/v850/v850.c, config/vax/vax.c, config/visium/visium.c, config/xtensa/xtensa.c: Move target-def.h includes to end. Index: gcc/config/aarch64/aarch64.c =================================================================== --- gcc/config/aarch64/aarch64.c 2015-06-22 14:02:15.009537962 +0100 +++ gcc/config/aarch64/aarch64.c 2015-06-22 14:06:21.254220624 +0100 @@ -58,7 +58,6 @@ #include "reload.h" #include "toplev.h" #include "target.h" -#include "target-def.h" #include "targhooks.h" #include "tm_p.h" #include "recog.h" @@ -83,6 +82,8 @@ #include "sched-int.h" #include "cortex-a57-fma-steering.h" +#include "target-def.h" + /* Defined for convenience. */ #define POINTER_BYTES (POINTER_SIZE / BITS_PER_UNIT) Index: gcc/config/alpha/alpha.c =================================================================== --- gcc/config/alpha/alpha.c 2015-06-22 14:04:24.083139746 +0100 +++ gcc/config/alpha/alpha.c 2015-06-22 14:06:21.255220580 +0100 @@ -54,7 +54,6 @@ the Free Software Foundation; either ver #include "diagnostic-core.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "common/common-target.h" #include "debug.h" #include "langhooks.h" @@ -90,6 +89,8 @@ the Free Software Foundation; either ver #include "builtins.h" #include "rtl-iter.h" +#include "target-def.h" + /* Specify which cpu to schedule for. */ enum processor_type alpha_tune; Index: gcc/config/arm/arm.c =================================================================== --- gcc/config/arm/arm.c 2015-06-22 14:03:56.691808537 +0100 +++ gcc/config/arm/arm.c 2015-06-22 14:06:21.258220450 +0100 @@ -69,7 +69,6 @@ #include "tm_p.h" #include "target.h" #include "sched-int.h" -#include "target-def.h" #include "debug.h" #include "langhooks.h" #include "df.h" @@ -85,6 +84,8 @@ #include "rtl-iter.h" #include "sched-int.h" +#include "target-def.h" + /* Forward definitions of types. */ typedef struct minipool_node Mnode; typedef struct minipool_fixup Mfix; Index: gcc/config/avr/avr.c =================================================================== --- gcc/config/avr/avr.c 2015-06-22 14:02:15.138533308 +0100 +++ gcc/config/avr/avr.c 2015-06-22 14:06:21.260220363 +0100 @@ -56,7 +56,6 @@ #include "langhooks.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "params.h" #include "dominance.h" #include "cfg.h" @@ -72,6 +71,8 @@ #include "context.h" #include "tree-pass.h" +#include "target-def.h" + /* Maximal allowed offset for an address in the LD command */ #define MAX_LD_OFFSET(MODE) (64 - (signed)GET_MODE_SIZE (MODE)) Index: gcc/config/bfin/bfin.c =================================================================== --- gcc/config/bfin/bfin.c 2015-06-22 14:02:15.148532947 +0100 +++ gcc/config/bfin/bfin.c 2015-06-22 14:06:21.261220320 +0100 @@ -41,7 +41,6 @@ #include "except.h" #include "function.h" #include "target.h" -#include "target-def.h" #include "expmed.h" #include "dojump.h" #include "explow.h" @@ -77,6 +76,8 @@ #include "dumpfile.h" #include "builtins.h" +#include "target-def.h" + /* A C structure for machine-specific, per-function data. This is added to the cfun structure. */ struct GTY(()) machine_function Index: gcc/config/c6x/c6x.c =================================================================== --- gcc/config/c6x/c6x.c 2015-06-22 14:02:15.155532695 +0100 +++ gcc/config/c6x/c6x.c 2015-06-22 14:06:21.261220320 +0100 @@ -70,7 +70,6 @@ #include "cgraph.h" #include "langhooks.h" #include "target.h" -#include "target-def.h" #include "sel-sched.h" #include "debug.h" #include "opts.h" @@ -80,6 +79,8 @@ #include "gimple-expr.h" #include "builtins.h" +#include "target-def.h" + /* Table of supported architecture variants. */ typedef struct { Index: gcc/config/cr16/cr16.c =================================================================== --- gcc/config/cr16/cr16.c 2015-06-22 14:02:15.158532586 +0100 +++ gcc/config/cr16/cr16.c 2015-06-22 14:06:21.262220277 +0100 @@ -60,10 +60,11 @@ #include "cfgcleanup.h" #include "basic-block.h" #include "target.h" -#include "target-def.h" #include "df.h" #include "builtins.h" +#include "target-def.h" + /* Definitions. */ /* Maximum number of register used for passing parameters. */ Index: gcc/config/cris/cris.c =================================================================== --- gcc/config/cris/cris.c 2015-06-22 14:02:15.159532550 +0100 +++ gcc/config/cris/cris.c 2015-06-22 14:06:21.262220277 +0100 @@ -52,7 +52,6 @@ the Free Software Foundation; either ver #include "output.h" #include "tm-constrs.h" #include "target.h" -#include "target-def.h" #include "insn-codes.h" #include "optabs.h" #include "dominance.h" @@ -71,6 +70,8 @@ the Free Software Foundation; either ver #include "cgraph.h" #include "builtins.h" +#include "target-def.h" + /* Usable when we have an amount to add or subtract, and want the optimal size of the insn. */ #define ADDITIVE_SIZE_MODIFIER(size) \ Index: gcc/config/fr30/fr30.c =================================================================== --- gcc/config/fr30/fr30.c 2015-06-22 14:02:15.164532370 +0100 +++ gcc/config/fr30/fr30.c 2015-06-22 14:06:21.263220233 +0100 @@ -62,9 +62,10 @@ #include "diagnostic-core.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "builtins.h" +#include "target-def.h" + /*}}}*/ /*{{{ Function Prologues & Epilogues */ Index: gcc/config/frv/frv.c =================================================================== --- gcc/config/frv/frv.c 2015-06-22 14:02:15.168532226 +0100 +++ gcc/config/frv/frv.c 2015-06-22 14:06:21.265220146 +0100 @@ -63,7 +63,6 @@ the Free Software Foundation; either ver #include "basic-block.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "targhooks.h" #include "langhooks.h" #include "df.h" @@ -72,6 +71,8 @@ the Free Software Foundation; either ver #include "ifcvt.h" #include "rtl-iter.h" +#include "target-def.h" + #ifndef FRV_INLINE #define FRV_INLINE inline #endif Index: gcc/config/ft32/ft32.c =================================================================== --- gcc/config/ft32/ft32.c 2015-06-22 14:02:15.175531973 +0100 +++ gcc/config/ft32/ft32.c 2015-06-22 14:06:21.265220146 +0100 @@ -45,7 +45,6 @@ #include "except.h" #include "function.h" #include "target.h" -#include "target-def.h" #include "tm_p.h" #include "langhooks.h" #include "dominance.h" @@ -60,6 +59,8 @@ #include "df.h" #include "builtins.h" +#include "target-def.h" + #include <stdint.h> Index: gcc/config/h8300/h8300.c =================================================================== --- gcc/config/h8300/h8300.c 2015-06-22 14:02:15.177531901 +0100 +++ gcc/config/h8300/h8300.c 2015-06-22 14:06:21.265220146 +0100 @@ -53,7 +53,6 @@ the Free Software Foundation; either ver #include "tm_p.h" #include "tm-constrs.h" #include "target.h" -#include "target-def.h" #include "dominance.h" #include "cfg.h" #include "cfgrtl.h" @@ -66,6 +65,8 @@ the Free Software Foundation; either ver #include "df.h" #include "builtins.h" +#include "target-def.h" + /* Classifies a h8300_src_operand or h8300_dst_operand. H8OP_IMMEDIATE Index: gcc/config/i386/i386.c =================================================================== --- gcc/config/i386/i386.c 2015-06-22 14:04:03.367476875 +0100 +++ gcc/config/i386/i386.c 2015-06-22 14:06:21.272219842 +0100 @@ -62,7 +62,6 @@ the Free Software Foundation; either ver #include "cfgcleanup.h" #include "basic-block.h" #include "target.h" -#include "target-def.h" #include "common/common-target.h" #include "langhooks.h" #include "reload.h" @@ -101,6 +100,8 @@ the Free Software Foundation; either ver #include "tree-chkp.h" #include "rtl-chkp.h" +#include "target-def.h" + static rtx legitimize_dllimport_symbol (rtx, bool); static rtx legitimize_pe_coff_extern_decl (rtx, bool); static rtx legitimize_pe_coff_symbol (rtx, bool); Index: gcc/config/ia64/ia64.c =================================================================== --- gcc/config/ia64/ia64.c 2015-06-22 14:03:56.693808463 +0100 +++ gcc/config/ia64/ia64.c 2015-06-22 14:06:21.274219756 +0100 @@ -64,7 +64,6 @@ the Free Software Foundation; either ver #include "sched-int.h" #include "timevar.h" #include "target.h" -#include "target-def.h" #include "common/common-target.h" #include "tm_p.h" #include "langhooks.h" @@ -87,6 +86,8 @@ the Free Software Foundation; either ver #include "dumpfile.h" #include "builtins.h" +#include "target-def.h" + /* This is used for communication between ASM_OUTPUT_LABEL and ASM_OUTPUT_LABELREF. */ int ia64_asm_output_label = 0; Index: gcc/config/iq2000/iq2000.c =================================================================== --- gcc/config/iq2000/iq2000.c 2015-06-22 14:02:15.509519922 +0100 +++ gcc/config/iq2000/iq2000.c 2015-06-22 14:06:21.274219756 +0100 @@ -52,7 +52,6 @@ the Free Software Foundation; either ver #include "tm_p.h" #include "debug.h" #include "target.h" -#include "target-def.h" #include "langhooks.h" #include "dominance.h" #include "cfg.h" @@ -66,6 +65,8 @@ the Free Software Foundation; either ver #include "df.h" #include "builtins.h" +#include "target-def.h" + /* Enumeration for all of the relational tests, so that we can build arrays indexed by the test type, and not worry about the order of EQ, NE, etc. */ Index: gcc/config/lm32/lm32.c =================================================================== --- gcc/config/lm32/lm32.c 2015-06-22 14:02:15.510519886 +0100 +++ gcc/config/lm32/lm32.c 2015-06-22 14:06:21.275219712 +0100 @@ -62,12 +62,13 @@ #include "optabs.h" #include "libfuncs.h" #include "target.h" -#include "target-def.h" #include "langhooks.h" #include "tm-constrs.h" #include "df.h" #include "builtins.h" +#include "target-def.h" + struct lm32_frame_info { HOST_WIDE_INT total_size; /* number of bytes of entire frame. */ Index: gcc/config/m32c/m32c.c =================================================================== --- gcc/config/m32c/m32c.c 2015-06-22 14:04:24.083139746 +0100 +++ gcc/config/m32c/m32c.c 2015-06-22 14:06:21.275219712 +0100 @@ -53,7 +53,6 @@ #include "optabs.h" #include "except.h" #include "target.h" -#include "target-def.h" #include "tm_p.h" #include "langhooks.h" #include "predict.h" @@ -75,6 +74,8 @@ #include "tm-constrs.h" #include "builtins.h" +#include "target-def.h" + /* Prototypes */ /* Used by m32c_pushm_popm. */ Index: gcc/config/m32r/m32r.c =================================================================== --- gcc/config/m32r/m32r.c 2015-06-22 14:02:15.517519633 +0100 +++ gcc/config/m32r/m32r.c 2015-06-22 14:06:21.275219712 +0100 @@ -58,11 +58,12 @@ #include "df.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "tm-constrs.h" #include "opts.h" #include "builtins.h" +#include "target-def.h" + /* Array of valid operand punctuation characters. */ static char m32r_punct_chars[256]; Index: gcc/config/m68k/m68k.c =================================================================== --- gcc/config/m68k/m68k.c 2015-06-22 14:02:15.520519525 +0100 +++ gcc/config/m68k/m68k.c 2015-06-22 14:06:21.276219669 +0100 @@ -48,7 +48,6 @@ the Free Software Foundation; either ver #include "reload.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "debug.h" #include "dominance.h" #include "cfg.h" @@ -68,6 +67,8 @@ the Free Software Foundation; either ver #include "builtins.h" #include "rtl-iter.h" +#include "target-def.h" + enum reg_class regno_reg_class[] = { DATA_REGS, DATA_REGS, DATA_REGS, DATA_REGS, Index: gcc/config/mcore/mcore.c =================================================================== --- gcc/config/mcore/mcore.c 2015-06-22 14:02:15.523519417 +0100 +++ gcc/config/mcore/mcore.c 2015-06-22 14:06:21.276219669 +0100 @@ -51,7 +51,6 @@ #include "recog.h" #include "diagnostic-core.h" #include "target.h" -#include "target-def.h" #include "dominance.h" #include "cfg.h" #include "cfgrtl.h" @@ -64,6 +63,8 @@ #include "df.h" #include "builtins.h" +#include "target-def.h" + /* For dumping information about frame sizes. */ char * mcore_current_function_name = 0; long mcore_current_compilation_timestamp = 0; Index: gcc/config/mep/mep.c =================================================================== --- gcc/config/mep/mep.c 2015-06-22 14:04:24.084139682 +0100 +++ gcc/config/mep/mep.c 2015-06-22 14:06:21.277219625 +0100 @@ -55,7 +55,6 @@ Software Foundation; either version 3, o #include "tm_p.h" #include "diagnostic-core.h" #include "target.h" -#include "target-def.h" #include "langhooks.h" #include "dominance.h" #include "cfg.h" @@ -79,6 +78,8 @@ Software Foundation; either version 3, o #include "builtins.h" #include "rtl-iter.h" +#include "target-def.h" + /* Structure of this file: + Command Line Option Support Index: gcc/config/microblaze/microblaze.c =================================================================== --- gcc/config/microblaze/microblaze.c 2015-06-22 14:02:15.531519128 +0100 +++ gcc/config/microblaze/microblaze.c 2015-06-22 14:06:21.278219582 +0100 @@ -48,7 +48,6 @@ #include "reload.h" #include "output.h" #include "target.h" -#include "target-def.h" #include "tm_p.h" #include "gstab.h" #include "dominance.h" @@ -70,6 +69,8 @@ #include "builtins.h" #include "rtl-iter.h" +#include "target-def.h" + #define MICROBLAZE_VERSION_COMPARE(VA,VB) strcasecmp (VA, VB) /* Classifies an address. Index: gcc/config/mips/mips.c =================================================================== --- gcc/config/mips/mips.c 2015-06-22 14:04:24.086139553 +0100 +++ gcc/config/mips/mips.c 2015-06-22 14:06:21.280219495 +0100 @@ -57,7 +57,6 @@ the Free Software Foundation; either ver #include "gstab.h" #include "debug.h" #include "target.h" -#include "target-def.h" #include "common/common-target.h" #include "langhooks.h" #include "dominance.h" @@ -89,6 +88,8 @@ the Free Software Foundation; either ver #include "builtins.h" #include "rtl-iter.h" +#include "target-def.h" + /* True if X is an UNSPEC wrapper around a SYMBOL_REF or LABEL_REF. */ #define UNSPEC_ADDRESS_P(X) \ (GET_CODE (X) == UNSPEC \ Index: gcc/config/mmix/mmix.c =================================================================== --- gcc/config/mmix/mmix.c 2015-06-22 14:02:15.563517974 +0100 +++ gcc/config/mmix/mmix.c 2015-06-22 14:06:21.281219452 +0100 @@ -56,11 +56,12 @@ the Free Software Foundation; either ver #include "debug.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "df.h" #include "tm-constrs.h" #include "builtins.h" +#include "target-def.h" + /* First some local helper definitions. */ #define MMIX_FIRST_GLOBAL_REGNUM 32 Index: gcc/config/mn10300/mn10300.c =================================================================== --- gcc/config/mn10300/mn10300.c 2015-06-22 14:02:15.565517901 +0100 +++ gcc/config/mn10300/mn10300.c 2015-06-22 14:06:21.281219452 +0100 @@ -52,7 +52,6 @@ #include "tm_p.h" #include "tm-constrs.h" #include "target.h" -#include "target-def.h" #include "dominance.h" #include "cfg.h" #include "cfgrtl.h" @@ -68,6 +67,8 @@ #include "dumpfile.h" #include "builtins.h" +#include "target-def.h" + /* This is used in the am33_2.0-linux-gnu port, in which global symbol names are not prefixed by underscores, to tell whether to prefix a label with a plus sign or not, so that the assembler can tell Index: gcc/config/moxie/moxie.c =================================================================== --- gcc/config/moxie/moxie.c 2015-06-22 14:02:15.568517793 +0100 +++ gcc/config/moxie/moxie.c 2015-06-22 14:06:21.282219408 +0100 @@ -52,7 +52,6 @@ #include "optabs.h" #include "except.h" #include "target.h" -#include "target-def.h" #include "tm_p.h" #include "langhooks.h" #include "dominance.h" @@ -67,6 +66,8 @@ #include "df.h" #include "builtins.h" +#include "target-def.h" + #define LOSE_AND_RETURN(msgid, x) \ do \ { \ Index: gcc/config/msp430/msp430.c =================================================================== --- gcc/config/msp430/msp430.c 2015-06-22 14:02:15.570517721 +0100 +++ gcc/config/msp430/msp430.c 2015-06-22 14:06:21.282219408 +0100 @@ -64,12 +64,13 @@ #include "tm_p.h" #include "debug.h" #include "target.h" -#include "target-def.h" #include "langhooks.h" #include "msp430-protos.h" #include "dumpfile.h" #include "opts.h" #include "builtins.h" + +#include "target-def.h" static void msp430_compute_frame_info (void); Index: gcc/config/nds32/nds32.c =================================================================== --- gcc/config/nds32/nds32.c 2015-06-22 14:02:15.573517613 +0100 +++ gcc/config/nds32/nds32.c 2015-06-22 14:06:21.282219408 +0100 @@ -64,10 +64,11 @@ #include "tm-constrs.h" #include "optabs.h" /* For GEN_FCN. */ #include "target.h" -#include "target-def.h" #include "langhooks.h" /* For add_builtin_function(). */ #include "builtins.h" +#include "target-def.h" + /* ------------------------------------------------------------------------ */ /* This file is divided into five parts: Index: gcc/config/nios2/nios2.c =================================================================== --- gcc/config/nios2/nios2.c 2015-06-22 14:02:15.576517505 +0100 +++ gcc/config/nios2/nios2.c 2015-06-22 14:06:21.283219365 +0100 @@ -60,7 +60,6 @@ #include "diagnostic-core.h" #include "toplev.h" #include "target.h" -#include "target-def.h" #include "tm_p.h" #include "langhooks.h" #include "df.h" @@ -69,6 +68,8 @@ #include "stor-layout.h" #include "builtins.h" +#include "target-def.h" + /* Forward function declarations. */ static bool prologue_saved_reg_p (unsigned); static void nios2_load_pic_register (void); Index: gcc/config/nvptx/nvptx.c =================================================================== --- gcc/config/nvptx/nvptx.c 2015-06-22 14:04:03.368476810 +0100 +++ gcc/config/nvptx/nvptx.c 2015-06-22 14:06:21.283219365 +0100 @@ -53,7 +53,6 @@ #include "langhooks.h" #include "dbxout.h" #include "target.h" -#include "target-def.h" #include "diagnostic.h" #include "predict.h" #include "basic-block.h" @@ -62,6 +61,8 @@ #include "df.h" #include "builtins.h" +#include "target-def.h" + /* Record the function decls we've written, and the libfuncs and function decls corresponding to them. */ static std::stringstream func_decls; Index: gcc/config/pa/pa.c =================================================================== --- gcc/config/pa/pa.c 2015-06-22 14:02:15.582517288 +0100 +++ gcc/config/pa/pa.c 2015-06-22 14:06:21.284219322 +0100 @@ -56,7 +56,6 @@ the Free Software Foundation; either ver #include "tm_p.h" #include "target.h" #include "common/common-target.h" -#include "target-def.h" #include "langhooks.h" #include "dominance.h" #include "cfg.h" @@ -70,6 +69,8 @@ the Free Software Foundation; either ver #include "opts.h" #include "builtins.h" +#include "target-def.h" + /* Return nonzero if there is a bypass for the output of OUT_INSN and the fp store IN_INSN. */ int Index: gcc/config/pdp11/pdp11.c =================================================================== --- gcc/config/pdp11/pdp11.c 2015-06-22 14:02:15.594516855 +0100 +++ gcc/config/pdp11/pdp11.c 2015-06-22 14:06:21.285219278 +0100 @@ -47,7 +47,6 @@ the Free Software Foundation; either ver #include "diagnostic-core.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "dominance.h" #include "cfg.h" #include "cfgrtl.h" @@ -62,6 +61,8 @@ the Free Software Foundation; either ver #include "dbxout.h" #include "builtins.h" +#include "target-def.h" + /* this is the current value returned by the macro FIRST_PARM_OFFSET defined in tm.h */ int current_first_parm_offset; Index: gcc/config/rl78/rl78.c =================================================================== --- gcc/config/rl78/rl78.c 2015-06-22 14:02:15.597516747 +0100 +++ gcc/config/rl78/rl78.c 2015-06-22 14:06:21.285219278 +0100 @@ -64,7 +64,6 @@ #include "tm_p.h" #include "debug.h" #include "target.h" -#include "target-def.h" #include "langhooks.h" #include "rl78-protos.h" #include "dumpfile.h" @@ -74,6 +73,8 @@ #include "insn-flags.h" /* for gen_*(). */ #include "builtins.h" #include "stringpool.h" + +#include "target-def.h" static inline bool is_interrupt_func (const_tree decl); static inline bool is_brk_interrupt_func (const_tree decl); Index: gcc/config/rs6000/rs6000.c =================================================================== --- gcc/config/rs6000/rs6000.c 2015-06-22 14:04:01.753581047 +0100 +++ gcc/config/rs6000/rs6000.c 2015-06-22 14:06:21.290219061 +0100 @@ -65,7 +65,6 @@ #include "toplev.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "common/common-target.h" #include "langhooks.h" #include "reload.h" @@ -101,6 +100,8 @@ #include "gstab.h" /* for N_SLINE */ #endif +#include "target-def.h" + #ifndef TARGET_NO_PROTOTYPE #define TARGET_NO_PROTOTYPE 0 #endif Index: gcc/config/rx/rx.c =================================================================== --- gcc/config/rx/rx.c 2015-06-22 14:02:15.716512453 +0100 +++ gcc/config/rx/rx.c 2015-06-22 14:06:21.290219061 +0100 @@ -67,7 +67,6 @@ #include "tm_p.h" #include "debug.h" #include "target.h" -#include "target-def.h" #include "langhooks.h" #include "opts.h" #include "plugin-api.h" @@ -75,6 +74,8 @@ #include "cgraph.h" #include "builtins.h" +#include "target-def.h" + static unsigned int rx_gp_base_regnum_val = INVALID_REGNUM; static unsigned int rx_pid_base_regnum_val = INVALID_REGNUM; static unsigned int rx_num_interrupt_regs; Index: gcc/config/s390/s390.c =================================================================== --- gcc/config/s390/s390.c 2015-06-22 14:02:15.728512020 +0100 +++ gcc/config/s390/s390.c 2015-06-22 14:06:21.291219018 +0100 @@ -63,7 +63,6 @@ Software Foundation; either version 3, o #include "cfgcleanup.h" #include "basic-block.h" #include "target.h" -#include "target-def.h" #include "debug.h" #include "langhooks.h" #include "insn-codes.h" @@ -88,6 +87,8 @@ Software Foundation; either version 3, o #include "ipa-ref.h" #include "cgraph.h" +#include "target-def.h" + /* Define the specific costs for a given cpu. */ struct processor_costs Index: gcc/config/sh/sh.c =================================================================== --- gcc/config/sh/sh.c 2015-06-22 14:02:15.762510794 +0100 +++ gcc/config/sh/sh.c 2015-06-22 14:06:21.293218931 +0100 @@ -56,7 +56,6 @@ the Free Software Foundation; either ver #include "dwarf2.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "langhooks.h" #include "predict.h" #include "dominance.h" @@ -88,6 +87,8 @@ the Free Software Foundation; either ver #include "builtins.h" #include "rtl-iter.h" +#include "target-def.h" + int code_for_indirect_jump_scratch = CODE_FOR_indirect_jump_scratch; /* These are some macros to abstract register modes. */ Index: gcc/config/sparc/sparc.c =================================================================== --- gcc/config/sparc/sparc.c 2015-06-22 14:02:15.871506861 +0100 +++ gcc/config/sparc/sparc.c 2015-06-22 14:06:21.294218888 +0100 @@ -55,7 +55,6 @@ the Free Software Foundation; either ver #include "tm_p.h" #include "debug.h" #include "target.h" -#include "target-def.h" #include "common/common-target.h" #include "predict.h" #include "dominance.h" @@ -83,6 +82,8 @@ the Free Software Foundation; either ver #include "builtins.h" #include "rtl-iter.h" +#include "target-def.h" + /* Processor costs */ struct processor_costs { Index: gcc/config/spu/spu.c =================================================================== --- gcc/config/spu/spu.c 2015-06-22 14:02:15.894506031 +0100 +++ gcc/config/spu/spu.c 2015-06-22 14:06:21.295218844 +0100 @@ -58,7 +58,6 @@ #include "diagnostic-core.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "langhooks.h" #include "reload.h" #include "sched-int.h" @@ -80,6 +79,8 @@ #include "builtins.h" #include "rtl-iter.h" +#include "target-def.h" + /* Builtin types, data and prototypes. */ enum spu_builtin_type_index Index: gcc/config/stormy16/stormy16.c =================================================================== --- gcc/config/stormy16/stormy16.c 2015-06-22 14:02:15.906505598 +0100 +++ gcc/config/stormy16/stormy16.c 2015-06-22 14:06:21.295218844 +0100 @@ -53,7 +53,6 @@ #include "optabs.h" #include "except.h" #include "target.h" -#include "target-def.h" #include "tm_p.h" #include "langhooks.h" #include "predict.h" @@ -76,6 +75,8 @@ #include "reload.h" #include "builtins.h" +#include "target-def.h" + static rtx emit_addhi3_postreload (rtx, rtx, rtx); static void xstormy16_asm_out_constructor (rtx, int); static void xstormy16_asm_out_destructor (rtx, int); Index: gcc/config/tilegx/tilegx.c =================================================================== --- gcc/config/tilegx/tilegx.c 2015-06-22 14:02:15.912505381 +0100 +++ gcc/config/tilegx/tilegx.c 2015-06-22 14:06:21.298218714 +0100 @@ -58,7 +58,6 @@ #include "tm_p.h" #include "tm-constrs.h" #include "target.h" -#include "target-def.h" #include "dwarf2.h" #include "timevar.h" #include "fold-const.h" @@ -77,6 +76,8 @@ #include "diagnostic.h" #include "builtins.h" +#include "target-def.h" + /* SYMBOL_REF for GOT */ static GTY(()) rtx g_got_symbol = NULL; Index: gcc/config/tilepro/tilepro.c =================================================================== --- gcc/config/tilepro/tilepro.c 2015-06-22 14:02:15.919505129 +0100 +++ gcc/config/tilepro/tilepro.c 2015-06-22 14:06:21.298218714 +0100 @@ -59,7 +59,6 @@ #include "tm_p.h" #include "tm-constrs.h" #include "target.h" -#include "target-def.h" #include "dwarf2.h" #include "timevar.h" #include "fold-const.h" @@ -78,6 +77,8 @@ #include "diagnostic.h" #include "builtins.h" +#include "target-def.h" + /* SYMBOL_REF for GOT */ static GTY(()) rtx g_got_symbol = NULL; Index: gcc/config/v850/v850.c =================================================================== --- gcc/config/v850/v850.c 2015-06-22 14:02:15.922505021 +0100 +++ gcc/config/v850/v850.c 2015-06-22 14:06:21.298218714 +0100 @@ -48,7 +48,6 @@ #include "diagnostic-core.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "dominance.h" #include "cfg.h" #include "cfgrtl.h" @@ -62,6 +61,8 @@ #include "opts.h" #include "builtins.h" +#include "target-def.h" + #ifndef streq #define streq(a,b) (strcmp (a, b) == 0) #endif Index: gcc/config/vax/vax.c =================================================================== --- gcc/config/vax/vax.c 2015-06-22 14:02:15.924504948 +0100 +++ gcc/config/vax/vax.c 2015-06-22 14:06:21.298218714 +0100 @@ -61,9 +61,10 @@ the Free Software Foundation; either ver #include "tm-constrs.h" #include "tm_p.h" #include "target.h" -#include "target-def.h" #include "builtins.h" +#include "target-def.h" + static void vax_option_override (void); static bool vax_legitimate_address_p (machine_mode, rtx, bool); static void vax_file_start (void); Index: gcc/config/visium/visium.c =================================================================== --- gcc/config/visium/visium.c 2015-06-22 14:02:15.925504912 +0100 +++ gcc/config/visium/visium.c 2015-06-22 14:06:21.300218627 +0100 @@ -52,7 +52,6 @@ #include "tm_p.h" #include "optabs.h" #include "target.h" -#include "target-def.h" #include "common/common-target.h" #include "predict.h" #include "basic-block.h" @@ -68,6 +67,8 @@ #include "context.h" #include "builtins.h" +#include "target-def.h" + /* Machine specific function data. */ struct GTY (()) machine_function { Index: gcc/config/xtensa/xtensa.c =================================================================== --- gcc/config/xtensa/xtensa.c 2015-06-22 14:02:15.929504768 +0100 +++ gcc/config/xtensa/xtensa.c 2015-06-22 14:06:21.300218627 +0100 @@ -63,7 +63,6 @@ Software Foundation; either version 3, o #include "optabs.h" #include "libfuncs.h" #include "target.h" -#include "target-def.h" #include "langhooks.h" #include "tree-ssa-alias.h" #include "internal-fn.h" @@ -78,6 +77,7 @@ Software Foundation; either version 3, o #include "hw-doloop.h" #include "rtl-iter.h" +#include "target-def.h" /* Enumeration for all of the relational tests, so that we can build arrays indexed by the test type, and not worry about the order