aboutsummaryrefslogtreecommitdiffstats
path: root/tools/lib/string.c
diff options
context:
space:
mode:
authorVitaly Chikunov <[email protected]>2019-12-24 17:20:29 +0000
committerArnaldo Carvalho de Melo <[email protected]>2020-01-06 14:46:10 +0000
commit6c4798d3f08b81c2c52936b10e0fa872590c96ae (patch)
tree9b4a2a980746ee2677468bb496464f2277337df6 /tools/lib/string.c
parentperf report/top: Make 'e' visible in the help and make it toggle showing call... (diff)
downloadkernel-6c4798d3f08b81c2c52936b10e0fa872590c96ae.tar.gz
kernel-6c4798d3f08b81c2c52936b10e0fa872590c96ae.zip
tools lib: Fix builds when glibc contains strlcpy()
Disable a couple of compilation warnings (which are treated as errors) on strlcpy() definition and declaration, allowing users to compile perf and kernel (objtool) when: 1. 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, Committer notes: The #pragma GCC diagnostic directive was introduced in gcc 4.6, so check for that as well. Fixes: ce99091 ("perf tools: Move strlcpy() from perf to tools/lib/string.c") Fixes: 0215d59 ("tools lib: Reinstate strlcpy() header guard with __UCLIBC__") Resolves: https://bugzilla.kernel.org/show_bug.cgi?id=118481 Signed-off-by: Vitaly Chikunov <[email protected]> Reviewed-by: Dmitry Levin <[email protected]> Cc: Dmitry Levin <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: kbuild test robot <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: [email protected] Cc: Vineet Gupta <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Diffstat (limited to 'tools/lib/string.c')
-rw-r--r--tools/lib/string.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/lib/string.c b/tools/lib/string.c
index f2ae1b87c719..f645343815de 100644
--- a/tools/lib/string.c
+++ b/tools/lib/string.c
@@ -96,6 +96,10 @@ int strtobool(const char *s, bool *res)
* If libc has strlcpy() then that version will override this
* implementation:
*/
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wignored-attributes"
+#endif
size_t __weak strlcpy(char *dest, const char *src, size_t size)
{
size_t ret = strlen(src);
@@ -107,6 +111,9 @@ size_t __weak strlcpy(char *dest, const char *src, size_t size)
}
return ret;
}
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
/**
* skip_spaces - Removes leading whitespace from @str.