aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2008-02-27 14:59:50 +0000
committerJan Beulich <jbeulich@gcc.gnu.org>2008-02-27 14:59:50 +0000
commit8220334aba6972297dc4409274fa428aff724696 (patch)
tree4cb13b52bb9ff5ca8411d140d98498fe82344389 /gcc
parentb5a4419cde676a67cd150feeef3babea43e5af8c (diff)
downloadgcc-8220334aba6972297dc4409274fa428aff724696.zip
gcc-8220334aba6972297dc4409274fa428aff724696.tar.gz
gcc-8220334aba6972297dc4409274fa428aff724696.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-decl.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6c71d6f..2ba91ba 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 7a60040..04b36d5 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);
}
}