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

	* opth-gen.awk: Check for UNKNOWN_LOCATION rather than GCC_TM_H, don't
	include input.h.
	* opts.c: Remove multiline #include comment.

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

	* java/expr.c: Remove multiline #include comment.

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

	* fortran/trans-types.c: Remove multiline #include comment.

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

	* c-family/c-opts.c: Remove multiline #include comment.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f05f82e..6186f5b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-15  Andrew MacLeod  <amacleod@redhat.com>
+
+       * opth-gen.awk: Check for UNKNOWN_LOCATION rather than GCC_TM_H, don't
+       include input.h.
+       * opts.c: Remove multiline #include comment.
+
 2015-07-15  Nathan Sidwell  <nathan@codesourcery.com>
 
        * config/nvptx/mkoffload.c (process): Add C++ protection to

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 9f06dcd..8d1b47f 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-15  Andrew MacLeod  <amacleod@redhat.com>
+
+       * c-opts.c: Remove multiline #include comment.
+
 2015-07-12  Aldy Hernandez  <aldyh@redhat.com>
 
        * c-common.c: Fix double word typos.

diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index 33087ba..4dbb109 100644 (file)
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.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 "options.h"
+#include "tm.h"
 #include "alias.h"
 #include "tree.h"
 #include "c-common.h"
@@ -39,11 +39,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "plugin.h"            /* For PLUGIN_INCLUDE_FILE event.  */
 #include "mkdeps.h"
 #include "c-target.h"
-#include "tm.h"                        /* For BYTES_BIG_ENDIAN,
-                                  DOLLARS_IN_IDENTIFIERS,
-                                  STDC_0_IN_SYSTEM_HEADERS,
-                                  TARGET_FLT_EVAL_METHOD_NON_DEFAULT and
-                                  TARGET_OPTF.  */
 #include "tm_p.h"              /* For C_COMMON_OVERRIDE_OPTIONS.  */
 #include "dumpfile.h"
 

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b13f67f..4822a65 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-15  Andrew MacLeod  <amacleod@redhat.com>
+
+       * trans-types.c: Remove multiline #include comment.
+
 2015-07-14  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        * simplify.c (gfc_simplify_floor): Set precision of temporary to

diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index 61f5827..7f3f261 100644 (file)
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -24,15 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"                /* For INTMAX_TYPE, INT8_TYPE, INT16_TYPE, INT32_TYPE,
-                          INT64_TYPE, INT_LEAST8_TYPE, INT_LEAST16_TYPE,
-                          INT_LEAST32_TYPE, INT_LEAST64_TYPE, INT_FAST8_TYPE,
-                          INT_FAST16_TYPE, INT_FAST32_TYPE, INT_FAST64_TYPE,
-                          BOOL_TYPE_SIZE, BITS_PER_UNIT, POINTER_SIZE,
-                          INT_TYPE_SIZE, CHAR_TYPE_SIZE, SHORT_TYPE_SIZE,
-                          LONG_TYPE_SIZE, LONG_LONG_TYPE_SIZE,
-                          FLOAT_TYPE_SIZE, DOUBLE_TYPE_SIZE and
-                          LONG_DOUBLE_TYPE_SIZE.  */
+#include "tm.h"
 #include "alias.h"
 #include "tree.h"
 #include "fold-const.h"

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index c64d3c9..1414c47 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-15  Andrew MacLeod  <amacleod@redhat.com>
+
+       * expr.c: Remove multiline #include comment.
+
 2015-07-12  Aldy Hernandez  <aldyh@redhat.com>
 
        * class.c: Fix double word typos.

diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 0af9068..37a705c 100644 (file)
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -26,12 +26,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"                        /* For INT_TYPE_SIZE,
-                                  TARGET_VTABLE_USES_DESCRIPTORS,
-                                  BITS_PER_UNIT,
-                                  MODIFY_JNI_METHOD_CALL and
-                                  PARM_BOUNDARY.  */
-                                  
+#include "tm.h"
 #include "alias.h"
 #include "tree.h"
 #include "fold-const.h"

diff --git a/gcc/opth-gen.awk b/gcc/opth-gen.awk
index 44b50ab..3fe6491 100644 (file)
--- a/gcc/opth-gen.awk
+++ b/gcc/opth-gen.awk
@@ -308,9 +308,8 @@ print "";
 print "/* Hash optimization from a structure.  */";
 print "extern hashval_t cl_optimization_hash (const struct cl_optimization *);";
 print "";
-print "/* Anything that includes tm.h, does not necessarily need this.  */"
-print "#if !defined(GCC_TM_H)"
-print "#include \"input.h\" /* for location_t */"
+print "/* Generator files may not have access to location_t, and don't need these.  */"
+print "#if defined(UNKNOWN_LOCATION)"
 print "bool                                                                  "
 print "common_handle_option_auto (struct gcc_options *opts,                  "
 print "                           struct gcc_options *opts_set,              "

diff --git a/gcc/opts.c b/gcc/opts.c
index 9793999..468a802 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -23,10 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "intl.h"
 #include "coretypes.h"
 #include "opts.h"
-#include "options.h"
-#include "tm.h" /* For STACK_CHECK_BUILTIN,
-                  STACK_CHECK_STATIC_BUILTIN, DEFAULT_GDB_EXTENSIONS,
-                  DWARF2_DEBUGGING_INFO and DBX_DEBUGGING_INFO.  */
+#include "tm.h"
 #include "flags.h"
 #include "params.h"
 #include "diagnostic.h"