Disable a couple of compilation warning (which are treated as errors) on strlcpy definition and declaration, allow users to compile perf and kernel (objtool).
1. When glibc have strlcpy (such as in ALT Linux since 2004) objtool and perf build fails with this (in gcc):
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);
2. Clang ignores `-Wredundant-decls', but produces another warning when building perf:
CC util/string.o ../lib/string.c:99:8: error: attribute declaration must precede definition [-Werror,-Wignored-attributes] size_t __weak strlcpy(char *dest, const char *src, size_t size) ../../tools/include/linux/compiler.h:66:34: note: expanded from macro '__weak' # define __weak __attribute__((weak)) /usr/include/bits/string_fortified.h:151:8: note: previous definition is here __NTH (strlcpy (char *__restrict __dest, const char *__restrict __src,
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 +++ tools/lib/string.c | 3 +++ 2 files changed, 6 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); diff --git a/tools/lib/string.c b/tools/lib/string.c index f2ae1b87c719..65b569014446 100644 --- a/tools/lib/string.c +++ b/tools/lib/string.c @@ -96,6 +96,8 @@ int strtobool(const char *s, bool *res) * If libc has strlcpy() then that version will override this * implementation: */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wignored-attributes" size_t __weak strlcpy(char *dest, const char *src, size_t size) { size_t ret = strlen(src); @@ -107,6 +109,7 @@ size_t __weak strlcpy(char *dest, const char *src, size_t size) } return ret; } +#pragma GCC diagnostic pop
/** * skip_spaces - Removes leading whitespace from @str.