aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/class.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3593ce4..7cedc4a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-13 Andrew Haley <aph@cygnus.com>
+
+ * class.c (finish_struct_1): Force alignment of non-bitfields to
+ BITS_PER_UNIT.
+
Wed Oct 13 22:01:35 1999 J"orn Rennecke <amylaar@cygnus.co.uk>
* typeck2.c (process_init_constructor): Handle empty constructors.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index d380186..f393a02 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -3654,6 +3654,14 @@ finish_struct_1 (t)
cp_error_at ("multiple fields in union `%T' initialized");
any_default_members = 1;
}
+
+ {
+ unsigned int min_align = (DECL_PACKED (x) ? BITS_PER_UNIT
+ : TYPE_ALIGN (TREE_TYPE (x)));
+ /* Non-bit-fields are aligned for their type, except packed
+ fields which require only BITS_PER_UNIT alignment. */
+ DECL_ALIGN (x) = MAX (DECL_ALIGN (x), min_align);
+ }
}
}