diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a5f0110d77b5..e0930b0ef7fe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-07  Steve Ellcey  <sje@cup.hp.com>
+
+	* stor-layout.c (layout_type): Do not allow alignment of array
+	elements to be greater than their size.
+
 2005-10-07  Steve Ellcey  <sje@cup.hp.com>
 
 	* config.host (hppa*-*-hpux*): Change out_host_hook_obj and
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index f7bf20b03ad9..aec80a3f294a 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -1817,6 +1817,12 @@ layout_type (tree type)
 		TYPE_MODE (type) = BLKmode;
 	      }
 	  }
+	if (TYPE_SIZE_UNIT (element)
+	    && TREE_CODE (TYPE_SIZE_UNIT (element)) == INTEGER_CST
+	    && !integer_zerop (TYPE_SIZE_UNIT (element))
+	    && compare_tree_int (TYPE_SIZE_UNIT (element),
+			  	 TYPE_ALIGN_UNIT (element)) < 0)
+	  error ("alignment of array elements is greater than element size");
 	break;
       }