From 34ba5affde224d69904f0fa068ee07208f85a5f1 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Wed, 29 Apr 2015 13:32:34 +0000
Subject: [PATCH] inchash.h, inchash.c: Include bconfig.h for build objects.

gcc/
	* inchash.h, inchash.c: Include bconfig.h for build objects.
	* Makefile.in (build/inchash.o): New rule.

From-SVN: r222574
---
 gcc/ChangeLog   | 5 +++++
 gcc/Makefile.in | 2 ++
 gcc/inchash.c   | 4 ++++
 gcc/inchash.h   | 4 ++++
 4 files changed, 15 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 870fd1b1e4c..9bffca450f6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-29  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* inchash.h, inchash.c: Include bconfig.h for build objects.
+	* Makefile.in (build/inchash.o): New rule.
+
 2015-04-29  Yvan Roux  <yvan.roux@linaro.org>
 
 	PR target/65924
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 80c91f0eb86..e1f6f0ed085 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2434,6 +2434,8 @@ build/vec.o : vec.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(VEC_H)	\
    $(GGC_H) toplev.h $(DIAGNOSTIC_CORE_H)
 build/hash-table.o : hash-table.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h  \
    $(HASH_TABLE_H) $(GGC_H) toplev.h $(DIAGNOSTIC_CORE_H)
+build/inchash.o : inchash.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h  \
+   $(HASHTAB_H) inchash.h
 build/gencondmd.o : build/gencondmd.c $(BCONFIG_H) $(SYSTEM_H)		\
   coretypes.h $(GTM_H) insn-constants.h					\
   $(filter-out insn-flags.h, $(RTL_H) $(TM_P_H) $(FUNCTION_H) $(REGS_H) \
diff --git a/gcc/inchash.c b/gcc/inchash.c
index 1bc097e01f3..c555046dd3a 100644
--- a/gcc/inchash.c
+++ b/gcc/inchash.c
@@ -17,7 +17,11 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+#ifdef GENERATOR_FILE
+#include "bconfig.h"
+#else
 #include "config.h"
+#endif
 #include "system.h"
 #include "coretypes.h"
 #include "hashtab.h"
diff --git a/gcc/inchash.h b/gcc/inchash.h
index a1db9587beb..54fb0d853b2 100644
--- a/gcc/inchash.h
+++ b/gcc/inchash.h
@@ -20,7 +20,11 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef INCHASH_H
 #define INCHASH_H 1
 
+#ifdef GENERATOR_FILE
+#include "bconfig.h"
+#else
 #include "config.h"
+#endif
 #include "system.h"
 #include "coretypes.h"
 #include "hashtab.h"
-- 
2.30.2