* opth-gen.awk: Check for UNKNOWN_LOCATION rather than GCC_TM_H, don't
	include input.h.
	* opts.c: Remove multiline #include comment.
	* java/expr.c: Remove multiline #include comment.
	* fortran/trans-types.c: Remove multiline #include comment.
	* c-family/c-opts.c: Remove multiline #include comment.



Index: opth-gen.awk
===================================================================
*** opth-gen.awk	(revision 225789)
--- opth-gen.awk	(working copy)
*************** print "";
*** 308,316 ****
  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 "bool                                                                  "
  print "common_handle_option_auto (struct gcc_options *opts,                  "
  print "                           struct gcc_options *opts_set,              "
--- 308,315 ----
  print "/* Hash optimization from a structure.  */";
  print "extern hashval_t cl_optimization_hash (const struct cl_optimization *);";
  print "";
! 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,              "
Index: java/expr.c
===================================================================
*** java/expr.c	(revision 225789)
--- java/expr.c	(working copy)
*************** The Free Software Foundation is independ
*** 26,37 ****
  #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 "alias.h"
  #include "tree.h"
  #include "fold-const.h"
--- 26,32 ----
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
! #include "tm.h"
  #include "alias.h"
  #include "tree.h"
  #include "fold-const.h"
Index: fortran/trans-types.c
===================================================================
*** fortran/trans-types.c	(revision 225789)
--- fortran/trans-types.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 24,38 ****
  #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 "alias.h"
  #include "tree.h"
  #include "fold-const.h"
--- 24,30 ----
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
! #include "tm.h"
  #include "alias.h"
  #include "tree.h"
  #include "fold-const.h"
Index: c-family/c-opts.c
===================================================================
*** c-family/c-opts.c	(revision 225789)
--- c-family/c-opts.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 21,27 ****
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
! #include "options.h"
  #include "alias.h"
  #include "tree.h"
  #include "c-common.h"
--- 21,27 ----
  #include "config.h"
  #include "system.h"
  #include "coretypes.h"
! #include "tm.h"
  #include "alias.h"
  #include "tree.h"
  #include "c-common.h"
*************** along with GCC; see the file COPYING3.
*** 39,49 ****
  #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"
  
--- 39,44 ----
Index: opts.c
===================================================================
*** opts.c	(revision 225789)
--- opts.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 23,32 ****
  #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 "flags.h"
  #include "params.h"
  #include "diagnostic.h"
--- 23,29 ----
  #include "intl.h"
  #include "coretypes.h"
  #include "opts.h"
! #include "tm.h"
  #include "flags.h"
  #include "params.h"
  #include "diagnostic.h"