From 12263f13ac02720a2e67f4837533b93752fb154b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 12 Sep 2017 16:35:39 +0000 Subject: [PATCH] Don't warn function alignment if warn_if_not_aligned_p is true When warn_if_not_aligned_p is true, a warning will be issued on function declaration later. There is no need to warn function alignment when warn_if_not_aligned_p is true. * c-attribs.c (common_handle_aligned_attribute): Don't warn function alignment if warn_if_not_aligned_p is true. From-SVN: r252036 --- gcc/c-family/ChangeLog | 5 +++++ gcc/c-family/c-attribs.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 29037e5af8fc..6391ced934d4 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2017-09-12 H.J. Lu + + * c-attribs.c (common_handle_aligned_attribute): Don't warn + function alignment if warn_if_not_aligned_p is true. + 2017-09-12 Nathan Sidwell * c-common.c (field_decl_cmp, resort_data, resort_field_decl_cmp, diff --git a/gcc/c-family/c-attribs.c b/gcc/c-family/c-attribs.c index 4f6638fd99e0..0337537ecbde 100644 --- a/gcc/c-family/c-attribs.c +++ b/gcc/c-family/c-attribs.c @@ -1754,9 +1754,12 @@ common_handle_aligned_attribute (tree *node, tree args, int flags, This formally comes from the c++11 specification but we are doing it for the GNU attribute syntax as well. */ *no_add_attrs = true; - else if (TREE_CODE (decl) == FUNCTION_DECL + else if (!warn_if_not_aligned_p + && TREE_CODE (decl) == FUNCTION_DECL && DECL_ALIGN (decl) > (1U << i) * BITS_PER_UNIT) { + /* Don't warn function alignment here if warn_if_not_aligned_p is + true. It will be warned later. */ if (DECL_USER_ALIGN (decl)) error ("alignment for %q+D was previously specified as %d " "and may not be decreased", decl, -- 2.43.5