diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 33ab7dcb8b4..4573adf180e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-04  Kazu Hirata  <kazu@codesourcery.com>
+
+	* stor-layout.c (layout_type): Remove duplicate code.
+
 2007-06-04  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR c/32191
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 43ca759df07..bfdb4834733 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -1808,8 +1808,7 @@ layout_type (tree type)
 
 	    if (TYPE_MODE (type) != BLKmode
 		&& STRICT_ALIGNMENT && TYPE_ALIGN (type) < BIGGEST_ALIGNMENT
-		&& TYPE_ALIGN (type) < GET_MODE_ALIGNMENT (TYPE_MODE (type))
-		&& TYPE_MODE (type) != BLKmode)
+		&& TYPE_ALIGN (type) < GET_MODE_ALIGNMENT (TYPE_MODE (type)))
 	      {
 		TYPE_NO_FORCE_BLK (type) = 1;
 		TYPE_MODE (type) = BLKmode;