* Makefile.in (CXXX): Add -fpermissive.milepost-integration

	* graphite.h (struct name_tree, struct sese): Rename to:
	(struct name_tree_s, struct sese_s).
	* graphite.c: Likewise.
	(struct ivtype_map_elt, struct rename_map_elt): Rename to:
	(struct ivtype_map_elt_s, struct rename_map_elt_s).
	(struct ifsese): Rename to:
	(struct ifsese_s).


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/milepost-integration@157526 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 44 insertions, 33 deletions

diff --git a/gcc/ChangeLog.cxx b/gcc/ChangeLog.cxx
index 27e863e88bd..5014184688a 100644
--- a/gcc/ChangeLog.cxx
+++ b/gcc/ChangeLog.cxx
@@ -1,3 +1,14 @@
+2010-03-18  Joern Rennecke  <joern.rennecke@embecosm.com>
+
+	* Makefile.in (CXXX): Add -fpermissive.
+	* graphite.h (struct name_tree, struct sese): Rename to:
+	(struct name_tree_s, struct sese_s).
+	* graphite.c: Likewise.
+	(struct ivtype_map_elt, struct rename_map_elt): Rename to:
+	(struct ivtype_map_elt_s, struct rename_map_elt_s).
+	(struct ifsese): Rename to:
+	(struct ifsese_s).
+
 2009-08-28  J"orn Rennecke  <joern.rennecke@arc.com>
 
 	* config/i386/i386.c (ix86_expand_args_builtin): Update to take new
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 1f396f6a464..7d7a2f4962e 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -924,7 +924,7 @@ INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
 	   $(PPLINC) $(CLOOGINC)
 
 # [gcc-in-cxx] Keep the .c extension, but compile with C++.
-CXXX :=	$(CXX) -x c++ -c $(ALL_CXXFLAGS) $(ALL_CPPFLAGS)
+CXXX :=	$(CXX) -x c++ -c -fpermissive $(ALL_CXXFLAGS) $(ALL_CPPFLAGS)
 .c.o:
 	$(CXXX) $< $(OUTPUT_OPTION)
 ifdef EXTRA_TARGET
