From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756494AbbHZHaT (ORCPT ); Wed, 26 Aug 2015 03:30:19 -0400 Received: from mga01.intel.com ([192.55.52.88]:48528 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751887AbbHZHaR (ORCPT ); Wed, 26 Aug 2015 03:30:17 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,414,1437462000"; d="scan'208";a="775834304" Message-ID: <55DD6A4D.8060008@intel.com> Date: Wed, 26 Aug 2015 10:27:09 +0300 From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: Jiri Olsa CC: Arnaldo Carvalho de Melo , linux-kernel@vger.kernel.org, Sukadev Bhattiprolu Subject: Re: [PATCH 1/2] perf tools: Fix build on powerpc broken by pt/bts References: <1440499348-15629-1-git-send-email-adrian.hunter@intel.com> <20150825153010.GJ19203@kernel.org> <55DD6349.7040505@intel.com> <20150826072548.GC22670@krava.redhat.com> In-Reply-To: <20150826072548.GC22670@krava.redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 26/08/15 10:25, Jiri Olsa wrote: > On Wed, Aug 26, 2015 at 09:57:13AM +0300, Adrian Hunter wrote: >> On 25/08/15 18:30, Arnaldo Carvalho de Melo wrote: >>> Em Tue, Aug 25, 2015 at 01:42:27PM +0300, Adrian Hunter escreveu: >>>> It is theoretically possible to process perf.data files created on >>>> x86 and that contain Intel PT or Intel BTS data, on any other >>>> architecture, which is why it is possible for there to be build >>>> errors on powerpc caused by pt/bts. >>>> >>>> The errors were: >>>> >>>> util/intel-pt-decoder/intel-pt-insn-decoder.c: In function ‘intel_pt_insn_decoder’: >>>> util/intel-pt-decoder/intel-pt-insn-decoder.c:138:3: error: switch missing default case [-Werror=switch-default] >>>> switch (insn->immediate.nbytes) { >>>> ^ >>>> cc1: all warnings being treated as errors >>>> >>>> linux-acme.git/tools/perf/perf-obj/libperf.a(libperf-in.o): In function `intel_pt_synth_branch_sample': >>>> sources/linux-acme.git/tools/perf/util/intel-pt.c:871: undefined reference to `tsc_to_perf_time' >>>> linux-acme.git/tools/perf/perf-obj/libperf.a(libperf-in.o): In function `intel_pt_sample': >>>> sources/linux-acme.git/tools/perf/util/intel-pt.c:915: undefined reference to `tsc_to_perf_time' >>>> sources/linux-acme.git/tools/perf/util/intel-pt.c:962: undefined reference to `tsc_to_perf_time' >>>> linux-acme.git/tools/perf/perf-obj/libperf.a(libperf-in.o): In function `intel_pt_process_event': >>>> sources/linux-acme.git/tools/perf/util/intel-pt.c:1454: undefined reference to `perf_time_to_tsc' >>>> >>>> Signed-off-by: Adrian Hunter >>>> --- >>>> tools/perf/util/Build | 2 +- >>>> tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c | 3 +++ >>>> 2 files changed, 4 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/tools/perf/util/Build b/tools/perf/util/Build >>>> index e912856cc4e5..8ae31e5131ee 100644 >>>> --- a/tools/perf/util/Build >>>> +++ b/tools/perf/util/Build >>>> @@ -74,7 +74,7 @@ libperf-y += stat-shadow.o >>>> libperf-y += record.o >>>> libperf-y += srcline.o >>>> libperf-y += data.o >>>> -libperf-$(CONFIG_X86) += tsc.o >>>> +libperf-$(if $(CONFIG_X86)$(CONFIG_AUXTRACE),y) += tsc.o >>> >>> I think this is preferred/more clear: >>> >>> libperf-$(CONFIG_X86) += tsc.o >>> libperf-$(CONFIG_AUXTRACE) += tsc.o >> >> I tried that first but it doesn't work: >> >> util/tsc.o: In function `perf_time_to_tsc': >> /mnt/ssd/ahunter/git/linux-perf/tools/perf/util/tsc.c:7: multiple definition of `perf_time_to_tsc' >> util/tsc.o:/mnt/ssd/ahunter/git/linux-perf/tools/perf/util/tsc.c:7: first defined here >> util/tsc.o: In function `tsc_to_perf_time': >> /mnt/ssd/ahunter/git/linux-perf/tools/perf/util/tsc.c:18: multiple definition of `tsc_to_perf_time' >> util/tsc.o:/mnt/ssd/ahunter/git/linux-perf/tools/perf/util/tsc.c:18: first defined here >> make[3]: *** [util/libperf-in.o] Error 1 >> make[2]: *** [util] Error 2 >> make[1]: *** [libperf-in.o] Error 2 >> make: *** [all] Error 2 >> >> I will have a look at why, unless Jiri knows? >> > > I'm now testing attached patch, does it fix it for you? Yup! Thanks Jiri! :-) > > thanks, > jirka > > > --- > diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build > index 8120af9c0341..0c5f485521d6 100644 > --- a/tools/build/Makefile.build > +++ b/tools/build/Makefile.build > @@ -63,7 +63,7 @@ quiet_cmd_gen = GEN $@ > # If there's nothing to link, create empty $@ object. > quiet_cmd_ld_multi = LD $@ > cmd_ld_multi = $(if $(strip $(obj-y)),\ > - $(LD) -r -o $@ $(obj-y),rm -f $@; $(AR) rcs $@) > + $(LD) -r -o $@ $(filter $(obj-y),$^),rm -f $@; $(AR) rcs $@) > > # Build rules > $(OUTPUT)%.o: %.c FORCE > diff --git a/tools/build/tests/ex/Build b/tools/build/tests/ex/Build > index 70d876237c57..429c7d452101 100644 > --- a/tools/build/tests/ex/Build > +++ b/tools/build/tests/ex/Build > @@ -1,6 +1,7 @@ > ex-y += ex.o > ex-y += a.o > ex-y += b.o > +ex-y += b.o > ex-y += empty/ > ex-y += empty2/ > > >