* ldlang.c (wild): Tidy default_common_section loop.

	(print_input_section): Format.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index c4eee46713021ddca8450a2f9c6dea9ff0662d55..6d7631597b56726d79f77e73e7223d94bff5e012 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-19  Alan Modra  <amodra@bigpond.net.au>
 
+       * ldlang.c (wild): Tidy default_common_section loop.
+       (print_input_section): Format.
+
        * configure: Regenerate.
 
 2006-04-16  Daniel Jacobowitz  <dan@codesourcery.com>

diff --git a/ld/ldlang.c b/ld/ldlang.c
index c07a5921c12237f588efed6f49985fd86eec4ba3..f376652dae2d7e85040f36ea0270c668ec9ae8ac 100644 (file)
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -2458,17 +2458,15 @@ wild (lang_wild_statement_type *s,
 
   walk_wild (s, output_section_callback, output);
 
-  for (sec = s->section_list; sec != NULL; sec = sec->next)
-    {
-      if (default_common_section != NULL)
-       break;
+  if (default_common_section == NULL)
+    for (sec = s->section_list; sec != NULL; sec = sec->next)
       if (sec->spec.name != NULL && strcmp (sec->spec.name, "COMMON") == 0)
        {
          /* Remember the section that common is going to in case we
             later get something which doesn't know where to put it.  */
          default_common_section = output;
+         break;
        }
-    }
 }
 
 /* Return TRUE iff target is the sought target.  */
@@ -3509,64 +3507,61 @@ static void
 print_input_section (asection *i)
 {
   bfd_size_type size = i->size;
+  int len;
+  bfd_vma addr;
 
   init_opb ();
 
-    {
-      int len;
-      bfd_vma addr;
+  print_space ();
+  minfo ("%s", i->name);
 
+  len = 1 + strlen (i->name);
+  if (len >= SECTION_NAME_MAP_LENGTH - 1)
+    {
+      print_nl ();
+      len = 0;
+    }
+  while (len < SECTION_NAME_MAP_LENGTH)
+    {
       print_space ();
-      minfo ("%s", i->name);
-
-      len = 1 + strlen (i->name);
-      if (len >= SECTION_NAME_MAP_LENGTH - 1)
-       {
-         print_nl ();
-         len = 0;
-       }
-      while (len < SECTION_NAME_MAP_LENGTH)
-       {
-         print_space ();
-         ++len;
-       }
+      ++len;
+    }
 
-      if (i->output_section != NULL && i->output_section->owner == output_bfd)
-       addr = i->output_section->vma + i->output_offset;
-      else
-       {
-         addr = print_dot;
-         size = 0;
-       }
+  if (i->output_section != NULL && i->output_section->owner == output_bfd)
+    addr = i->output_section->vma + i->output_offset;
+  else
+    {
+      addr = print_dot;
+      size = 0;
+    }
 
-      minfo ("0x%V %W %B\n", addr, TO_ADDR (size), i->owner);
+  minfo ("0x%V %W %B\n", addr, TO_ADDR (size), i->owner);
 
-      if (size != i->rawsize && i->rawsize != 0)
-       {
-         len = SECTION_NAME_MAP_LENGTH + 3;
+  if (size != i->rawsize && i->rawsize != 0)
+    {
+      len = SECTION_NAME_MAP_LENGTH + 3;
 #ifdef BFD64
-         len += 16;
+      len += 16;
 #else
-         len += 8;
+      len += 8;
 #endif
-         while (len > 0)
-           {
-             print_space ();
-             --len;
-           }
-
-         minfo (_("%W (size before relaxing)\n"), i->rawsize);
+      while (len > 0)
+       {
+         print_space ();
+         --len;
        }
 
-      if (i->output_section != NULL && i->output_section->owner == output_bfd)
-       {
-         if (command_line.reduce_memory_overheads)
-           bfd_link_hash_traverse (link_info.hash, print_one_symbol, i);
-         else
-           print_all_symbols (i);
+      minfo (_("%W (size before relaxing)\n"), i->rawsize);
+    }
 
-         print_dot = addr + TO_ADDR (size);
-       }
+  if (i->output_section != NULL && i->output_section->owner == output_bfd)
+    {
+      if (command_line.reduce_memory_overheads)
+       bfd_link_hash_traverse (link_info.hash, print_one_symbol, i);
+      else
+       print_all_symbols (i);
+
+      print_dot = addr + TO_ADDR (size);
     }
 }