Patchwork Fix bootstrap without graphite.

login
register
mail settings
Submitter Sebastian Pop
Date Dec. 28, 2010, 7:06 p.m.
Message ID <1293563163-29000-1-git-send-email-sebpop@gmail.com>
Download mbox | patch
Permalink /patch/76856/
State New
Headers show

Comments

Sebastian Pop - Dec. 28, 2010, 7:06 p.m.
Hi,

This patch fixes the bootstrap without graphite.  This passed
bootstrap with graphite disabled, C only on amd64-linux.  I will
commit this patch to trunk.

Sebastian

2010-12-28  Sebastian Pop  <sebastian.pop@amd.com>

	* Makefile.in (graphite.o): Add dependence on DIAGNOSTIC_H.
	* graphite.c: Include diagnostic.h.
---
 gcc/ChangeLog   |    5 +++++
 gcc/Makefile.in |    6 +++---
 gcc/graphite.c  |    1 +
 3 files changed, 9 insertions(+), 3 deletions(-)
Joseph S. Myers - Dec. 28, 2010, 7:46 p.m.
On Tue, 28 Dec 2010, Sebastian Pop wrote:

> 	* Makefile.in (graphite.o): Add dependence on DIAGNOSTIC_H.
> 	* graphite.c: Include diagnostic.h.

If it's just for sorry (), diagnostic-core.h should suffice; most source 
files only need the interfaces from diagnostic-core.h and not the lower 
level interfaces from diagnostic.h.

Patch

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 439e24b..8be79d5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@ 
 2010-12-28  Sebastian Pop  <sebastian.pop@amd.com>
 
+	* Makefile.in (graphite.o): Add dependence on DIAGNOSTIC_H.
+	* graphite.c: Include diagnostic.h.
+
+2010-12-28  Sebastian Pop  <sebastian.pop@amd.com>
+
 	* Makefile.in (TREE_VECTORIZER_H): Removed duplicate definition.
 	(tree-browser.o): Update dependences.
 	(omega.o): Same.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index b5f9bd2..01ebc42 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2669,9 +2669,9 @@  tree-data-ref.o : tree-data-ref.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
    $(TREE_PASS_H) langhooks.h
 sese.o : sese.c sese.h $(CONFIG_H) $(SYSTEM_H) coretypes.h tree-pretty-print.h \
    $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) tree-pass.h value-prof.h
-graphite.o : graphite.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_FLOW_H) \
-   $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h $(DBGCNT_H) \
-   graphite-ppl.h graphite-poly.h graphite-scop-detection.h \
+graphite.o : graphite.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(DIAGNOSTIC_H) \
+   $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h \
+   $(DBGCNT_H) graphite-ppl.h graphite-poly.h graphite-scop-detection.h \
    graphite-clast-to-gimple.h graphite-sese-to-poly.h
 graphite-blocking.o : graphite-blocking.c $(CONFIG_H) $(SYSTEM_H) \
    coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
diff --git a/gcc/graphite.c b/gcc/graphite.c
index 84a8898..04462f2 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -35,6 +35,7 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
+#include "diagnostic.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
 #include "cfgloop.h"