* elf32-arm.c (find_stub_size_and_template): Avoid uninitialized

	var warning at -O3.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7017b152d865cf9ba1da0a1dba1edd51dba15c61..dcebb3bda4533daa8212ce723b951e433f1f95fb 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-25  Alan Modra  <amodra@gmail.com>
+
+       * elf32-arm.c (find_stub_size_and_template): Avoid uninitialized
+       var warning at -O3.
+
 2010-10-25  Alan Modra  <amodra@gmail.com>
 
        * opncls.c (bfd_alloc, bfd_zalloc): Don't mark internal.

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 9fce4b0ea40f9085427e3c081baca7769ee5e541..739a79d7f6934ec3a6df0a51fb37dbdfdcf2c59f 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -3704,7 +3704,12 @@ find_stub_size_and_template (enum elf32_arm_stub_type stub_type,
   unsigned int size;
 
   template_sequence = stub_definitions[stub_type].template_sequence;
+  if (stub_template)
+    *stub_template = template_sequence;
+
   template_size = stub_definitions[stub_type].template_size;
+  if (stub_template_size)
+    *stub_template_size = template_size;
 
   size = 0;
   for (i = 0; i < template_size; i++)
@@ -3723,16 +3728,10 @@ find_stub_size_and_template (enum elf32_arm_stub_type stub_type,
 
        default:
          BFD_FAIL ();
-         return FALSE;
+         return 0;
        }
     }
 
-  if (stub_template)
-    *stub_template = template_sequence;
-
-  if (stub_template_size)
-    *stub_template_size = template_size;
-
   return size;
 }