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/builtins.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/builtins.c')
| -rw-r--r-- | contrib/gcc/builtins.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/contrib/gcc/builtins.c b/contrib/gcc/builtins.c index ffae159..88c4668 100644 --- a/contrib/gcc/builtins.c +++ b/contrib/gcc/builtins.c @@ -315,9 +315,7 @@ get_pointer_alignment (tree exp, unsigned int max_align) else if (offset) inner = MIN (inner, BITS_PER_UNIT); } - if (TREE_CODE (exp) == FUNCTION_DECL) - align = FUNCTION_BOUNDARY; - else if (DECL_P (exp)) + if (DECL_P (exp)) align = MIN (inner, DECL_ALIGN (exp)); #ifdef CONSTANT_ALIGNMENT else if (CONSTANT_CLASS_P (exp)) |
