spu-protos.h: Do not include rtl.h.

	* config/spu/spu-protos.h: Do not include rtl.h.  Protect
	RTL specific prototypes with #ifdef RTX_CODE.
	* config/spu/spu-c.c: Include c-common.h instead of c-tree.h.
	* config/spu/t-spu-elf: Fix dependencies.

From-SVN: r160022

4 files changed, 18 insertions, 7 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0e0edc6..adfd11d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-29  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* config/spu/spu-protos.h: Do not include rtl.h.  Protect
+	RTL specific prototypes with #ifdef RTX_CODE.
+	* config/spu/spu-c.c: Include c-common.h instead of c-tree.h.
+	* config/spu/t-spu-elf: Fix dependencies.
+
 2010-05-29  Mike Stump  <mikestump@comcast.net>
 
 	* Makefile.in (build/gencondmd.o): Be sure to use GTM_H instead of
diff --git a/gcc/config/spu/spu-c.c b/gcc/config/spu/spu-c.c
index 1d8081a..a4f2274 100644
--- a/gcc/config/spu/spu-c.c
+++ b/gcc/config/spu/spu-c.c
@@ -20,7 +20,7 @@
 #include "tm.h"
 #include "cpplib.h"
 #include "tree.h"
-#include "c-tree.h"
+#include "c-common.h"
 #include "c-pragma.h"
 #include "tm_p.h"
 #include "langhooks.h"
diff --git a/gcc/config/spu/spu-protos.h b/gcc/config/spu/spu-protos.h
index 32bd25c..eae6bad 100644
--- a/gcc/config/spu/spu-protos.h
+++ b/gcc/config/spu/spu-protos.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2006, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
 
    This file is free software; you can redistribute it and/or modify it under
    the terms of the GNU General Public License as published by the Free
@@ -17,8 +18,6 @@
 #ifndef _SPU_PROTOS_
 #define _SPU_PROTOS_
 
-#include "rtl.h"
-
 extern void spu_cpu_cpp_builtins (struct cpp_reader * pfile);
 extern void builtin_define_std (const char *);
 extern void spu_optimization_options (int level, int size);
@@ -31,7 +30,6 @@ extern int spu_expand_block_move (rtx * ops);
 extern void spu_emit_branch_or_set (int is_set, rtx cmp, rtx * operands);
 extern int spu_emit_vector_cond_expr (rtx, rtx, rtx, rtx, rtx, rtx);
 extern HOST_WIDE_INT const_double_to_hwint (rtx x);
-extern rtx hwint_to_const_double (enum machine_mode mode, HOST_WIDE_INT v);
 extern void print_operand_address (FILE * file, register rtx addr);
 extern void print_operand (FILE * file, rtx x, int code);
 extern int spu_split_immediate (rtx * ops);
@@ -40,6 +38,9 @@ extern int direct_return (void);
 extern void spu_expand_prologue (void);
 extern void spu_expand_epilogue (unsigned char sibcall_p);
 extern rtx spu_return_addr (int count, rtx frame);
+
+#ifdef RTX_CODE
+extern rtx hwint_to_const_double (enum machine_mode mode, HOST_WIDE_INT v);
 extern rtx spu_const (enum machine_mode mode, HOST_WIDE_INT val);
 extern rtx spu_const_from_ints (enum machine_mode mode, 
 			        int a, int b, int c, int d);
@@ -83,6 +84,8 @@ extern void spu_builtin_insert (rtx ops[]);
 extern void spu_builtin_promote (rtx ops[]);
 extern void spu_expand_sign_extend (rtx ops[]);
 extern void spu_expand_vector_init (rtx target, rtx vals);
+#endif /* RTX_CODE  */
+
 extern void spu_init_expanders (void);
 extern void spu_split_convert (rtx *);
 extern void spu_function_profiler (FILE *, int);
@@ -94,4 +97,5 @@ extern rtx spu_expand_builtin (tree exp, rtx target, rtx subtarget,
 			       enum machine_mode mode, int ignore);
 extern rtx spu_expand_builtin (tree, rtx, rtx, enum machine_mode, int);
 
-#endif
+#endif /* _SPU_PROTOS_  */
+
diff --git a/gcc/config/spu/t-spu-elf b/gcc/config/spu/t-spu-elf
index a54ede9..de559c9 100644
--- a/gcc/config/spu/t-spu-elf
+++ b/gcc/config/spu/t-spu-elf
@@ -115,6 +115,6 @@ spu.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 spu-c.o: $(srcdir)/config/spu/spu-c.c \
     $(srcdir)/config/spu/spu-protos.h \
     $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(CPPLIB_H) \
-    $(TM_P_H) c-pragma.h coretypes.h $(TM_H) insn-codes.h
+    $(TM_P_H) $(C_COMMON_H) $(C_PRAGMA_H) coretypes.h $(TM_H) insn-codes.h
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 		$(srcdir)/config/spu/spu-c.c