gcc/

2008-02-27  Jan Beulich  <jbeulich@novell.com>

	* c-decl.c (merge_decls): Use DECL_USER_ALIGN() on olddecl to
	update the respective field on newdecl.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132719 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6c71d6f..2ba91ba 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-27  Jan Beulich  <jbeulich@novell.com>
+
+       * c-decl.c (merge_decls): Use DECL_USER_ALIGN() on olddecl to
+       update the respective field on newdecl.
+
 2008-02-27  Revital Eres  <eres@il.ibm.com>
 
        PR rtl-optimization/34999

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 7a60040..04b36d5 100644 (file)
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -1667,7 +1667,7 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
       if (DECL_ALIGN (olddecl) > DECL_ALIGN (newdecl))
        {
          DECL_ALIGN (newdecl) = DECL_ALIGN (olddecl);
-         DECL_USER_ALIGN (newdecl) |= DECL_ALIGN (olddecl);
+         DECL_USER_ALIGN (newdecl) |= DECL_USER_ALIGN (olddecl);
        }
     }