diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f8515cdc554..e1bd54ad852 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-03-22 Mike Stump + + PR target/23071 + * config/rs6000/rs6000.c (darwin_rs6000_special_round_type_align): + Don't overly align based upon packed packed fields. + 2010-03-22 Jason Merrill * c-pretty-print.c (pp_c_specifier_qualifier_list) [VECTOR_TYPE]: diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index dea0271b91a..ab48e82d9fc 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -4653,6 +4653,9 @@ darwin_rs6000_special_round_type_align (tree type, unsigned int computed, field = TREE_CHAIN (field); if (! field) break; + /* A packed field does not contribute any extra alignment. */ + if (DECL_PACKED (field)) + return align; type = TREE_TYPE (field); while (TREE_CODE (type) == ARRAY_TYPE) type = TREE_TYPE (type); diff --git a/gcc/testsuite/gcc.target/powerpc/darwin-abi-12.c b/gcc/testsuite/gcc.target/powerpc/darwin-abi-12.c new file mode 100644 index 00000000000..d02c4868a59 --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/darwin-abi-12.c @@ -0,0 +1,14 @@ +/* { dg-do compile { target powerpc*-*-darwin* } } */ +/* { dg-final { scan-assembler ".comm _x,12,2" } } */ +/* { dg-final { scan-assembler-not ".space 7" } } */ +/* PR 23071 */ + +struct Test { + double D __attribute__((packed,aligned(4))); + short X; +} x; + +struct { + char x; + struct Test t; +} b = { 1, { 2, 3 } };