* dwarf2asm.h: Include multi-target.h; use START_TARGET_SPECIFIC /

        END_TARGET_SPECIFIC.
        * ddg.h, dbxout.h, expr.h, cselib.h, cfglayout.h, gimple.h: Likewise.


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/multi-target-20100613-branch@160904 138bc75d-0d04-0410-961f-82ee72b054a4

8 files changed, 38 insertions, 72 deletions

diff --git a/gcc/ChangeLog.multi-target b/gcc/ChangeLog.multi-target
index 4b6ca1d3037..e433bb471bc 100644
--- a/gcc/ChangeLog.multi-target
+++ b/gcc/ChangeLog.multi-target
@@ -64,6 +64,10 @@
 
 	* multi-target.h: Remove duplicate old text at end.
 
+	* dwarf2asm.h: Include multi-target.h; use START_TARGET_SPECIFIC /
+	END_TARGET_SPECIFIC.
+	* ddg.h, dbxout.h, expr.h, cselib.h, cfglayout.h, gimple.h: Likewise.
+
 2010-06-14  Joern Rennecke  <joern.rennecke@embecosm.com>
 
 	* config/rs6000/rs6000.c (rs6000_ra_ever_killed): Use MACHINE_FUNCTION.
diff --git a/gcc/cfglayout.h b/gcc/cfglayout.h
index cba7faac4d2..900933ca4c6 100644
--- a/gcc/cfglayout.h
+++ b/gcc/cfglayout.h
@@ -21,10 +21,9 @@
 #define GCC_CFGLAYOUT_H
 
 #include "basic-block.h"
+#include "multi-target.h"
 
-#ifdef EXTRA_TARGET
-namespace EXTRA_TARGET {
-#endif
+START_TARGET_SPECIFIC
 
 extern GTY(()) rtx cfg_layout_function_footer;
 extern GTY(()) rtx cfg_layout_function_header;
@@ -38,8 +37,6 @@ extern void copy_bbs (basic_block *, unsigned, basic_block *,
 		      basic_block);
 extern rtx duplicate_insn_chain (rtx, rtx);
 
-#ifdef EXTRA_TARGET
-} /* Close EXTRA_TARGET namespace.  */
-#endif
+END_TARGET_SPECIFIC
 
 #endif /* GCC_CFGLAYOUT_H */
diff --git a/gcc/cselib.h b/gcc/cselib.h
index 2b9ff01eb66..d3b96752bb1 100644
--- a/gcc/cselib.h
+++ b/gcc/cselib.h
@@ -19,6 +19,8 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+#include "multi-target.h"
+
 /* Describe a value.  */
 typedef struct GTY(()) cselib_val_struct {
   /* The hash value.  */
@@ -72,9 +74,7 @@ enum cselib_record_what
   CSELIB_PRESERVE_CONSTANTS = 2
 };
 
-#ifdef EXTRA_TARGET
-namespace EXTRA_TARGET {
-#endif
+START_TARGET_SPECIFIC
 
 extern void (*cselib_discard_hook) (cselib_val *);
 extern void (*cselib_record_sets_hook) (rtx insn, struct cselib_set *sets,
@@ -107,6 +107,4 @@ extern void cselib_preserve_cfa_base_value (cselib_val *);
 
 extern void dump_cselib_table (FILE *);
 
-#ifdef EXTRA_TARGET
-} /* Close EXTRA_TARGET namespace.  */
-#endif
+END_TARGET_SPECIFIC
diff --git a/gcc/dbxout.h b/gcc/dbxout.h
index 830b9848774..b6322a1d41a 100644
--- a/gcc/dbxout.h
+++ b/gcc/dbxout.h
@@ -21,16 +21,14 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_DBXOUT_H
 #define GCC_DBXOUT_H
 
-#ifdef EXTRA_TARGET
-namespace EXTRA_TARGET {
-#endif
+#include "multi-target.h"
+
+START_TARGET_SPECIFIC
 extern int dbxout_symbol (tree, int);
 extern void dbxout_parms (tree);
 extern void dbxout_reg_parms (tree);
 extern int dbxout_syms (tree);
-#ifdef EXTRA_TARGET
-} /* Close EXTRA_TARGET namespace.  */
-#endif
+END_TARGET_SPECIFIC
 
 /* Language description for N_SO stabs.  */
 #define N_SO_AS          1
diff --git a/gcc/ddg.h b/gcc/ddg.h
index 6ea3f1f3d08..804fa12b67f 100644
--- a/gcc/ddg.h
+++ b/gcc/ddg.h
@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3.  If not see
 /* For basic_block.  */
 #include "basic-block.h"
 #include "df.h"
+#include "multi-target.h"
 
 typedef struct ddg_node *ddg_node_ptr;
 typedef struct ddg_edge *ddg_edge_ptr;
@@ -167,9 +168,7 @@ struct ddg_all_sccs
 };
 
 
