Index: bfd/elf32-arm.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-arm.c,v
retrieving revision 1.153
diff -U2 -r1.153 elf32-arm.c
--- bfd/elf32-arm.c	18 Jul 2008 20:49:12 -0000	1.153
+++ bfd/elf32-arm.c	28 Jul 2008 05:02:45 -0000
@@ -11222,9 +11222,10 @@
   bfd_vma addr;
   char *stub_name;
+  output_arch_syminfo *osi;
 
   /* Massage our args to the form they really have.  */
   stub_entry = (struct elf32_arm_stub_hash_entry *) gen_entry;
 
-  output_arch_syminfo *osi = (output_arch_syminfo *) in_arg;
+  osi = (output_arch_syminfo *) in_arg;
   info = osi->info;
 
Index: bfd/elf32-avr.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-avr.c,v
retrieving revision 1.35
diff -U2 -r1.35 elf32-avr.c
--- bfd/elf32-avr.c	4 Jun 2008 09:59:08 -0000	1.35
+++ bfd/elf32-avr.c	28 Jul 2008 05:02:47 -0000
@@ -2591,4 +2591,5 @@
   Elf_Internal_Sym *local_syms, **all_local_syms;
   struct elf32_avr_link_hash_table *htab = avr_link_hash_table (info);
+  bfd_size_type amt;
 
   if (htab == NULL)
@@ -2598,5 +2599,5 @@
      we need to read in the local symbols in parallel and save them for
      later use; so hold pointers to the local symbols in an array.  */
-  bfd_size_type amt = sizeof (Elf_Internal_Sym *) * htab->bfd_count;
+  amt = sizeof (Elf_Internal_Sym *) * htab->bfd_count;
   all_local_syms = bfd_zmalloc (amt);
   htab->all_local_syms = all_local_syms;