rtl.h (decl_default_tls_model): Move prototype from here...

gcc/ChangeLog:
	* rtl.h (decl_default_tls_model): Move prototype from here...
	* output.h: ...to here.
	* c-decl.c: Do not include rtl.h.
	* c-pragma.c: Likewise.
	* c-parser.c: Likewise.
	* c-gimplify.c: Likewise.  And also not hard-reg-set.
	* c-common.c: Do not include rtl.h.  Include tm_p.h and add a
	FIXME note for it.  Add a FIXME note for expr.h.
	* config/i386/i386-protos.h (ix86_enum_va_list, ix86_fn_abi_va_list,
	ix86_canonical_va_list_type): Make visible even if RTX_CODE is not
	defined.

cp/ChangeLog:
	* decl.c: Do not include rtl.h
	* semantics.c: Likewise.

ada/ChangeLog:
	* gcc-interface/utils.c: Do not include rtl.h.

fortran/ChangeLog:
	* trans-common.c: Do not include rtl.h, include output.h instead.
	* trans-decl.c: Likewise.

From-SVN: r159856

17 files changed, 49 insertions, 22 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index abcdeae..863eb5ad 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2010-05-26  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* rtl.h (decl_default_tls_model): Move prototype from here...
+	* output.h: ...to here.
+	* c-decl.c: Do not include rtl.h.
+	* c-pragma.c: Likewise.
+	* c-parser.c: Likewise.
+	* c-gimplify.c: Likewise.  And also not hard-reg-set.
+	* c-common.c: Do not include rtl.h.  Include tm_p.h and add a
+	FIXME note for it.  Add a FIXME note for expr.h.
+	* config/i386/i386-protos.h (ix86_enum_va_list, ix86_fn_abi_va_list,
+	ix86_canonical_va_list_type): Make visible even if RTX_CODE is not
+	defined.
+
 2010-05-26  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/44199
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index ae8e4e6..c209d55 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-26  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* gcc-interface/utils.c: Do not include rtl.h.
+
 2010-05-25  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* gcc-interface/utils.c: Do not include function.h, pointer-set.h,
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index 647bb67..75eb29b 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -40,7 +40,6 @@
 #include "tree-dump.h"
 #include "tree-inline.h"
 #include "tree-iterator.h"
-#include "rtl.h"		/* For decl_default_tls_model.  */
 
 #include "ada.h"
 #include "types.h"
diff --git a/gcc/c-common.c b/gcc/c-common.c
index 6a5315b..04b2909 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -28,9 +28,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "output.h"
 #include "c-pragma.h"
-#include "rtl.h"
 #include "ggc.h"
-#include "expr.h" /* For vector_mode_valid_p */
 #include "c-common.h"
 #include "tm_p.h"
 #include "obstack.h"
@@ -49,6 +47,14 @@ along with GCC; see the file COPYING3.  If not see
 #include "target-def.h"
 #include "libfuncs.h"
 
+/* FIXME: Still need to include rtl.h here (via expr.h) in a front-end file.
+   Pretend this is a back-end file.  */
+#define IN_GCC_BACKEND
+#include "expr.h" /* For vector_mode_valid_p */
+
+/* FIXME: Needed for TARGET_ENUM_VA_LIST, which should be a target hook.  */
+#include "tm_p.h"
+
 cpp_reader *parse_in;		/* Declared in c-pragma.h.  */
 
 /* The following symbols are subsumed in the c_global_trees array, and
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 68b0f8c..c4c4a57 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "intl.h"
 #include "tree.h"
 #include "tree-inline.h"
-#include "rtl.h"
 #include "flags.h"
 #include "function.h"
 #include "output.h"
diff --git a/gcc/c-gimplify.c b/gcc/c-gimplify.c
index 5ee9634..58729f1 100644
--- a/gcc/c-gimplify.c
+++ b/gcc/c-gimplify.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "c-tree.h"
 #include "c-common.h"
 #include "gimple.h"
-#include "hard-reg-set.h"
 #include "basic-block.h"
 #include "tree-flow.h"
 #include "tree-inline.h"
@@ -40,7 +39,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "langhooks-def.h"
 #include "flags.h"
-#include "rtl.h"
 #include "toplev.h"
 #include "tree-dump.h"
 #include "c-pretty-print.h"
diff --git a/gcc/c-parser.c b/gcc/c-parser.c
index dc3f26e..bd25f87 100644
--- a/gcc/c-parser.c
+++ b/gcc/c-parser.c
@@ -42,7 +42,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"			/* For rtl.h: needs enum reg_class.  */
 #include "tree.h"
-#include "rtl.h"		/* For decl_default_tls_model.  */
 #include "langhooks.h"
 #include "input.h"
 #include "cpplib.h"
