From: Jason Merrill <jason@redhat.com>
Date: Thu, 16 Aug 2001 13:46:37 +0000 (-0400)
Subject: stor-layout.c (layout_decl): Don't set DECL_USER_ALIGN.
X-Git-Tag: prereleases/libstdc++-3.0.95~2625
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7256efa629eaade7e927099a12ecd5ad305f118b;p=thirdparty%2Fgcc.git

stor-layout.c (layout_decl): Don't set DECL_USER_ALIGN.

        * stor-layout.c (layout_decl): Don't set DECL_USER_ALIGN.
        (finalize_record_size): Don't set TYPE_USER_ALIGN.

From-SVN: r44937
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dbe6996d51cc..80ff580b7ec7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-16  Jason Merrill  <jason_merrill@redhat.com>
+
+	* stor-layout.c (layout_decl): Don't set DECL_USER_ALIGN.
+	(finalize_record_size): Don't set TYPE_USER_ALIGN.
+
 2001-08-16  Matt Kraai  <kraai@alumni.carnegiemellon.edu>
 
 	* config/i386/i386.c (ix86_init_mmx_sse_builtins): Remove unused
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 2ac72e38f255..5431c261a85c 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -372,7 +372,7 @@ layout_decl (decl, known_align)
 	      && TYPE_ALIGN (type) > DECL_ALIGN (decl))))
     {	      
       DECL_ALIGN (decl) = TYPE_ALIGN (type);
-      DECL_USER_ALIGN (decl) = TYPE_USER_ALIGN (type);
+      DECL_USER_ALIGN (decl) = 0;
     }
 
   /* For fields, set the bit field type and update the alignment.  */
@@ -993,7 +993,7 @@ finalize_record_size (rli)
 #else
   TYPE_ALIGN (rli->t) = MAX (TYPE_ALIGN (rli->t), rli->record_align);
 #endif
-  TYPE_USER_ALIGN (rli->t) = 1;
+  TYPE_USER_ALIGN (rli->t) = 0;
 
   /* Compute the size so far.  Be sure to allow for extra bits in the
      size in bytes.  We have guaranteed above that it will be no more