diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9e96d84378a..9965d509b10 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2013-10-30  David Malcolm  <dmalcolm@redhat.com>
+
+	* cgraphunit.c (analyze_functions): Split symtab_node
+	declarations onto multiple lines to make things easier
+	for rename_symtab.py.
+
+	* symtab.c (symtab_dissolve_same_comdat_group_list): Likewise.
+	(symtab_semantically_equivalent_p): Likewise.
+
 2013-10-30  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR target/58784
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 060ee70d7d4..39fb1427b6c 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -920,7 +920,8 @@ analyze_functions (void)
   struct varpool_node *first_handled_var = first_analyzed_var;
   struct pointer_set_t *reachable_call_targets = pointer_set_create ();
 
-  symtab_node node, next;
+  symtab_node node;
+  symtab_node next;
   int i;
   struct ipa_ref *ref;
   bool changed = true;
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 6606e590fb6..ebdd442ceb3 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,11 @@
+2013-10-30  David Malcolm  <dmalcolm@redhat.com>
+
+	* lto-symtab.c (lto_symtab_merge_decls_2): Split symtab_node
+	declarations onto multiple lines to make things easier for
+	rename_symtab.py.
+	(lto_symtab_merge_decls_1): Likewise.
+	(lto_symtab_merge_symbols_1): Likewise.
+
 2013-10-29  Balaji V. Iyer  <balaji.v.iyer@intel.com>
 
 	* Make-lang.in (lto/lto-lang.o): Added cilk.h in dependency list.
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index 13646bb6b72..ec42a930b7f 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -361,7 +361,8 @@ lto_symtab_resolve_symbols (symtab_node first)
 static void
 lto_symtab_merge_decls_2 (symtab_node first, bool diagnosed_p)
 {
-  symtab_node prevailing, e;
+  symtab_node prevailing;
+  symtab_node e;
   vec<tree> mismatches = vNULL;
   unsigned i;
   tree decl;
@@ -413,7 +414,8 @@ lto_symtab_merge_decls_2 (symtab_node first, bool diagnosed_p)
 static void
 lto_symtab_merge_decls_1 (symtab_node first)
 {
-  symtab_node e, prevailing;
+  symtab_node e;
+  symtab_node prevailing;
   bool diagnosed_p = false;
 
   if (cgraph_dump_file)
@@ -536,7 +538,8 @@ lto_symtab_merge_decls (void)
 static void
 lto_symtab_merge_symbols_1 (symtab_node prevailing)
 {
-  symtab_node e, next;
+  symtab_node e;
+  symtab_node next;
 
   /* Replace the cgraph node of each entry with the prevailing one.  */
   for (e = prevailing->next_sharing_asm_name; e;
diff --git a/gcc/symtab.c b/gcc/symtab.c
index eb57a99d6af..0bfa4e530a9 100644
--- a/gcc/symtab.c
+++ b/gcc/symtab.c
@@ -442,7 +442,8 @@ symtab_add_to_same_comdat_group (symtab_node new_node,
 void
 symtab_dissolve_same_comdat_group_list (symtab_node node)
 {
-  symtab_node n = node, next;
+  symtab_node n = node;
+  symtab_node next;
 
   if (!node->same_comdat_group)
     return;
@@ -1129,7 +1130,8 @@ symtab_semantically_equivalent_p (symtab_node a,
 				  symtab_node b)
 {
   enum availability avail;
-  symtab_node ba, bb;
+  symtab_node ba;
+  symtab_node bb;
 
   /* Equivalent functions are equivalent.  */
   if (a->decl == b->decl)