diff --git a/gcc/c-pragma.c b/gcc/c-pragma.c
index 1fc006c..526d5fd 100644
--- a/gcc/c-pragma.c
+++ b/gcc/c-pragma.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "rtl.h"
 #include "tree.h"
 #include "function.h"		/* For cfun.  FIXME: Does the parser know
 				   when it is inside a function, so that
diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h
index 48695c0..9af67b3 100644
--- a/gcc/config/i386/i386-protos.h
+++ b/gcc/config/i386/i386-protos.h
@@ -144,9 +144,6 @@ extern void ix86_free_from_memory (enum machine_mode);
 extern enum calling_abi ix86_cfun_abi (void);
 extern enum calling_abi ix86_function_type_abi (const_tree);
 extern void ix86_call_abi_override (const_tree);
-extern tree ix86_fn_abi_va_list (tree);
-extern tree ix86_canonical_va_list_type (tree);
-extern int ix86_enum_va_list (int, const char **, tree *);
 extern int ix86_reg_parm_stack_space (const_tree);
 
 extern void ix86_split_fp_branch (enum rtx_code code, rtx, rtx,
@@ -190,11 +187,15 @@ extern void init_cumulative_args (CUMULATIVE_ARGS *, tree, rtx, tree);
 extern rtx function_arg (CUMULATIVE_ARGS *, enum machine_mode, tree, int);
 extern void function_arg_advance (CUMULATIVE_ARGS *, enum machine_mode,
 				  tree, int);
-#endif
+#endif	/* TREE_CODE  */
 
-#endif
+#endif	/* RTX_CODE  */
 
 #ifdef TREE_CODE
+extern int ix86_enum_va_list (int, const char **, tree *);
+extern tree ix86_fn_abi_va_list (tree);
+extern tree ix86_canonical_va_list_type (tree);
+
 extern int ix86_return_pops_args (tree, tree, int);
 
 extern int ix86_data_alignment (tree, int);
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ea49282..954e663 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-26  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* decl.c: Do not include rtl.h
+	* semantics.c: Likewise.
+
 2010-05-25  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* cp-tree.h: Do not include splay-tree.h.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 41bb5bc..0a444d2 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -56,8 +56,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "splay-tree.h"
 #include "plugin.h"
 
-#include "rtl.h"          /* For decl_default_tls_model.  */
-
 static tree grokparms (tree parmlist, tree *);
 static const char *redeclaration_error_message (tree, tree);
 
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 72a7295..bf016f1 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -46,8 +46,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple.h"
 #include "bitmap.h"
 
-#include "rtl.h"          /* For decl_default_tls_model.  */
-
 /* There routines provide a modular interface to perform many parsing
    operations.  They may therefore be used during actual parsing, or
    during template instantiation, which may be regarded as a
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 14a2eda..dac3a0e 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-26  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* trans-common.c: Do not include rtl.h, include output.h instead.
+	* trans-decl.c: Likewise.
+
 2010-05-26  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/40011
diff --git a/gcc/fortran/trans-common.c b/gcc/fortran/trans-common.c
index f577710..1162636 100644
--- a/gcc/fortran/trans-common.c
+++ b/gcc/fortran/trans-common.c
@@ -96,10 +96,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
 #include "toplev.h"	/* For exact_log2.  */
-#include "tm.h"		/* For rtl.h.  */
-#include "rtl.h"	/* For decl_default_tls_model.  */
+#include "output.h"	/* For decl_default_tls_model.  */
 #include "gfortran.h"
 #include "trans.h"
 #include "trans-types.h"
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 2eabfcc..a602977 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -24,13 +24,13 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
 #include "tree-dump.h"
 #include "gimple.h"	/* For create_tmp_var_raw.  */
 #include "ggc.h"
 #include "toplev.h"	/* For announce_function/internal_error.  */
-#include "tm.h"		/* For rtl.h.  */
-#include "rtl.h"	/* For decl_default_tls_model.  */
+#include "output.h"	/* For decl_default_tls_model.  */
 #include "target.h"
 #include "function.h"
 #include "flags.h"
diff --git a/gcc/output.h b/gcc/output.h
index 5d771d7..8215ac2 100644
--- a/gcc/output.h
+++ b/gcc/output.h
@@ -164,6 +164,9 @@ extern void weak_finish (void);
 /* Emit any pending emutls declarations and initializations.  */
 extern void emutls_finish (void);
 
+/* Return the default TLS model for a given variable.  */
+extern enum tls_model decl_default_tls_model (const_tree);
+
 /* Decode an `asm' spec for a declaration as a register name.
    Return the register number, or -1 if nothing specified,
    or -2 if the ASMSPEC is not `cc' or `memory' and is not recognized,
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 683ad66..0b6564a 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2373,7 +2373,6 @@ extern rtx emit_library_call_value (rtx, rtx, enum libcall_type,
 
 /* In varasm.c */
 extern void init_varasm_once (void);
-extern enum tls_model decl_default_tls_model (const_tree);
 
 extern rtx make_debug_expr_from_rtl (const_rtx);