--- a/gcc/errors.c	Sun Aug 21 07:07:55 2011 +0900
+++ b/gcc/errors.c	Fri Oct 27 22:46:09 2017 +0900
@@ -1,6 +1,5 @@
 /* Basic error reporting routines.
-   Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2007, 2008
-   Free Software Foundation, Inc.
+   Copyright (C) 1999-2017 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -22,10 +21,11 @@
    in the generator programs; the compiler has a more elaborate suite
    of diagnostic printers, found in diagnostic.c.  */
 
-#ifdef GENERATOR_FILE
+#ifdef HOST_GENERATOR_FILE
+#include "config.h"
+#define GENERATOR_FILE 1
+#else
 #include "bconfig.h"
-#else
-#include "config.h"
 #endif
 #include "system.h"
 #include "errors.h"
@@ -49,7 +49,7 @@
   fprintf (stderr, "%s: warning: ", progname);
   vfprintf (stderr, format, ap);
   va_end (ap);
-  fputc('\n', stderr);
+  fputc ('\n', stderr);
 }
 
 
@@ -64,7 +64,7 @@
   fprintf (stderr, "%s: ", progname);
   vfprintf (stderr, format, ap);
   va_end (ap);
-  fputc('\n', stderr);
+  fputc ('\n', stderr);
 
   have_error = 1;
 }
@@ -81,7 +81,7 @@
   fprintf (stderr, "%s: ", progname);
   vfprintf (stderr, format, ap);
   va_end (ap);
-  fputc('\n', stderr);
+  fputc ('\n', stderr);
   exit (FATAL_EXIT_CODE);
 }