-#ifdef EXTRA_TARGET
-namespace EXTRA_TARGET {
-#endif
+START_TARGET_SPECIFIC
 
 ddg_ptr create_ddg (basic_block, int closing_branch_deps);
 void free_ddg (ddg_ptr);
@@ -190,8 +189,6 @@ void free_ddg_all_sccs (ddg_all_sccs_ptr);
 int find_nodes_on_paths (sbitmap result, ddg_ptr, sbitmap from, sbitmap to);
 int longest_simple_path (ddg_ptr, int from, int to, sbitmap via);
 
-#ifdef EXTRA_TARGET
-} /* Close EXTRA_TARGET namespace.  */
-#endif
+END_TARGET_SPECIFIC
 
 #endif /* GCC_DDG_H */
diff --git a/gcc/dwarf2asm.h b/gcc/dwarf2asm.h
index d75264668b4..ea181877b87 100644
--- a/gcc/dwarf2asm.h
+++ b/gcc/dwarf2asm.h
@@ -17,9 +17,9 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-#ifdef EXTRA_TARGET
-namespace EXTRA_TARGET {
-#endif
+#include "multi-target.h"
+
+START_TARGET_SPECIFIC
 
 extern void dw2_assemble_integer (int, rtx);
 
@@ -86,6 +86,4 @@ extern void dw2_asm_output_delta_sleb128 (const char *, const char *,
      ATTRIBUTE_NULL_PRINTF_3;
 #endif
 
-#ifdef EXTRA_TARGET
-} /* Close EXTRA_TARGET namespace.  */
-#endif
+END_TARGET_SPECIFIC
diff --git a/gcc/expr.h b/gcc/expr.h
index 3eb143cfb36..8a286fadd74 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -33,6 +33,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree.h"
 /* For GET_MODE_BITSIZE, word_mode */
 #include "machmode.h"
+#include "multi-target.h"
 
 /* This is the 4th arg to `expand_expr'.
    EXPAND_STACK_PARM means we are possibly expanding a call param onto
@@ -161,9 +162,7 @@ enum optab_methods
   OPTAB_MUST_WIDEN
 };
 
-#ifdef EXTRA_TARGET
-namespace EXTRA_TARGET {
-#endif
+START_TARGET_SPECIFIC
 
 /* Generate code for a simple binary or unary operation.  "Simple" in
    this case means "can be unambiguously described by a (mode, code)
@@ -205,15 +204,11 @@ extern void emit_indirect_jump (rtx);
 /* Generate a conditional trap instruction.  */
 extern rtx gen_cond_trap (enum rtx_code, rtx, rtx, rtx);
 
-#ifdef EXTRA_TARGET
-} /* Close EXTRA_TARGET namespace.  */
-#endif
+END_TARGET_SPECIFIC
 
 #include "insn-config.h"
 
-#ifdef EXTRA_TARGET
-namespace EXTRA_TARGET {
-#endif
+START_TARGET_SPECIFIC
 
 #ifdef HAVE_conditional_move
 /* Emit a conditional move operation.  */
@@ -283,9 +278,7 @@ extern rtx convert_to_mode (enum machine_mode, rtx, int);
 /* Convert an rtx to MODE from OLDMODE and return the result.  */
 extern rtx convert_modes (enum machine_mode, enum machine_mode, rtx, int);
 
-#ifdef EXTRA_TARGET
-} /* Close EXTRA_TARGET namespace.  */
-#endif
+END_TARGET_SPECIFIC
 
 /* Emit code to move a block Y to a block X.  */
 
@@ -298,9 +291,7 @@ enum block_op_methods
   BLOCK_OP_TAILCALL
 };
 
