From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753951AbcHQUBJ (ORCPT ); Wed, 17 Aug 2016 16:01:09 -0400 Received: from smtprelay2.synopsys.com ([198.182.60.111]:46606 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753113AbcHQUBI (ORCPT ); Wed, 17 Aug 2016 16:01:08 -0400 From: Vineet Gupta To: Arnaldo Carvalho de Melo CC: , , osh Poimboeuf , Vineet Gupta , Adrian Hunter , Alexey Brodkin , David Ahern , Jiri Olsa , Namhyung Kim , Wang Nan , Petri Gynther , Peter Zijlstra Subject: [PATCH] tools lib: Reinstate strlcpy() header guard with __UCLIBC__ Date: Wed, 17 Aug 2016 13:00:50 -0700 Message-ID: <1471464050-18044-1-git-send-email-vgupta@synopsys.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.9.130.119] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org perf tools build in recent kernels spews splat when cross compiling with uClibc | CC util/alias.o | In file included from tools/perf/util/../ui/../util/cache.h:8:0, | from tools/perf/util/../ui/helpline.h:7, | from tools/perf/util/debug.h:8, | from arch/../util/cpumap.h:9, | from arch/../util/env.h:5, | from arch/common.h:4, | from arch/common.c:3: | tools/include/linux/string.h:12:15: warning: redundant redeclaration of ‘strlcpy’ [-Wredundant-decls] | extern size_t strlcpy(char *dest, const char *src, size_t size); ^ This is after commit 61a6445e463a31 ("tools lib: Guard the strlcpy() header with __GLIBC__"). While the commit was right in theory, issue is uClibc also defines __GLIBC__ for application headers. Instead of reverting the commit, manually revert with some addeed commentary to same effect. Cc: Adrian Hunter Cc: Alexey Brodkin Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Cc: Petri Gynther Cc: Peter Zijlstra (Intel) Signed-off-by: Vineet Gupta --- tools/include/linux/string.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/include/linux/string.h b/tools/include/linux/string.h index b96879477311..5a9e30334ffa 100644 --- a/tools/include/linux/string.h +++ b/tools/include/linux/string.h @@ -8,7 +8,12 @@ void *memdup(const void *src, size_t len); int strtobool(const char *s, bool *res); -#ifdef __GLIBC__ +/* + * Ideally instead of blacklisting libs which define this already (uclibc, + * musl..), we could whitelist libs which reuire it (glibc). However uClibc + * also defines __GLIBC__ for user application headers + */ +#ifndef __UCLIBC__ extern size_t strlcpy(char *dest, const char *src, size_t size); #endif -- 2.7.4