diff mbox

Move target-def.h includes after main include block

Message ID 87d20jr7z4.fsf@e105548-lin.cambridge.arm.com
State New
Headers show

Commit Message

Richard Sandiford June 25, 2015, 5:52 p.m. UTC 
Jeff Law <law@redhat.com> writes:
> On 06/23/2015 12:29 PM, Richard Sandiford wrote:
>> 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.
> I'd suggest a comment before the include indicating why we really want 
> it at the end.
>
> With that change, this is OK if the latter patches get approved.

Sorry, was in a big commit splurge and forgot to make this update.
Here's what I applied on top.  It includes a fix for a misapplied
ft32.c hunk.

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/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: Add comment above
	target-def.h include.
	* config/ft32/ft32.c: Likewise.  Fix misapplied hunk.
diff mbox

Patch

Index: gcc/config/aarch64/aarch64.c
===================================================================
--- gcc/config/aarch64/aarch64.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/aarch64/aarch64.c	2015-06-25 18:45:47.161211488 +0100
@@ -82,6 +82,7 @@ 
 #include "sched-int.h"
 #include "cortex-a57-fma-steering.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Defined for convenience.  */
Index: gcc/config/alpha/alpha.c
===================================================================
--- gcc/config/alpha/alpha.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/alpha/alpha.c	2015-06-25 18:45:47.161211488 +0100
@@ -89,6 +89,7 @@  the Free Software Foundation; either ver
 #include "builtins.h"
 #include "rtl-iter.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Specify which cpu to schedule for.  */
Index: gcc/config/arm/arm.c
===================================================================
--- gcc/config/arm/arm.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/arm/arm.c	2015-06-25 18:45:47.169211392 +0100
@@ -85,6 +85,7 @@ 
 #include "sched-int.h"
 #include "tree.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Forward definitions of types.  */
Index: gcc/config/avr/avr.c
===================================================================
--- gcc/config/avr/avr.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/avr/avr.c	2015-06-25 18:45:47.169211392 +0100
@@ -71,6 +71,7 @@ 
 #include "context.h"
 #include "tree-pass.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Maximal allowed offset for an address in the LD command */
Index: gcc/config/bfin/bfin.c
===================================================================
--- gcc/config/bfin/bfin.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/bfin/bfin.c	2015-06-25 18:45:47.169211392 +0100
@@ -76,6 +76,7 @@ 
 #include "dumpfile.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* A C structure for machine-specific, per-function data.
Index: gcc/config/c6x/c6x.c
===================================================================
--- gcc/config/c6x/c6x.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/c6x/c6x.c	2015-06-25 18:45:47.173211343 +0100
@@ -79,6 +79,7 @@ 
 #include "gimple-expr.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Table of supported architecture variants.  */
Index: gcc/config/cr16/cr16.c
===================================================================
--- gcc/config/cr16/cr16.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/cr16/cr16.c	2015-06-25 18:45:47.173211343 +0100
@@ -63,6 +63,7 @@ 
 #include "df.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Definitions.  */
Index: gcc/config/cris/cris.c
===================================================================
--- gcc/config/cris/cris.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/cris/cris.c	2015-06-25 18:45:47.173211343 +0100
@@ -70,6 +70,7 @@  the Free Software Foundation; either ver
 #include "cgraph.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Usable when we have an amount to add or subtract, and want the
Index: gcc/config/fr30/fr30.c
===================================================================
--- gcc/config/fr30/fr30.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/fr30/fr30.c	2015-06-25 18:45:47.173211343 +0100
@@ -64,6 +64,7 @@ 
 #include "target.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /*}}}*/
Index: gcc/config/frv/frv.c
===================================================================
--- gcc/config/frv/frv.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/frv/frv.c	2015-06-25 18:45:47.173211343 +0100
@@ -71,6 +71,7 @@  the Free Software Foundation; either ver
 #include "ifcvt.h"
 #include "rtl-iter.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 #ifndef FRV_INLINE
