diff options
| -rw-r--r-- | gcc/c-family/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-family/c-warn.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 22c9547..4fc2f1b 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2018-05-26 Jakub Jelinek <jakub@redhat.com> + + PR bootstrap/85921 + * c-warn.c (diagnose_mismatched_attributes): Remove unnecessary + noinline variable to workaround broken kernel headers. + 2018-05-18 Jason Merrill <jason@redhat.com> * c.opt (Wdeprecated-copy): New flag. diff --git a/gcc/c-family/c-warn.c b/gcc/c-family/c-warn.c index 2614eb5..e7bcbb1 100644 --- a/gcc/c-family/c-warn.c +++ b/gcc/c-family/c-warn.c @@ -2246,18 +2246,16 @@ diagnose_mismatched_attributes (tree olddecl, tree newdecl) newdecl); /* Diagnose inline __attribute__ ((noinline)) which is silly. */ - const char *noinline = "noinline"; - if (DECL_DECLARED_INLINE_P (newdecl) && DECL_UNINLINABLE (olddecl) - && lookup_attribute (noinline, DECL_ATTRIBUTES (olddecl))) + && lookup_attribute ("noinline", DECL_ATTRIBUTES (olddecl))) warned |= warning (OPT_Wattributes, "inline declaration of %qD follows " - "declaration with attribute %qs", newdecl, noinline); + "declaration with attribute %<noinline%>", newdecl); else if (DECL_DECLARED_INLINE_P (olddecl) && DECL_UNINLINABLE (newdecl) && lookup_attribute ("noinline", DECL_ATTRIBUTES (newdecl))) warned |= warning (OPT_Wattributes, "declaration of %q+D with attribute " - "%qs follows inline declaration", newdecl, noinline); + "%<noinline%> follows inline declaration", newdecl); return warned; } |