aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog20
-rw-r--r--gcc/config/aarch64/aarch64.c3
-rw-r--r--gcc/config/alpha/alpha.c3
-rw-r--r--gcc/config/arm/arm.c3
-rw-r--r--gcc/config/avr/avr.c3
-rw-r--r--gcc/config/bfin/bfin.c3
-rw-r--r--gcc/config/c6x/c6x.c3
-rw-r--r--gcc/config/cr16/cr16.c3
-rw-r--r--gcc/config/cris/cris.c3
-rw-r--r--gcc/config/fr30/fr30.c3
-rw-r--r--gcc/config/frv/frv.c3
-rw-r--r--gcc/config/ft32/ft32.c3
-rw-r--r--gcc/config/h8300/h8300.c3
-rw-r--r--gcc/config/i386/i386.c3
-rw-r--r--gcc/config/ia64/ia64.c3
-rw-r--r--gcc/config/iq2000/iq2000.c3
-rw-r--r--gcc/config/lm32/lm32.c3
-rw-r--r--gcc/config/m32c/m32c.c3
-rw-r--r--gcc/config/m32r/m32r.c3
-rw-r--r--gcc/config/m68k/m68k.c3
-rw-r--r--gcc/config/mcore/mcore.c3
-rw-r--r--gcc/config/mep/mep.c3
-rw-r--r--gcc/config/microblaze/microblaze.c3
-rw-r--r--gcc/config/mips/mips.c3
-rw-r--r--gcc/config/mmix/mmix.c3
-rw-r--r--gcc/config/mn10300/mn10300.c3
-rw-r--r--gcc/config/moxie/moxie.c3
-rw-r--r--gcc/config/msp430/msp430.c3
-rw-r--r--gcc/config/nds32/nds32.c3
-rw-r--r--gcc/config/nios2/nios2.c3
-rw-r--r--gcc/config/nvptx/nvptx.c3
-rw-r--r--gcc/config/pa/pa.c3
-rw-r--r--gcc/config/pdp11/pdp11.c3
-rw-r--r--gcc/config/rl78/rl78.c3
-rw-r--r--gcc/config/rs6000/rs6000.c3
-rw-r--r--gcc/config/rx/rx.c3
-rw-r--r--gcc/config/s390/s390.c3
-rw-r--r--gcc/config/sh/sh.c3
-rw-r--r--gcc/config/sparc/sparc.c3
-rw-r--r--gcc/config/spu/spu.c3
-rw-r--r--gcc/config/stormy16/stormy16.c3
-rw-r--r--gcc/config/tilegx/tilegx.c3
-rw-r--r--gcc/config/tilepro/tilepro.c3
-rw-r--r--gcc/config/v850/v850.c3
-rw-r--r--gcc/config/vax/vax.c3
-rw-r--r--gcc/config/visium/visium.c3
-rw-r--r--gcc/config/xtensa/xtensa.c2
47 files changed, 111 insertions, 46 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e0134e1..0fce794 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,25 @@
2015-06-25 Richard Sandiford <richard.sandiford@arm.com>
+ * 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.
+
+2015-06-25 Richard Sandiford <richard.sandiford@arm.com>
+
* hash-map-traits.h (simple_hashmap_traits::key_type): New typedef.
(unbounded_int_hashmap_traits::key_type): Likewise.
* hash-map.h (hash_map): Get the key type from the traits.
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index fa1f7da..d9abff2 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -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)
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 29dfc68..c7e575a 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -54,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#include "builtins.h"
#include "rtl-iter.h"
+#include "target-def.h"
+
/* Specify which cpu to schedule for. */
enum processor_type alpha_tune;
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 2f711be..7f613f4 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -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"
@@ -86,6 +85,8 @@
#include "sched-int.h"
#include "tree.h"
+#include "target-def.h"
+
/* Forward definitions of types. */
typedef struct minipool_node Mnode;
typedef struct minipool_fixup Mfix;
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index f291cf9..7712b78 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -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))
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index dade478..653a670 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -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
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index 7088e45..20d0fe3 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -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
{
diff --git a/gcc/config/cr16/cr16.c b/gcc/config/cr16/cr16.c
index 00250f6..7365332 100644
--- a/gcc/config/cr16/cr16.c
+++ b/gcc/config/cr16/cr16.c
@@ -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. */
diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index ecddc8e..a3bf00b 100644
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -52,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#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) \
diff --git a/gcc/config/fr30/fr30.c b/gcc/config/fr30/fr30.c
index 3bb53f0..c0da2ba 100644
--- a/gcc/config/fr30/fr30.c
+++ b/gcc/config/fr30/fr30.c
@@ -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 */
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index 46569ad..3e66286 100644
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.c
@@ -63,7 +63,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#include "ifcvt.h"
#include "rtl-iter.h"
+#include "target-def.h"
+
#ifndef FRV_INLINE
#define FRV_INLINE inline
#endif
diff --git a/gcc/config/ft32/ft32.c b/gcc/config/ft32/ft32.c
index 1630c9c..f9ca2b5 100644
--- a/gcc/config/ft32/ft32.c
+++ b/gcc/config/ft32/ft32.c
@@ -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"
@@ -371,6 +370,8 @@ ft32_init_machine_status (void)
return ggc_cleared_alloc < machine_function > ();
}
+#include "target-def.h"
+
/* The TARGET_OPTION_OVERRIDE worker.
All this curently does is set init_machine_status. */
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index 4c7828a..343f955 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -53,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#include "df.h"
#include "builtins.h"
+#include "target-def.h"
+
/* Classifies a h8300_src_operand or h8300_dst_operand.
H8OP_IMMEDIATE
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 5c90440..001de05 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -62,7 +62,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#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);
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 508532e..e956144 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -64,7 +64,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#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;
diff --git a/gcc/config/iq2000/iq2000.c b/gcc/config/iq2000/iq2000.c
index a16add7..df29089 100644
--- a/gcc/config/iq2000/iq2000.c
+++ b/gcc/config/iq2000/iq2000.c
@@ -52,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#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. */
diff --git a/gcc/config/lm32/lm32.c b/gcc/config/lm32/lm32.c
index ba4782c..0c4fc9a 100644
--- a/gcc/config/lm32/lm32.c
+++ b/gcc/config/lm32/lm32.c
@@ -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. */
diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c
index 7396be5..b9e041e 100644
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.c
@@ -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. */
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index cc40b45..27c742e 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -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];
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index 3d81449..e1558ef 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -48,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#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,
diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c
index 9370902..2b284e2 100644
--- a/gcc/config/mcore/mcore.c
+++ b/gcc/config/mcore/mcore.c
@@ -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;
diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c
index bd372d8..dd92dad 100644
--- a/gcc/config/mep/mep.c
+++ b/gcc/config/mep/mep.c
@@ -55,7 +55,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#include "builtins.h"
#include "rtl-iter.h"
+#include "target-def.h"
+
/* Structure of this file:
+ Command Line Option Support
diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
index 5ded8bc..2c0919d 100644
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@@ -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.
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 367ab74..b3d16c6 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -57,7 +57,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#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 \
diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
index 28b4a3e..163c2e9 100644
--- a/gcc/config/mmix/mmix.c
+++ b/gcc/config/mmix/mmix.c
@@ -56,11 +56,12 @@ along with GCC; see the file COPYING3. If not see
#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
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index 1e6c28f..44d2da4 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -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
diff --git a/gcc/config/moxie/moxie.c b/gcc/config/moxie/moxie.c
index 4b8e2c3..14ab63a 100644
--- a/gcc/config/moxie/moxie.c
+++ b/gcc/config/moxie/moxie.c
@@ -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 \
{ \
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index b76fe93..2a42c38 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -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);
diff --git a/gcc/config/nds32/nds32.c b/gcc/config/nds32/nds32.c
index 8623983..c019872 100644
--- a/gcc/config/nds32/nds32.c
+++ b/gcc/config/nds32/nds32.c
@@ -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:
diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
index 608a4c3..567c921 100644
--- a/gcc/config/nios2/nios2.c
+++ b/gcc/config/nios2/nios2.c
@@ -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);
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index af08abe..c69ddfc 100644
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -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;
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 2768486..25b1d36 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -56,7 +56,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#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
diff --git a/gcc/config/pdp11/pdp11.c b/gcc/config/pdp11/pdp11.c
index 60d0635..4788b50 100644
--- a/gcc/config/pdp11/pdp11.c
+++ b/gcc/config/pdp11/pdp11.c
@@ -47,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#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;
diff --git a/gcc/config/rl78/rl78.c b/gcc/config/rl78/rl78.c
index 33f4e64..8cf4974 100644
--- a/gcc/config/rl78/rl78.c
+++ b/gcc/config/rl78/rl78.c
@@ -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);
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 38442ec..73fb731 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -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
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index cf9a3c1..5cadd3a 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -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;
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 6cb323e..2f2c436 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -63,7 +63,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-ref.h"
#include "cgraph.h"
+#include "target-def.h"
+
/* Define the specific costs for a given cpu. */
struct processor_costs
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 2c247b1..5c0c6a1 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -56,7 +56,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#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. */
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 995a769..2163201c 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -55,7 +55,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#include "builtins.h"
#include "rtl-iter.h"
+#include "target-def.h"
+
/* Processor costs */
struct processor_costs {
diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c
index 8f02ef8..d89c6cc 100644
--- a/gcc/config/spu/spu.c
+++ b/gcc/config/spu/spu.c
@@ -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
diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c
index d6247a0..761bc4e 100644
--- a/gcc/config/stormy16/stormy16.c
+++ b/gcc/config/stormy16/stormy16.c
@@ -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);
diff --git a/gcc/config/tilegx/tilegx.c b/gcc/config/tilegx/tilegx.c
index b778919..86ad324 100644
--- a/gcc/config/tilegx/tilegx.c
+++ b/gcc/config/tilegx/tilegx.c
@@ -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;
diff --git a/gcc/config/tilepro/tilepro.c b/gcc/config/tilepro/tilepro.c
index e1b5acd..81c9395 100644
--- a/gcc/config/tilepro/tilepro.c
+++ b/gcc/config/tilepro/tilepro.c
@@ -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;
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 490c19c..851986f 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -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
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index 811d058..8880d64 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -61,9 +61,10 @@ along with GCC; see the file COPYING3. If not see
#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);
diff --git a/gcc/config/visium/visium.c b/gcc/config/visium/visium.c
index 341666c..fcf4359 100644
--- a/gcc/config/visium/visium.c
+++ b/gcc/config/visium/visium.c
@@ -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
{
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index 5396bd5..35fc423 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -63,7 +63,6 @@ along with GCC; see the file COPYING3. If not see
#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 @@ along with GCC; see the file COPYING3. If not see
#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