diff options
| author | pfg <pfg@FreeBSD.org> | 2013-12-21 18:47:00 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2013-12-21 18:47:00 +0000 |
| commit | 68205669abdad29d13f7e6b34f483ac1298065ed (patch) | |
| tree | b0b89f0ab157d77eed267e3b82dd3ee8ed9e980b /contrib/gcc/c-decl.c | |
| parent | 8f82fe8c1f4a70975704e71ccca87132e0d9af6c (diff) | |
| download | FreeBSD-src-68205669abdad29d13f7e6b34f483ac1298065ed.zip FreeBSD-src-68205669abdad29d13f7e6b34f483ac1298065ed.tar.gz | |
MFC r258017, r258429, r258748, r258817:
Merge updates from FSF pre4.3 GCC inspired on Apple's gcc:
Updates to libiberty and mangling.
New align attribute.
Merge Apple updates to libstdc++.
Diffstat (limited to 'contrib/gcc/c-decl.c')
| -rw-r--r-- | contrib/gcc/c-decl.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/contrib/gcc/c-decl.c b/contrib/gcc/c-decl.c index 68ee23b..3cdd69b 100644 --- a/contrib/gcc/c-decl.c +++ b/contrib/gcc/c-decl.c @@ -1690,12 +1690,11 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype) DECL_SIZE (newdecl) = DECL_SIZE (olddecl); DECL_SIZE_UNIT (newdecl) = DECL_SIZE_UNIT (olddecl); DECL_MODE (newdecl) = DECL_MODE (olddecl); - if (TREE_CODE (olddecl) != FUNCTION_DECL) - if (DECL_ALIGN (olddecl) > DECL_ALIGN (newdecl)) - { - DECL_ALIGN (newdecl) = DECL_ALIGN (olddecl); - DECL_USER_ALIGN (newdecl) |= DECL_ALIGN (olddecl); - } + if (DECL_ALIGN (olddecl) > DECL_ALIGN (newdecl)) + { + DECL_ALIGN (newdecl) = DECL_ALIGN (olddecl); + DECL_USER_ALIGN (newdecl) |= DECL_ALIGN (olddecl); + } } |
