r184242 - in /branches/gcc-4_6-branch/gcc: Chan...

[jakub@gcc.gnu.org]

Author: jakub
Date: Tue Feb 14 23:34:34 2012
New Revision: 184242

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=184242
Log:
	Backported from mainline
	2012-02-14  Jakub Jelinek  <jakub@redhat.com>

	PR c/52181
	* c-decl.c (merge_decls): Copy DECL_USER_ALIGN bit from olddecl to
	newdecl.

	* decl.c (duplicate_decls): If olddecl has bigger DECL_ALIGN than
	newdecl, copy DECL_ALIGN to newdecl and or DECL_USER_ALIGN bits.

	* c-c++-common/pr52181.c: New test.

Added:
    branches/gcc-4_6-branch/gcc/testsuite/c-c++-common/pr52181.c
Modified:
    branches/gcc-4_6-branch/gcc/ChangeLog
    branches/gcc-4_6-branch/gcc/c-decl.c
    branches/gcc-4_6-branch/gcc/cp/ChangeLog
    branches/gcc-4_6-branch/gcc/cp/decl.c
    branches/gcc-4_6-branch/gcc/testsuite/ChangeLog