Hello community, here is the log from the commit of package perf for openSUSE:Factory checked in at 2020-06-12 21:46:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perf (Old) and /work/SRC/openSUSE:Factory/.perf.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perf" Fri Jun 12 21:46:35 2020 rev:51 rq:814204 version:MACRO Changes: -------- --- /work/SRC/openSUSE:Factory/perf/perf.changes 2019-10-31 22:21:49.440039298 +0100 +++ /work/SRC/openSUSE:Factory/.perf.new.3606/perf.changes 2020-06-12 21:47:30.577007245 +0200 @@ -1,0 +2,6 @@ +Fri Jun 12 17:02:10 UTC 2020 - Tony Jones <[email protected]> + +- Fix build breakage on aarch64 and armv7 (bsc#1172741) + New patch: perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch + +------------------------------------------------------------------- New: ---- perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perf.spec ++++++ --- /var/tmp/diff_new_pack.G1rNPX/_old 2020-06-12 21:47:32.257016752 +0200 +++ /var/tmp/diff_new_pack.G1rNPX/_new 2020-06-12 21:47:32.261016775 +0200 @@ -1,7 +1,7 @@ # # spec file for package perf # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ Summary: Performance Monitoring Tools for Linux License: GPL-2.0-only Group: Development/Tools/Debuggers -Url: https://perf.wiki.kernel.org/ +URL: https://perf.wiki.kernel.org/ BuildRequires: audit-devel BuildRequires: binutils-devel BuildRequires: bison @@ -61,6 +61,8 @@ Requires: kernel >= 2.6.31 BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch1: perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch + %description This package provides a userspace tool 'perf', which monitors performance for either unmodified binaries or the entire system. It requires a Linux kernel @@ -76,6 +78,8 @@ # don't error out on deprecated definitions in gtk2.h sed -i 's@ignored "-Wstrict-prototypes"@&\n#pragma GCC diagnostic ignored "-Wdeprecated-declarations"@' tools/build/feature/test-gtk2.c +%autopatch -p1 + %build cd tools/perf export WERROR=0 ++++++ perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch ++++++ From: Leo Yan <[email protected]> Date: Tue, 5 May 2020 21:36:42 +0800 Subject: perf cs-etm: Move definition of 'traceid_list' global variable from header file Git-commit: 168200b6d6ea0cb5765943ec5da5b8149701f36a Patch-mainline: v5.8-rc1 References: bsc#1172741 The variable 'traceid_list' is defined in the header file cs-etm.h, if multiple C files include cs-etm.h the compiler might complaint for multiple definition of 'traceid_list'. To fix multiple definition error, move the definition of 'traceid_list' into cs-etm.c. Fixes: cd8bfd8c973e ("perf tools: Add processing of coresight metadata") Reported-by: Thomas Backlund <[email protected]> Signed-off-by: Leo Yan <[email protected]> Reviewed-by: Mathieu Poirier <[email protected]> Reviewed-by: Mike Leach <[email protected]> Tested-by: Mike Leach <[email protected]> Tested-by: Thomas Backlund <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Suzuki Poulouse <[email protected]> Cc: Tor Jeremiassen <[email protected]> Cc: [email protected] Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Tony Jones <[email protected]> --- tools/perf/util/cs-etm.c | 3 +++ tools/perf/util/cs-etm.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 3c802fde4954..c283223fb31f 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -94,6 +94,9 @@ struct cs_etm_queue { struct cs_etm_traceid_queue **traceid_queues; }; +/* RB tree for quick conversion between traceID and metadata pointers */ +static struct intlist *traceid_list; + static int cs_etm__update_queues(struct cs_etm_auxtrace *etm); static int cs_etm__process_queues(struct cs_etm_auxtrace *etm); static int cs_etm__process_timeless_queues(struct cs_etm_auxtrace *etm, diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h index 650ecc2a6349..4ad925d6d799 100644 --- a/tools/perf/util/cs-etm.h +++ b/tools/perf/util/cs-etm.h @@ -114,9 +114,6 @@ enum cs_etm_isa { CS_ETM_ISA_T32, }; -/* RB tree for quick conversion between traceID and metadata pointers */ -struct intlist *traceid_list; - struct cs_etm_queue; struct cs_etm_packet {
