diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f17867703dc9..fbd36e16f08c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-07  Dale Johannesen  <dalej@apple.com>
+
+	* tree-nested.c (finalize_nesting_tree_1):  Disable
+	warn_padded around layout_type call.
+
 2005-06-08  Zdenek Dvorak  <dvorakz@suse.cz>
 
 	* tree-ssa-loop-ivopts.c (rewrite_use_outer): Unshare the expression
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index 2f9985dcfac0..1721bca97454 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -1327,7 +1327,12 @@ finalize_nesting_tree_1 (struct nesting_info *root)
      out at this time.  */
   if (root->frame_type)
     {
+      /* In some cases the frame type will trigger the -Wpadded warning.
+	 This is not helpful; suppress it. */
+      int save_warn_padded = warn_padded;
+      warn_padded = 0;
       layout_type (root->frame_type);
+      warn_padded = save_warn_padded;
       layout_decl (root->frame_decl, 0);
     }