Index: gcc/config/h8300/h8300.c
===================================================================
--- gcc/config/h8300/h8300.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/h8300/h8300.c	2015-06-25 18:45:47.173211343 +0100
@@ -65,6 +65,7 @@  the Free Software Foundation; either ver
 #include "df.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Classifies a h8300_src_operand or h8300_dst_operand.
Index: gcc/config/i386/i386.c
===================================================================
--- gcc/config/i386/i386.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/i386/i386.c	2015-06-25 18:45:47.181211245 +0100
@@ -100,6 +100,7 @@  the Free Software Foundation; either ver
 #include "tree-chkp.h"
 #include "rtl-chkp.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 static rtx legitimize_dllimport_symbol (rtx, bool);
Index: gcc/config/ia64/ia64.c
===================================================================
--- gcc/config/ia64/ia64.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/ia64/ia64.c	2015-06-25 18:45:47.181211245 +0100
@@ -86,6 +86,7 @@  the Free Software Foundation; either ver
 #include "dumpfile.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* This is used for communication between ASM_OUTPUT_LABEL and
Index: gcc/config/iq2000/iq2000.c
===================================================================
--- gcc/config/iq2000/iq2000.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/iq2000/iq2000.c	2015-06-25 18:45:47.185211200 +0100
@@ -65,6 +65,7 @@  the Free Software Foundation; either ver
 #include "df.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Enumeration for all of the relational tests, so that we can build
Index: gcc/config/lm32/lm32.c
===================================================================
--- gcc/config/lm32/lm32.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/lm32/lm32.c	2015-06-25 18:45:47.185211200 +0100
@@ -67,6 +67,7 @@ 
 #include "df.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 struct lm32_frame_info
Index: gcc/config/m32c/m32c.c
===================================================================
--- gcc/config/m32c/m32c.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/m32c/m32c.c	2015-06-25 18:45:47.185211200 +0100
@@ -74,6 +74,7 @@ 
 #include "tm-constrs.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Prototypes */
Index: gcc/config/m32r/m32r.c
===================================================================
--- gcc/config/m32r/m32r.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/m32r/m32r.c	2015-06-25 18:45:47.185211200 +0100
@@ -62,6 +62,7 @@ 
 #include "opts.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Array of valid operand punctuation characters.  */
Index: gcc/config/m68k/m68k.c
===================================================================
--- gcc/config/m68k/m68k.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/m68k/m68k.c	2015-06-25 18:45:47.185211200 +0100
@@ -67,6 +67,7 @@  the Free Software Foundation; either ver
 #include "builtins.h"
 #include "rtl-iter.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 enum reg_class regno_reg_class[] =
Index: gcc/config/mcore/mcore.c
===================================================================
--- gcc/config/mcore/mcore.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/mcore/mcore.c	2015-06-25 18:45:47.185211200 +0100
@@ -63,6 +63,7 @@ 
 #include "df.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* For dumping information about frame sizes.  */
Index: gcc/config/mep/mep.c
===================================================================
--- gcc/config/mep/mep.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/mep/mep.c	2015-06-25 18:45:47.185211200 +0100
@@ -78,6 +78,7 @@  Software Foundation; either version 3, o
 #include "builtins.h"
 #include "rtl-iter.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Structure of this file:
Index: gcc/config/microblaze/microblaze.c
===================================================================
--- gcc/config/microblaze/microblaze.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/microblaze/microblaze.c	2015-06-25 18:45:47.189211156 +0100
@@ -69,6 +69,7 @@ 
 #include "builtins.h"
 #include "rtl-iter.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 #define MICROBLAZE_VERSION_COMPARE(VA,VB) strcasecmp (VA, VB)
Index: gcc/config/mips/mips.c
===================================================================
--- gcc/config/mips/mips.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/mips/mips.c	2015-06-25 18:45:47.189211156 +0100
@@ -88,6 +88,7 @@  the Free Software Foundation; either ver
 #include "builtins.h"
 #include "rtl-iter.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* True if X is an UNSPEC wrapper around a SYMBOL_REF or LABEL_REF.  */
