linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vitaly Chikunov <vt@altlinux.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	linux-kernel@vger.kernel.org
Cc: "Dmitry V . Levin" <ldv@altlinux.org>,
	Josh Poimboeuf <jpoimboe@redhat.com>,
	Vineet Gupta <Vineet.Gupta1@synopsys.com>,
	stable@vger.kernel.org
Subject: [PATCH] tools lib: Disable redundant-delcs error for strlcpy
Date: Mon,  9 Dec 2019 00:46:07 +0300	[thread overview]
Message-ID: <20191208214607.20679-1-vt@altlinux.org> (raw)

Disable `redundant-decls' error for strlcpy declaration and solve build
error allowing users to compile vanilla kernels.

When glibc have strlcpy (such as in ALT linux since 2004) objtool and
perf build fails with something like:

  In file included from exec-cmd.c:3:
  tools/include/linux/string.h:20:15: error: redundant redeclaration of ‘strlcpy’ [-Werror=redundant-decls]
     20 | extern size_t strlcpy(char *dest, const char *src, size_t size);
	|               ^~~~~~~

It's very hard to produce a perfect fix for that since it is a header
file indirectly pulled from many sources from different Makefile builds.

Fixes: ce99091 ("perf tools: Move strlcpy() from perf to tools/lib/string.c")
Fixes: 0215d59 ("tools lib: Reinstate strlcpy() header guard with __UCLIBC__")
Signed-off-by: Vitaly Chikunov <vt@altlinux.org>
Cc: Dmitry V. Levin <ldv@altlinux.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
Cc: stable@vger.kernel.org
---
 tools/include/linux/string.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/include/linux/string.h b/tools/include/linux/string.h
index 980cb9266718..99ede7f5dfb8 100644
--- a/tools/include/linux/string.h
+++ b/tools/include/linux/string.h
@@ -17,7 +17,10 @@ int strtobool(const char *s, bool *res);
  * However uClibc headers also define __GLIBC__ hence the hack below
  */
 #if defined(__GLIBC__) && !defined(__UCLIBC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wredundant-decls"
 extern size_t strlcpy(char *dest, const char *src, size_t size);
+#pragma GCC diagnostic pop
 #endif
 
 char *str_error_r(int errnum, char *buf, size_t buflen);
-- 
2.11.0


             reply	other threads:[~2019-12-08 21:55 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-08 21:46 Vitaly Chikunov [this message]
2019-12-08 22:13 ` [PATCH] tools lib: Disable redundant-delcs error for strlcpy Dmitry V. Levin
2019-12-17 12:23 ` Vitaly Chikunov
2019-12-17 20:04   ` Arnaldo Carvalho de Melo
2019-12-20  2:52     ` Vitaly Chikunov
2019-12-20 12:31       ` Arnaldo Carvalho de Melo
2019-12-20 16:41         ` Vitaly Chikunov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191208214607.20679-1-vt@altlinux.org \
    --to=vt@altlinux.org \
    --cc=Vineet.Gupta1@synopsys.com \
    --cc=acme@kernel.org \
    --cc=jpoimboe@redhat.com \
    --cc=ldv@altlinux.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).