From c829d0163dc338b0c12d27c6e7aedb6da5f7f4c5 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <burnus@net-b.de>
Date: Tue, 6 Jul 2010 21:57:29 +0200
Subject: [PATCH] trans-decl.c: Include diagnostic-core.h besides toplev.h.
2010-07-06 Tobias Burnus <burnus@net-b.de>
* trans-decl.c: Include diagnostic-core.h besides toplev.h.
* trans-intrinsic.c: Ditto.
* trans-types.c: Ditto.
* convert.c: Include diagnostic-core.h instead of toplev.h.
* options.c: Ditto.
* trans-array.c: Ditto.
* trans-const.c: Ditto.
* trans-expr.c: Ditto.
* trans-io.c: Ditto.
* trans-openmp.c: Ditto.
* trans.c: Ditto.
From-SVN: r161885
---
gcc/fortran/ChangeLog | 14 ++++++++++++++
gcc/fortran/convert.c | 2 +-
gcc/fortran/options.c | 2 +-
gcc/fortran/trans-array.c | 2 +-
gcc/fortran/trans-const.c | 2 +-
gcc/fortran/trans-decl.c | 3 ++-
gcc/fortran/trans-expr.c | 2 +-
gcc/fortran/trans-intrinsic.c | 3 ++-
gcc/fortran/trans-io.c | 2 +-
gcc/fortran/trans-openmp.c | 2 +-
gcc/fortran/trans-types.c | 3 ++-
gcc/fortran/trans.c | 2 +-
12 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0d43b6c63e6c..7914454aa094 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-06 Tobias Burnus <burnus@net-b.de>
+
+ * trans-decl.c: Include diagnostic-core.h besides toplev.h.
+ * trans-intrinsic.c: Ditto.
+ * trans-types.c: Ditto.
+ * convert.c: Include diagnostic-core.h instead of toplev.h.
+ * options.c: Ditto.
+ * trans-array.c: Ditto.
+ * trans-const.c: Ditto.
+ * trans-expr.c: Ditto.
+ * trans-io.c: Ditto.
+ * trans-openmp.c: Ditto.
+ * trans.c: Ditto.
+
2010-07-06 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/PR44693
diff --git a/gcc/fortran/convert.c b/gcc/fortran/convert.c
index f69ea2386ef2..50e3a6a10f1d 100644
--- a/gcc/fortran/convert.c
+++ b/gcc/fortran/convert.c
@@ -40,7 +40,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "flags.h"
#include "convert.h"
-#include "toplev.h" /* For error. */
+#include "diagnostic-core.h" /* For error. */
#include "gfortran.h"
#include "trans.h"
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index af537a1e70eb..d5c6c3caf90c 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -33,7 +33,7 @@ along with GCC; see the file COPYING3. If not see
#include "gfortran.h"
#include "target.h"
#include "cpp.h"
-#include "toplev.h" /* For sorry. */
+#include "diagnostic-core.h" /* For sorry. */
#include "tm.h"
gfc_option_t gfc_option;
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 7eb8e755785a..bc268357c9b3 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -80,7 +80,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
-#include "toplev.h" /* For internal_error/fatal_error. */
+#include "diagnostic-core.h" /* For internal_error/fatal_error. */
#include "flags.h"
#include "gfortran.h"
#include "constructor.h"
diff --git a/gcc/fortran/trans-const.c b/gcc/fortran/trans-const.c
index 6d4f222ede6d..8cd4fda6d8df 100644
--- a/gcc/fortran/trans-const.c
+++ b/gcc/fortran/trans-const.c
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "realmpfr.h"
-#include "toplev.h" /* For fatal_error. */
+#include "diagnostic-core.h" /* For fatal_error. */
#include "double-int.h"
#include "gfortran.h"
#include "trans.h"
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 1c7226c41e60..1331148dddbb 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -29,7 +29,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dump.h"
#include "gimple.h" /* For create_tmp_var_raw. */
#include "ggc.h"
-#include "toplev.h" /* For announce_function/internal_error. */
+#include "diagnostic-core.h" /* For internal_error. */
+#include "toplev.h" /* For announce_function. */
#include "output.h" /* For decl_default_tls_model. */
#include "target.h"
#include "function.h"
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 1a7a4a1e4e2e..ea8b89202796 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
-#include "toplev.h" /* For fatal_error. */
+#include "diagnostic-core.h" /* For fatal_error. */
#include "langhooks.h"
#include "flags.h"
#include "gfortran.h"
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index 7f583dabe446..0b737b0e42ac 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -28,7 +28,8 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h" /* For UNITS_PER_WORD. */
#include "tree.h"
#include "ggc.h"
-#include "toplev.h" /* For rest_of_decl_compilation/internal_error. */
+#include "diagnostic-core.h" /* For internal_error. */
+#include "toplev.h" /* For rest_of_decl_compilation. */
#include "flags.h"
#include "gfortran.h"
#include "arith.h"
diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c
index 9926d2fb8a1d..2624bb294cec 100644
--- a/gcc/fortran/trans-io.c
+++ b/gcc/fortran/trans-io.c
@@ -25,7 +25,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "ggc.h"
-#include "toplev.h" /* For internal_error. */
+#include "diagnostic-core.h" /* For internal_error. */
#include "gfortran.h"
#include "trans.h"
#include "trans-stmt.h"
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index 7a7d33088d7d..4a7f70e7b6e5 100644
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -25,7 +25,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "gimple.h" /* For create_tmp_var_raw. */
-#include "toplev.h" /* For internal_error. */
+#include "diagnostic-core.h" /* For internal_error. */
#include "gfortran.h"
#include "trans.h"
#include "trans-stmt.h"
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index 6f71da8104bf..cfc6ab6ec855 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -30,7 +30,8 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h" /* For iso-c-bindings.def. */
#include "target.h"
#include "ggc.h"
-#include "toplev.h" /* For rest_of_decl_compilation/fatal_error. */
+#include "diagnostic-core.h" /* For fatal_error. */
+#include "toplev.h" /* For rest_of_decl_compilation. */
#include "gfortran.h"
#include "trans.h"
#include "trans-types.h"
diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c
index 43b69d5a2b08..f97e7391b22a 100644
--- a/gcc/fortran/trans.c
+++ b/gcc/fortran/trans.c
@@ -25,7 +25,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "gimple.h" /* For create_tmp_var_raw. */
#include "tree-iterator.h"
-#include "toplev.h" /* For internal_error. */
+#include "diagnostic-core.h" /* For internal_error. */
#include "defaults.h"
#include "flags.h"
#include "gfortran.h"
--
GitLab