-#ifdef EXTRA_TARGET
-namespace EXTRA_TARGET {
-#endif
+START_TARGET_SPECIFIC
 
 extern GTY(()) tree block_clear_fn;
 extern void init_block_move_fn (const char *);
@@ -489,18 +480,14 @@ extern void do_compare_rtx_and_jump (rtx, rtx, enum rtx_code, int,
 extern int try_casesi (tree, tree, tree, tree, rtx, rtx, rtx);
 extern int try_tablejump (tree, tree, tree, tree, rtx, rtx);
 
-#ifdef EXTRA_TARGET
-} /* Close EXTRA_TARGET namespace.  */
-#endif
+END_TARGET_SPECIFIC
 
 /* Functions from alias.c */
 #include "alias.h"
 
 
 /* rtl.h and tree.h were included.  */
-#ifdef EXTRA_TARGET
-namespace EXTRA_TARGET {
-#endif
+START_TARGET_SPECIFIC
 /* Functions from explow.c */
 /* Return an rtx for the size in bytes of the value of an expr.  */
 extern rtx expr_size (tree);
@@ -590,16 +577,12 @@ extern rtx adjust_automodify_address_1 (rtx, enum machine_mode, rtx,
    known to be in OFFSET (possibly 1).  */
 extern rtx offset_address (rtx, rtx, unsigned HOST_WIDE_INT);
 
-#ifdef EXTRA_TARGET
-} /* Close EXTRA_TARGET namespace.  */
-#endif
+END_TARGET_SPECIFIC
 
 /* Definitions from emit-rtl.c */
 #include "emit-rtl.h"
 
-#ifdef EXTRA_TARGET
-namespace EXTRA_TARGET {
-#endif
+START_TARGET_SPECIFIC
 
 /* Return a memory reference like MEMREF, but with its mode widened to
    MODE and adjusted by OFFSET.  */
@@ -669,18 +652,14 @@ extern void anti_adjust_stack (rtx);
 /* Add some bytes to the stack while probing it.  An rtx says how many. */
 extern void anti_adjust_stack_and_probe (rtx, bool);
 
-#ifdef EXTRA_TARGET
-} /* Close EXTRA_TARGET namespace.  */
-#endif
+END_TARGET_SPECIFIC
 
 /* This enum is used for the following two functions.  */
 enum save_level {SAVE_BLOCK, SAVE_FUNCTION, SAVE_NONLOCAL};
 
 enum extraction_pattern { EP_insv, EP_extv, EP_extzv };
 
-#ifdef EXTRA_TARGET
-namespace EXTRA_TARGET {
-#endif
+START_TARGET_SPECIFIC
 
 /* Save the stack pointer at the specified level.  */
 extern void emit_stack_save (enum save_level, rtx *, rtx);
@@ -743,8 +722,6 @@ rtx get_personality_function (tree);
 
 extern int vector_mode_valid_p (enum machine_mode);
 
-#ifdef EXTRA_TARGET
-} /* Close EXTRA_TARGET namespace.  */
-#endif
+END_TARGET_SPECIFIC
 
 #endif /* GCC_EXPR_H */
diff --git a/gcc/gimple.h b/gcc/gimple.h
index 5435abda31d..a1f82abdd06 100644
--- a/gcc/gimple.h
+++ b/gcc/gimple.h
@@ -32,6 +32,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "basic-block.h"
 #include "tree-ssa-operands.h"
 #include "tree-ssa-alias.h"
+#include "multi-target.h"
 
 /* For each block, the PHI nodes that need to be rewritten are stored into
    these vectors.  */
@@ -1060,17 +1061,13 @@ extern void insert_field_into_struct (tree, tree);
 /* In gimplify.c.  */
 extern void gimplify_function_tree (tree);
 
-#ifdef EXTRA_TARGET
-namespace EXTRA_TARGET {
-#endif
+START_TARGET_SPECIFIC
 /* In cfgexpand.c.  */
 extern tree gimple_assign_rhs_to_tree (gimple);
 
 /* In builtins.c  */
 extern bool validate_gimple_arglist (const_gimple, ...);
-#ifdef EXTRA_TARGET
-} /* Close EXTRA_TARGET namespace.  */
-#endif
+END_TARGET_SPECIFIC
 
 /* In tree-ssa.c  */
 extern bool tree_ssa_useless_type_conversion (tree);