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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159856 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index abcdeae510f0a1fe56f507ee1a25a50903f906b6..863eb5ad0cd4d9389a205fd6773ad0770f551a77 100644 (file)
--- 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 ae8e4e60276d4dbd2c0c968f62194b7f23a123f8..c209d55e19c5b67c736fe9d653025dd784ed4afb 100644 (file)
--- 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 647bb67c29fb7a85883574b6176a4bb15a32a15c..75eb29b4632bf25a0455f02a6d0d72e740d6c741 100644 (file)
--- 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 6a5315b7ec91ec28c66e7ebd5afeee8cab65a7ba..04b2909535d67bad8c030a2be637b042d7740f25 100644 (file)
--- 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 68b0f8cd556dd4fa82a554a69b1b172279073236..c4c4a57b94ed8f980bf95c70b258ced4fd3e21cc 100644 (file)
--- 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 5ee9634d5073fff996e7f3f033d1cc6c56ce9853..58729f16ecf3f2bd51e9e9ea686c6e47a429de74 100644 (file)
--- 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 dc3f26e5a2ca67260a625bd0e261ae585985c556..bd25f87d1a46431245f1b344f50d7a5aa7325ea0 100644 (file)
--- 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 1fc006cf89be67d479bb4e226d7748b98aa92101..526d5fdfe924cd56acff9ec4dd456a2a98c23256 100644 (file)
--- 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 48695c080b1578c1e9d13d0a77e75ae0534fa5f5..9af67b301c6230186914ba5817f7918d5bdeb436 100644 (file)
--- 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 ea49282ee5006ecc4d32f20cc6959c9ef1987a03..954e6636a13671c8d116752f9ffaa01592a7aef3 100644 (file)
--- 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 41bb5bc380f730d5335513cfe5d39a0c8efe1cb2..0a444d29118f87775a8cda4e49fd0e6d9f942a5e 100644 (file)
--- 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 72a72957abccc4b1f92254e7dbaf60cac8bff1d6..bf016f1f58633fec375a3806dca66fe6e7f271f5 100644 (file)
--- 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 14a2edaec85d0be53e6f9a9ffd7955938ad5de89..dac3a0e7c1135262e9cdee1fab223f73eab284fc 100644 (file)
--- 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 f577710949af859cdfd44fcb2d63343544fd2e60..1162636fe5af58e756e9c90d244107c3e6d4a210 100644 (file)
--- 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 2eabfccd095f148c41fe8bb3c87ab8694b0555f8..a602977081032750a6bf2c05cf8433608f93ad4c 100644 (file)
--- 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 5d771d7d06f5e9044e858efce8941ec53610e5e7..8215ac25b9813e9f1078848c4073564a31901e5a 100644 (file)
--- 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 683ad66b7ab040b737602f046d4b807f6fb3a4ef..0b6564a9ad7804f675490d98a177400c737ad490 100644 (file)
--- 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);