aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoern Rennecke <joern.rennecke@embecosm.com>2010-02-18 01:30:13 +0000
committerJoern Rennecke <joern.rennecke@embecosm.com>2010-02-18 01:30:13 +0000
commit55f949d747bb352f125c2113ed97789e85646cd8 (patch)
treeb90abefe850da5e0358ab40fc0725f3675196e6d
parent582f5966c5c3becbeeab62dc27fe7776337f78be (diff)
* tree-ssa-address.c (create_mem_ref): Fix EXTRA_TARGETS_DECL type.
* config/spu/t-spu-elf (spu-cxx.o): Fix merge pasto. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/milepost-20100130-branch@156847 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog.multi-target6
-rw-r--r--gcc/config/spu/t-spu-elf4
-rw-r--r--gcc/tree-ssa-address.c2
3 files changed, 9 insertions, 3 deletions
diff --git a/gcc/ChangeLog.multi-target b/gcc/ChangeLog.multi-target
index a12159fafbd..dcdbeba1b65 100644
--- a/gcc/ChangeLog.multi-target
+++ b/gcc/ChangeLog.multi-target
@@ -1,3 +1,9 @@
+2010-02-18 Joern Rennecke <joern.rennecke@embecosm.com>
+
+ * tree-ssa-address.c (create_mem_ref): Fix EXTRA_TARGETS_DECL type.
+
+ * config/spu/t-spu-elf (spu-cxx.o): Fix merge pasto.
+
2010-02-16 Joern Rennecke <joern.rennecke@embecosm.com>
* tree-vectorizer.c (vectorize_loops): Avoid extra vect_analyze_loop
diff --git a/gcc/config/spu/t-spu-elf b/gcc/config/spu/t-spu-elf
index 59c8f644fe0..0f711ebcf3b 100644
--- a/gcc/config/spu/t-spu-elf
+++ b/gcc/config/spu/t-spu-elf
@@ -127,5 +127,5 @@ spu-cxx.o: $(srcdir)/config/spu/spu-c.c \
$(SYSTEM_H) coretypes.h $(TARGET_H) $(GGC_H) \
$(srcdir)/../include/hashtab.h $(srcdir)/../include/splay-tree.h \
$(TM_P_H) c-pragma.h coretypes.h $(TM_H) insn-codes.h
-^I$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-^I^I$(srcdir)/config/spu/spu-c.c -DCC1PLUS -o $@
+ $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+ $(srcdir)/config/spu/spu-c.c -DCC1PLUS -o $@
diff --git a/gcc/tree-ssa-address.c b/gcc/tree-ssa-address.c
index 326b4a2c941..d8147c1c380 100644
--- a/gcc/tree-ssa-address.c
+++ b/gcc/tree-ssa-address.c
@@ -769,7 +769,7 @@ create_mem_ref (gimple_stmt_iterator *gsi, tree type, aff_tree *addr,
#ifndef EXTRA_TARGET
EXTRA_TARGETS_DECL (tree create_mem_ref (gimple_stmt_iterator *gsi, tree type,
- aff_tree *addr, bool speed))
+ aff_tree *addr, tree, bool speed))
/* Like create_mem_ref, but dispatch according to targetm, so this is
suitable for tree optimizers that don't have target-specific variants. */