2015-07-09 Andrew MacLeod <amacleod@redhat.com>

	* flags.h: Don't include flag-types.h or options.h.
	* opts-common.c: Adjust includes.
	* opts-global.c: Likewise.
	* common/config/epiphany/epiphany-common.c: Likewise.

c

	* c-array-notation.c: Adjust includes for flags.h changes.
	* c-objc-common.c: Likewise.

c-family

	* c-common.h: Adjust includes for flags.h changes.
	* stub-objc.c: Likewise.
	
fortran

	* arith.c: Adjust includes for flags.h changes.
	* array.c: Likewise.
	* check.c: Likewise.
	* decl.c: Likewise.
	* error.c: Likewise.
	* expr.c: Likewise.
	* frontend-passes.c: Likewise.
	* interface.c: Likewise.
	* intrinsic.c: Likewise.
	* io.c: Likewise.
	* match.c: Likewise.
	* openmp.c: Likewise.
	* parse.c: Likewise.
	* primary.c: Likewise.
	* resolve.c: Likewise.
	* scanner.c: Likewise.
	* simplify.c: Likewise.
	* symbol.c: Likewise.
	* target-memory.c: Likewise.

jit
	* dummy-frontend.c: Adjust includes for flags.h changes.
	* jit-common.h: Likewise.
	* jit-playback.c: Likewise.

lto
	* lto-lang.c: Adjust includes for flags.h changes.



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

37 files changed, 68 insertions, 30 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e7f7dace4b4..b20c00351c6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-09  Andrew MacLeod  <amacleod@redhat.com>
+
+	* flags.h: Don't include flag-types.h or options.h.
+	* opts-common.c: Adjust includes.
+	* opts-global.c: Likewise.
+	* common/config/epiphany/epiphany-common.c: Likewise.
+
 2015-07-09  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/66818
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 75e43fd7f09..b9120938c49 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-09  Andrew MacLeod  <amacleod@redhat.com>
+
+	* c-common.h: Adjust includes for flags.h changes.
+	* stub-objc.c: Likewise.
+	
 2015-07-08  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* c-ada-spec.h (cpp_operation): Add IS_CONSTEXPR.
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index 1acce015684..a2a46212e83 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "splay-tree.h"
 #include "cpplib.h"
 #include "alias.h"
-#include "flags.h"
 #include "tree.h"
 #include "fold-const.h"
 
diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c
index dd4c9fead9b..fb6037b6658 100644
--- a/gcc/c-family/stub-objc.c
+++ b/gcc/c-family/stub-objc.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "alias.h"
 #include "tree.h"
-#include "flags.h"
 #include "c-common.h"
 #include "c-objc.h"
 
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 792198b8f0f..a75f2e8a292 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-09  Andrew MacLeod  <amacleod@redhat.com>
+
+	* c-array-notation.c: Adjust includes for flags.h changes.
+	* c-objc-common.c: Likewise.
+
 2015-07-07  Andrew MacLeod  <amacleod@redhat.com>
 
 	* c-array-notation.c: Adjust includes.
diff --git a/gcc/c/c-array-notation.c b/gcc/c/c-array-notation.c
index 26147cec960..3de75692973 100644
--- a/gcc/c/c-array-notation.c
+++ b/gcc/c/c-array-notation.c
@@ -70,7 +70,6 @@
 #include "coretypes.h"
 #include "tree.h"
 #include "alias.h"
-#include "flags.h"
 #include "c-tree.h"
 #include "gimple-expr.h"
 #include "tree-iterator.h"
diff --git a/gcc/c/c-objc-common.c b/gcc/c/c-objc-common.c
index bbb949a8051..47fd7de05ed 100644
--- a/gcc/c/c-objc-common.c
+++ b/gcc/c/c-objc-common.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tree.h"
 #include "alias.h"
-#include "flags.h"
 #include "c-tree.h"
 #include "intl.h"
 #include "c-family/c-pretty-print.h"