diff --git a/gcc/graphite.c b/gcc/graphite.c
index b732b40d214..a7d48b9b6e1 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -174,7 +174,7 @@ register_bb_in_sese (basic_block entry_bb, basic_block exit_bb, sese region)
 sese
 new_sese (edge entry, edge exit)
 {
-  sese res = XNEW (struct sese);
+  sese res = XNEW (struct sese_s);
 
   SESE_ENTRY (res) = entry;
   SESE_EXIT (res) = exit;
@@ -267,7 +267,7 @@ static void
 loop_iv_stack_push_iv (loop_iv_stack stack, tree iv, const char *name)
 {
   iv_stack_entry *entry = XNEW (iv_stack_entry);
-  name_tree named_iv = XNEW (struct name_tree);
+  name_tree named_iv = XNEW (struct name_tree_s);
 
   named_iv->t = iv;
   named_iv->name = name;
@@ -389,7 +389,7 @@ free_loop_iv_stack (loop_iv_stack stack)
 
 /* Structure containing the mapping between the CLooG's induction
    variable and the type of the old induction variable.  */
-typedef struct ivtype_map_elt
+typedef struct ivtype_map_elt_s
 {
   tree type;
   const char *cloog_iv;
@@ -410,7 +410,7 @@ debug_ivtype_elt (ivtype_map_elt elt)
 static int
 debug_ivtype_map_1 (void **slot, void *s ATTRIBUTE_UNUSED)
 {
-  struct ivtype_map_elt *entry = (struct ivtype_map_elt *) *slot;
+  struct ivtype_map_elt_s *entry = (struct ivtype_map_elt_s *) *slot;
   debug_ivtype_elt (entry);
   return 1;
 }
@@ -430,7 +430,7 @@ new_ivtype_map_elt (const char *cloog_iv, tree type)
 {
   ivtype_map_elt res;
   
-  res = XNEW (struct ivtype_map_elt);
+  res = XNEW (struct ivtype_map_elt_s);
   res->cloog_iv = cloog_iv;
   res->type = type;
 
@@ -442,7 +442,7 @@ new_ivtype_map_elt (const char *cloog_iv, tree type)
 static hashval_t
 ivtype_map_elt_info (const void *elt)
 {
-  return htab_hash_pointer (((const struct ivtype_map_elt *) elt)->cloog_iv);
+  return htab_hash_pointer (((const struct ivtype_map_elt_s *) elt)->cloog_iv);
 }
 
 /* Compares database elements E1 and E2.  */
@@ -450,8 +450,8 @@ ivtype_map_elt_info (const void *elt)
 static int
 eq_ivtype_map_elts (const void *e1, const void *e2)
 {
-  const struct ivtype_map_elt *elt1 = (const struct ivtype_map_elt *) e1;
-  const struct ivtype_map_elt *elt2 = (const struct ivtype_map_elt *) e2;
+  const struct ivtype_map_elt_s *elt1 = (const struct ivtype_map_elt_s *) e1;
+  const struct ivtype_map_elt_s *elt2 = (const struct ivtype_map_elt_s *) e2;
 
   return (elt1->cloog_iv == elt2->cloog_iv);
 }
@@ -465,7 +465,7 @@ eq_ivtype_map_elts (const void *e1, const void *e2)
 static tree
 gcc_type_for_cloog_iv (const char *cloog_iv, graphite_bb_p gbb)
 {
-  struct ivtype_map_elt tmp;
+  struct ivtype_map_elt_s tmp;
   PTR *slot;
 
   tmp.cloog_iv = cloog_iv;
@@ -1332,7 +1332,7 @@ free_graphite_bb (struct graphite_bb *gbb)
 
 /* Structure containing the mapping between the old names and the new
    names used after block copy in the new loop context.  */
-typedef struct rename_map_elt
+typedef struct rename_map_elt_s
 {
   tree old_name, new_name;
 } *rename_map_elt;
@@ -1355,7 +1355,7 @@ debug_rename_elt (rename_map_elt elt)
 static int
 debug_rename_map_1 (void **slot, void *s ATTRIBUTE_UNUSED)
 {
-  struct rename_map_elt *entry = (struct rename_map_elt *) *slot;
+  struct rename_map_elt_s *entry = (struct rename_map_elt_s *) *slot;
   debug_rename_elt (entry);
   return 1;
 }
@@ -1375,7 +1375,7 @@ new_rename_map_elt (tree old_name, tree new_name)
 {
   rename_map_elt res;
   
-  res = XNEW (struct rename_map_elt);
+  res = XNEW (struct rename_map_elt_s);
   res->old_name = old_name;
   res->new_name = new_name;
 
@@ -1387,7 +1387,7 @@ new_rename_map_elt (tree old_name, tree new_name)
 static hashval_t
 rename_map_elt_info (const void *elt)
 {
-  return htab_hash_pointer (((const struct rename_map_elt *) elt)->old_name);
+  return htab_hash_pointer (((const struct rename_map_elt_s *) elt)->old_name);
 }
 
 /* Compares database elements E1 and E2.  */
@@ -1395,8 +1395,8 @@ rename_map_elt_info (const void *elt)
 static int
 eq_rename_map_elts (const void *e1, const void *e2)
 {
-  const struct rename_map_elt *elt1 = (const struct rename_map_elt *) e1;
-  const struct rename_map_elt *elt2 = (const struct rename_map_elt *) e2;
+  const struct rename_map_elt_s *elt1 = (const struct rename_map_elt_s *) e1;
+  const struct rename_map_elt_s *elt2 = (const struct rename_map_elt_s *) e2;
 
   return (elt1->old_name == elt2->old_name);
 }
@@ -1406,7 +1406,7 @@ eq_rename_map_elts (const void *e1, const void *e2)
 static tree
 get_new_name_from_old_name (htab_t map, tree old_name)
 {
-  struct rename_map_elt tmp;
+  struct rename_map_elt_s tmp;
   PTR *slot;
 
   tmp.old_name = old_name;
@@ -2412,7 +2412,7 @@ scop_record_loop (scop_p scop, loop_p loop)
   if (!induction_var)
     return false;
 
-  oldiv = XNEW (struct name_tree);
+  oldiv = XNEW (struct name_tree_s);
   oldiv->t = induction_var;
   oldiv->name = get_name (SSA_NAME_VAR (oldiv->t));
   oldiv->loop = loop;
@@ -2657,7 +2657,7 @@ param_index (tree var, scop_p scop)
 
   gcc_assert (SCOP_ADD_PARAMS (scop));
 
-  nvar = XNEW (struct name_tree);
+  nvar = XNEW (struct name_tree_s);
   nvar->t = var;
   nvar->name = NULL;
   VEC_safe_push (name_tree, heap, SCOP_PARAMS (scop), nvar);
@@ -4423,7 +4423,7 @@ build_iv_mapping (loop_iv_stack ivstack, htab_t map, gbb_p gbb, scop_p scop)
 
   for (i = 0; VEC_iterate (name_tree, SCOP_OLDIVS (scop), i, iv); i++)
     {
-      struct rename_map_elt tmp;
+      struct rename_map_elt_s tmp;
 
       if (!flow_bb_inside_loop_p (iv->loop, GBB_BB (gbb)))
 	continue;
@@ -4445,7 +4445,7 @@ build_iv_mapping (loop_iv_stack ivstack, htab_t map, gbb_p gbb, scop_p scop)
 static void
 register_old_and_new_names (htab_t map, tree old_name, tree new_name)
 {
-  struct rename_map_elt tmp;
+  struct rename_map_elt_s tmp;
   PTR *slot;
 
   tmp.old_name = old_name;
@@ -4544,7 +4544,7 @@ copy_bb_and_scalar_dependences (basic_block bb, scop_p scop,
 static int
 add_loop_exit_phis (void **slot, void *s)
 {
-  struct rename_map_elt *entry = (struct rename_map_elt *) *slot;
+  struct rename_map_elt_s *entry = (struct rename_map_elt_s *) *slot;
   tree new_name = entry->new_name;
   basic_block bb = (basic_block) s;
   gimple phi = create_phi_node (new_name, bb);
@@ -4601,7 +4601,7 @@ default_liveout_before_guard (htab_t liveout_before_guard, tree old_name)
 static int
 add_guard_exit_phis (void **slot, void *s)
 {
-  struct rename_map_elt *entry = (struct rename_map_elt *) *slot;
+  struct rename_map_elt_s *entry = (struct rename_map_elt_s *) *slot;
   struct igp *i = (struct igp *) s;
   basic_block bb = i->bb;
   edge true_edge = i->true_edge;
@@ -4656,11 +4656,11 @@ insert_guard_phis (scop_p scop, basic_block bb, edge true_edge,
 static int
 copy_renames (void **slot, void *s)
 {
-  struct rename_map_elt *entry = (struct rename_map_elt *) *slot;
+  struct rename_map_elt_s *entry = (struct rename_map_elt_s *) *slot;
   htab_t res = (htab_t) s;
   tree old_name = entry->old_name;
   tree new_name = entry->new_name;
-  struct rename_map_elt tmp;
+  struct rename_map_elt_s tmp;
   PTR *x;
 
   tmp.old_name = old_name;
@@ -5004,7 +5004,7 @@ remove_sese_region (sese region)
   VEC_free (basic_block, heap, bbs);
 }
 
-typedef struct ifsese {
+typedef struct ifsese_s {
   sese region;
   sese true_region;
   sese false_region;
@@ -5078,10 +5078,10 @@ create_if_region_on_edge (edge entry, tree condition)
 {
   edge e;
   edge_iterator ei;
-  sese sese_region = GGC_NEW (struct sese);
-  sese true_region = GGC_NEW (struct sese);
-  sese false_region = GGC_NEW (struct sese);
-  ifsese if_region = GGC_NEW (struct ifsese);
+  sese sese_region = GGC_NEW (struct sese_s);
+  sese true_region = GGC_NEW (struct sese_s);
+  sese false_region = GGC_NEW (struct sese_s);
+  ifsese if_region = GGC_NEW (struct ifsese_s);
   edge exit = create_empty_if_region_on_edge (entry, condition);
 
   if_region->region = sese_region;
@@ -5364,7 +5364,7 @@ compute_cloog_iv_types_1 (graphite_bb_p gbb,
   for (t = user_stmt->substitutions; t; t = t->next, index++)
     {
       PTR *slot;
-      struct ivtype_map_elt tmp;
+      struct ivtype_map_elt_s tmp;
       struct clast_expr *expr = (struct clast_expr *) 
 	((struct clast_assignment *)t)->RHS;
 
diff --git a/gcc/graphite.h b/gcc/graphite.h
index a2700655ea4..5c815f2ca06 100644
--- a/gcc/graphite.h
+++ b/gcc/graphite.h
@@ -265,7 +265,7 @@ struct loop_to_cloog_loop_str
   CloogLoop *cloog_loop;
 };
 
-typedef struct name_tree
+typedef struct name_tree_s
 {
   tree t;
   const char *name;
@@ -277,7 +277,7 @@ DEF_VEC_ALLOC_P (name_tree, heap);
 
 /* A Single Entry, Single Exit region is a part of the CFG delimited
    by two edges.  */
-typedef struct sese
+typedef struct sese_s
 {
   /* Single ENTRY and single EXIT from the SESE region.  */
   edge entry, exit;