From: Jan Beulich <jbeulich@novell.com>
Date: Wed, 27 Feb 2008 14:59:50 +0000 (+0000)
Subject: c-decl.c (merge_decls): Use DECL_USER_ALIGN() on olddecl to update the respective... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8220334aba6972297dc4409274fa428aff724696;p=gcc.git

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

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.

From-SVN: r132719
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6c71d6fc2e3..2ba91ba2863 100644
--- 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 7a600409cbb..04b36d50d88 100644
--- 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);
 	}
     }