Index: gcc/config/mmix/mmix.c
===================================================================
--- gcc/config/mmix/mmix.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/mmix/mmix.c	2015-06-25 18:45:47.189211156 +0100
@@ -60,6 +60,7 @@  the Free Software Foundation; either ver
 #include "tm-constrs.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* First some local helper definitions.  */
Index: gcc/config/mn10300/mn10300.c
===================================================================
--- gcc/config/mn10300/mn10300.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/mn10300/mn10300.c	2015-06-25 18:45:47.189211156 +0100
@@ -67,6 +67,7 @@ 
 #include "dumpfile.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* This is used in the am33_2.0-linux-gnu port, in which global symbol
Index: gcc/config/moxie/moxie.c
===================================================================
--- gcc/config/moxie/moxie.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/moxie/moxie.c	2015-06-25 18:45:47.189211156 +0100
@@ -66,6 +66,7 @@ 
 #include "df.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 #define LOSE_AND_RETURN(msgid, x)		\
Index: gcc/config/msp430/msp430.c
===================================================================
--- gcc/config/msp430/msp430.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/msp430/msp430.c	2015-06-25 18:45:47.193211111 +0100
@@ -70,6 +70,7 @@ 
 #include "opts.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 
Index: gcc/config/nds32/nds32.c
===================================================================
--- gcc/config/nds32/nds32.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/nds32/nds32.c	2015-06-25 18:45:47.193211111 +0100
@@ -67,6 +67,7 @@ 
 #include "langhooks.h"		/* For add_builtin_function().  */
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* ------------------------------------------------------------------------ */
Index: gcc/config/nios2/nios2.c
===================================================================
--- gcc/config/nios2/nios2.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/nios2/nios2.c	2015-06-25 18:45:47.193211111 +0100
@@ -68,6 +68,7 @@ 
 #include "stor-layout.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Forward function declarations.  */
Index: gcc/config/nvptx/nvptx.c
===================================================================
--- gcc/config/nvptx/nvptx.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/nvptx/nvptx.c	2015-06-25 18:45:47.193211111 +0100
@@ -61,6 +61,7 @@ 
 #include "df.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Record the function decls we've written, and the libfuncs and function
Index: gcc/config/pa/pa.c
===================================================================
--- gcc/config/pa/pa.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/pa/pa.c	2015-06-25 18:45:47.193211111 +0100
@@ -69,6 +69,7 @@  the Free Software Foundation; either ver
 #include "opts.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Return nonzero if there is a bypass for the output of 
Index: gcc/config/pdp11/pdp11.c
===================================================================
--- gcc/config/pdp11/pdp11.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/pdp11/pdp11.c	2015-06-25 18:45:47.193211111 +0100
@@ -61,6 +61,7 @@  the Free Software Foundation; either ver
 #include "dbxout.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* this is the current value returned by the macro FIRST_PARM_OFFSET 
Index: gcc/config/rl78/rl78.c
===================================================================
--- gcc/config/rl78/rl78.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/rl78/rl78.c	2015-06-25 18:45:47.193211111 +0100
@@ -74,6 +74,7 @@ 
 #include "builtins.h"
 #include "stringpool.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 static inline bool is_interrupt_func (const_tree decl);
Index: gcc/config/rs6000/rs6000.c
===================================================================
--- gcc/config/rs6000/rs6000.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/rs6000/rs6000.c	2015-06-25 18:45:47.197211064 +0100
@@ -100,6 +100,7 @@ 
 #include "gstab.h"  /* for N_SLINE */
 #endif
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 #ifndef TARGET_NO_PROTOTYPE
Index: gcc/config/rx/rx.c
===================================================================
--- gcc/config/rx/rx.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/rx/rx.c	2015-06-25 18:45:47.201211018 +0100
@@ -74,6 +74,7 @@ 
 #include "cgraph.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 static unsigned int rx_gp_base_regnum_val = INVALID_REGNUM;
Index: gcc/config/s390/s390.c
===================================================================
--- gcc/config/s390/s390.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/s390/s390.c	2015-06-25 18:45:47.201211018 +0100
@@ -87,6 +87,7 @@  Software Foundation; either version 3, o
 #include "ipa-ref.h"
 #include "cgraph.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Define the specific costs for a given cpu.  */
