diff --git a/ld/ChangeLog b/ld/ChangeLog
index 159b05f00f..c801c60303 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+Wed May  3 12:56:32 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* ldlang.c (print_output_section_statement): Check
+	subsection_alignment, instead of checking section_alignment twice.
+	Noticed by Alan Modra <alan@spri.levels.unisa.edu.au>.
+
 Tue May  2 16:36:07 1995  Jeff Law  (law@snake.cs.utah.edu)
 
 	* configure.in (hppa*-*-lites*): Handle like hppa*-*-*elf*.
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 61ad502de6..f7847d38ad 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -1236,7 +1236,7 @@ print_output_section_statement (output_section_statement)
       fprintf (config.map_file, "Output address   %08x\n", b);
     }
   if (output_section_statement->section_alignment >= 0
-      || output_section_statement->section_alignment >= 0) 
+      || output_section_statement->subsection_alignment >= 0) 
   {
     fprintf (config.map_file, "\t\t\t\t\tforced alignment ");
     if (output_section_statement->section_alignment >= 0) 
@@ -2259,9 +2259,9 @@ lang_common ()
     bfd_link_hash_traverse (link_info.hash, lang_one_common, (PTR) NULL);
   else
     {
-      unsigned int power;
+      int power;
 
-      for (power = 1; power < 4; power++)
+      for (power = 4; power >= 0; power--)
 	bfd_link_hash_traverse (link_info.hash, lang_one_common,
 				(PTR) &power);
     }
@@ -2285,8 +2285,7 @@ lang_one_common (h, info)
   power_of_two = h->u.c.p->alignment_power;
 
   if (config.sort_common
-      && power_of_two < *(unsigned int *) info
-      && *(unsigned int *) info < 4)
+      && power_of_two < *(int *) info)
     return true;
 
   section = h->u.c.p->section;