From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnaldo Carvalho de Melo Subject: Re: perf tools build broken after v5.1-rc1 Date: Thu, 2 May 2019 10:36:18 -0400 Message-ID: <20190502143618.GH21436@kernel.org> References: <20190422152027.GB11750@kernel.org> <20190501204115.GF21436@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+gla-linux-snps-arc=m.gmane.org@lists.infradead.org To: Vineet Gupta Cc: "linux-perf-users@vger.kernel.org" , Rich Felker , Arnd Bergmann , Arnaldo Carvalho de Melo , lkml , Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , arcml List-Id: linux-perf-users.vger.kernel.org Em Wed, May 01, 2019 at 09:17:52PM +0000, Vineet Gupta escreveu: > On 5/1/19 1:41 PM, Arnaldo Carvalho de Melo wrote: > >> The 1a787fc5ba18ac7 commit copied over the changes for arm64, but > >> missed all the other architectures changed in c8ce48f06503 and the > >> related commits. > > Right, I have a patch copying the missing headers, and that fixed the > > build with the glibc-based toolchain, but then broke the uCLibc one :-\ > tools/perf/util/cloexec.c #includes which for glibc includes > asm/unistd.h > uClibc OTOH #include containign#define __NR_* > (generated by parsing kernel's unistd). This header does the right thing by > chekcing for redefs, but in the end we still collide with newly added > tools/arc/arc/*/**/unistd.h which doesn't have conditional definitions. I'm sure > this is not an ARC problem, any uClibc build would be affected. Do you have a arm > uclibc toolchain to test ? This solves it for fedora:29, arc_gnu_2017.09-rc2_prebuilt_uclibc_le_arc700_linux_install, arc_gnu_2019.03-rc1_prebuilt_uclibc_le_archs_linux_install and arc_gnu_2019.03-rc1_prebuilt_glibc_le_archs_linux_install. Also ok with: make -C tools/perf build-test Now build testing with the full set of containers. - Arnaldo commit 1931594a680dba28e98b526192dd065430c850c0 Author: Arnaldo Carvalho de Melo Date: Thu May 2 09:26:23 2019 -0400 perf tools: Remove needless asm/unistd.h include fixing build in some places We were including sys/syscall.h and asm/unistd.h, since sys/syscall.h includes asm/unistd.h, sometimes this leads to the redefinition of defines, breaking the build. Noticed on ARC with uCLibc. Cc: Adrian Hunter Cc: Arnaldo Carvalho de Melo Cc: Arnd Bergmann Cc: Jiri Olsa Cc: Namhyung Kim Cc: Rich Felker Cc: Vineet Gupta Link: https://lkml.kernel.org/n/tip-xjpf80o64i2ko74aj2jih0qg@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo diff --git a/tools/perf/util/cloexec.c b/tools/perf/util/cloexec.c index ca0fff6272be..06f48312c5ed 100644 --- a/tools/perf/util/cloexec.c +++ b/tools/perf/util/cloexec.c @@ -7,7 +7,6 @@ #include "asm/bug.h" #include "debug.h" #include -#include #include static unsigned long flag = PERF_FLAG_FD_CLOEXEC;