diff --git a/gcc/common/config/epiphany/epiphany-common.c b/gcc/common/config/epiphany/epiphany-common.c
index d7e62678473..52504d057cb 100644
--- a/gcc/common/config/epiphany/epiphany-common.c
+++ b/gcc/common/config/epiphany/epiphany-common.c
@@ -23,7 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "common/common-target.h"
 #include "opts.h"
-#include "flags.h"
+#include "options.h"
 
 #define TARGET_OPTION_OPTIMIZATION_TABLE epiphany_option_optimization_table
 
diff --git a/gcc/flags.h b/gcc/flags.h
index 22abddcd469..785b521970a 100644
--- a/gcc/flags.h
+++ b/gcc/flags.h
@@ -20,9 +20,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_FLAGS_H
 #define GCC_FLAGS_H
 
-#include "flag-types.h"
-#include "options.h"
-
 #if !defined(IN_LIBGCC2) && !defined(IN_TARGET_LIBS) && !defined(IN_RTS)
 
 /* Names of debug_info_type, for error messages.  */
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 295229a52cb..1e0d031b96f 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,25 @@
+2015-07-09  Andrew MacLeod  <amacleod@redhat.com>
+
+	* arith.c: Adjust includes for flags.h changes.
+	* array.c: Likewise.
+	* check.c: Likewise.
+	* decl.c: Likewise.
+	* error.c: Likewise.
+	* expr.c: Likewise.
+	* frontend-passes.c: Likewise.
+	* interface.c: Likewise.
+	* intrinsic.c: Likewise.
+	* io.c: Likewise.
+	* match.c: Likewise.
+	* openmp.c: Likewise.
+	* parse.c: Likewise.
+	* primary.c: Likewise.
+	* resolve.c: Likewise.
+	* scanner.c: Likewise.
+	* simplify.c: Likewise.
+	* symbol.c: Likewise.
+	* target-memory.c: Likewise.
+
 2015-07-07  Andrew MacLeod  <amacleod@redhat.com>
 
 	* convert.c: Adjust includes.
diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c
index 6c31b706a96..e4da3b927fc 100644
--- a/gcc/fortran/arith.c
+++ b/gcc/fortran/arith.c
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "target-memory.h"
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 1ab3cd0f34c..276737b4121 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
+#include "options.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "match.h"
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 3286a58df5c..6548a017f44 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -28,7 +28,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "intrinsic.h"
 #include "constructor.h"
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 8ab4d79fb9e..49460613b4a 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -24,7 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "gfortran.h"
 #include "match.h"
 #include "parse.h"
-#include "flags.h"
+#include "options.h"
 #include "constructor.h"
 #include "alias.h"
 #include "tree.h"
diff --git a/gcc/fortran/error.c b/gcc/fortran/error.c
index c7d8581f970..7689bbd8941 100644
--- a/gcc/fortran/error.c
+++ b/gcc/fortran/error.c
@@ -27,7 +27,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 
 #include "diagnostic.h"
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index d7a90c44244..9e5a804f70d 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -21,7 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "match.h"
diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index 3eda42f70a9..bc9f6210f4f 100644
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -23,7 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "gfortran.h"
 #include "arith.h"
-#include "flags.h"
+#include "options.h"
 #include "dependency.h"
 #include "constructor.h"
 #include "opts.h"
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index 59569347789..2ea26304a24 100644
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -66,7 +66,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "match.h"
 #include "arith.h"
diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c
index 5666bfff9a2..a80b16e68b4 100644
--- a/gcc/fortran/intrinsic.c
+++ b/gcc/fortran/intrinsic.c
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "intrinsic.h"
 
diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index e8395b5480d..d50a45a5956 100644
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -21,7 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "match.h"
 #include "parse.h"
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index 14035319dd5..523e9b2a7f5 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
+#include "options.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "match.h"
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 8d1060891d8..3c12d8e67f6 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "match.h"
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index 148cff94fb6..45ad63ff7ee 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include <setjmp.h>
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "match.h"
 #include "parse.h"
diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index acde051cdb3..c8c65816a33 100644
--- a/gcc/fortran/primary.c
+++ b/gcc/fortran/primary.c
@@ -21,7 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "match.h"
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index d16bf13eb05..641a3bdaa9a 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -21,7 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "obstack.h"
 #include "bitmap.h"
diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index e5243457ad0..bfb7d452e90 100644
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -46,7 +46,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "gfortran.h"
 #include "toplev.h"	/* For set_src_pwd.  */
 #include "debug.h"
-#include "flags.h"
+#include "options.h"
 #include "cpp.h"
 #include "scanner.h"
 
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 2f3e247cd08..bc3ec3f8a60 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "intrinsic.h"
diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index b7d5b86791b..52c5234276a 100644
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "parse.h"
 #include "match.h"
diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c
index 9895bc315f1..a58a97747c8 100644
--- a/gcc/fortran/target-memory.c
+++ b/gcc/fortran/target-memory.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
 #include "alias.h"
 #include "tree.h"
 #include "fold-const.h"
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index e9a32f0ae96..cb021a82b49 100644
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-09  Andrew MacLeod  <amacleod@redhat.com>
+
+	* dummy-frontend.c: Adjust includes for flags.h changes.
+	* jit-common.h: Likewise.
+	* jit-playback.c: Likewise.
+
 2015-07-08  David Malcolm  <dmalcolm@redhat.com>
 
 	PR jit/66783
diff --git a/gcc/jit/dummy-frontend.c b/gcc/jit/dummy-frontend.c
index 3d0b3ea7640..1a6b09a35d1 100644
--- a/gcc/jit/dummy-frontend.c
+++ b/gcc/jit/dummy-frontend.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "opts.h"
 #include "alias.h"
-#include "flags.h"
 #include "tree.h"
 #include "stor-layout.h"
 #include "inchash.h"
diff --git a/gcc/jit/jit-common.h b/gcc/jit/jit-common.h
index 28ce2bcb4e9..e6fc132c6c2 100644
--- a/gcc/jit/jit-common.h
+++ b/gcc/jit/jit-common.h
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "libgccjit.h"
 
 #include "vec.h"
-#include "flags.h"
 #include "tree.h"
 #include "inchash.h"
 #include "tree-iterator.h"
diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
index 2b99c49613f..9f8ec4ae57d 100644
--- a/gcc/jit/jit-playback.c
+++ b/gcc/jit/jit-playback.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "statistics.h"
 #include "vec.h"
 #include "alias.h"
-#include "flags.h"
 #include "tree.h"
 #include "inchash.h"
 #include "hash-map.h"
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 2390de63d5c..03d06e2e4cd 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-09  Andrew MacLeod  <amacleod@redhat.com>
+
+	* lto-lang.c: Adjust includes for flags.h changes.
+
 2015-07-07  Andrew MacLeod  <amacleod@redhat.com>
 
 	* lto-lang.c: Adjust includes.
diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index 3e878527fb2..9bf6496ec65 100644
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
 #include "tm.h"
 #include "function.h"
 #include "predict.h"
diff --git a/gcc/opts-common.c b/gcc/opts-common.c
index e53e85fd0d5..8e519742ba7 100644
--- a/gcc/opts-common.c
+++ b/gcc/opts-common.c
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "intl.h"
 #include "coretypes.h"
 #include "opts.h"
-#include "flags.h"
+#include "options.h"
 #include "diagnostic.h"
 
 static void prune_options (struct cl_decoded_option **, unsigned int *);
diff --git a/gcc/opts-global.c b/gcc/opts-global.c
index 30563019e29..50b32ac4502 100644
--- a/gcc/opts-global.c
+++ b/gcc/opts-global.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "diagnostic.h"
 #include "opts.h"
+#include "options.h"
 #include "flags.h"
 #include "alias.h"
 #include "backend.h"