Skip to content

Commit 6c4798d

Browse files
vt-altacmel
authored andcommitted
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]>
1 parent e6d6abf commit 6c4798d

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

tools/include/linux/string.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,15 @@ int strtobool(const char *s, bool *res);
1717
* However uClibc headers also define __GLIBC__ hence the hack below
1818
*/
1919
#if defined(__GLIBC__) && !defined(__UCLIBC__)
20+
// pragma diagnostic was introduced in gcc 4.6
21+
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
22+
#pragma GCC diagnostic push
23+
#pragma GCC diagnostic ignored "-Wredundant-decls"
24+
#endif
2025
extern size_t strlcpy(char *dest, const char *src, size_t size);
26+
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
27+
#pragma GCC diagnostic pop
28+
#endif
2129
#endif
2230

2331
char *str_error_r(int errnum, char *buf, size_t buflen);

tools/lib/string.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ int strtobool(const char *s, bool *res)
9696
* If libc has strlcpy() then that version will override this
9797
* implementation:
9898
*/
99+
#ifdef __clang__
100+
#pragma clang diagnostic push
101+
#pragma clang diagnostic ignored "-Wignored-attributes"
102+
#endif
99103
size_t __weak strlcpy(char *dest, const char *src, size_t size)
100104
{
101105
size_t ret = strlen(src);
@@ -107,6 +111,9 @@ size_t __weak strlcpy(char *dest, const char *src, size_t size)
107111
}
108112
return ret;
109113
}
114+
#ifdef __clang__
115+
#pragma clang diagnostic pop
116+
#endif
110117

111118
/**
112119
* skip_spaces - Removes leading whitespace from @str.

0 commit comments

Comments
 (0)