Index: gcc/config/sh/sh.c
===================================================================
--- gcc/config/sh/sh.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/sh/sh.c	2015-06-25 18:45:47.201211018 +0100
@@ -87,6 +87,7 @@  the Free Software Foundation; either ver
 #include "builtins.h"
 #include "rtl-iter.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 int code_for_indirect_jump_scratch = CODE_FOR_indirect_jump_scratch;
Index: gcc/config/sparc/sparc.c
===================================================================
--- gcc/config/sparc/sparc.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/sparc/sparc.c	2015-06-25 18:45:47.205210971 +0100
@@ -82,6 +82,7 @@  the Free Software Foundation; either ver
 #include "builtins.h"
 #include "rtl-iter.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Processor costs */
Index: gcc/config/spu/spu.c
===================================================================
--- gcc/config/spu/spu.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/spu/spu.c	2015-06-25 18:45:47.205210971 +0100
@@ -79,6 +79,7 @@ 
 #include "builtins.h"
 #include "rtl-iter.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Builtin types, data and prototypes. */
Index: gcc/config/stormy16/stormy16.c
===================================================================
--- gcc/config/stormy16/stormy16.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/stormy16/stormy16.c	2015-06-25 18:45:47.205210971 +0100
@@ -75,6 +75,7 @@ 
 #include "reload.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 static rtx emit_addhi3_postreload (rtx, rtx, rtx);
Index: gcc/config/tilegx/tilegx.c
===================================================================
--- gcc/config/tilegx/tilegx.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/tilegx/tilegx.c	2015-06-25 18:45:47.205210971 +0100
@@ -76,6 +76,7 @@ 
 #include "diagnostic.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* SYMBOL_REF for GOT */
Index: gcc/config/tilepro/tilepro.c
===================================================================
--- gcc/config/tilepro/tilepro.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/tilepro/tilepro.c	2015-06-25 18:45:47.205210971 +0100
@@ -77,6 +77,7 @@ 
 #include "diagnostic.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* SYMBOL_REF for GOT */
Index: gcc/config/v850/v850.c
===================================================================
--- gcc/config/v850/v850.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/v850/v850.c	2015-06-25 18:45:47.209210925 +0100
@@ -61,6 +61,7 @@ 
 #include "opts.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 #ifndef streq
Index: gcc/config/vax/vax.c
===================================================================
--- gcc/config/vax/vax.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/vax/vax.c	2015-06-25 18:45:47.209210925 +0100
@@ -63,6 +63,7 @@  the Free Software Foundation; either ver
 #include "target.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 static void vax_option_override (void);
Index: gcc/config/visium/visium.c
===================================================================
--- gcc/config/visium/visium.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/visium/visium.c	2015-06-25 18:45:47.209210925 +0100
@@ -67,6 +67,7 @@ 
 #include "context.h"
 #include "builtins.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Machine specific function data. */
Index: gcc/config/xtensa/xtensa.c
===================================================================
--- gcc/config/xtensa/xtensa.c	2015-06-25 18:45:47.213210880 +0100
+++ gcc/config/xtensa/xtensa.c	2015-06-25 18:45:47.209210925 +0100
@@ -77,6 +77,7 @@  Software Foundation; either version 3, o
 #include "hw-doloop.h"
 #include "rtl-iter.h"
 
+/* This file should be included last.  */
 #include "target-def.h"
 
 /* Enumeration for all of the relational tests, so that we can build
Index: gcc/config/ft32/ft32.c
===================================================================
--- gcc/config/ft32/ft32.c	2015-06-25 18:47:32.695998402 +0100
+++ gcc/config/ft32/ft32.c	2015-06-25 18:47:40.983903520 +0100
@@ -60,6 +60,9 @@ 
 #include "builtins.h"
 #include "emit-rtl.h"
 
+/* This file should be included last.  */
+#include "target-def.h"
+
 #include <stdint.h>
 
 #define LOSE_AND_RETURN(msgid, x)               \
@@ -370,8 +373,6 @@  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.  */