commit: b0e6a7dc74c51984376d4f0a70087ce0d7c26eeb Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Thu Feb 18 16:56:52 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Thu Feb 18 23:02:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e6a7dc
dev-util/perf: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/19521 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> dev-util/perf/files/perf-5.1.15-fix-clang8.patch | 17 ------ .../perf/files/perf-5.4.20-binutil-libs-2.34.patch | 60 ---------------------- dev-util/perf/files/perf-5.4.6-fix-clang9.patch | 17 ------ .../perf/files/perf-5.4.7-propagate-cflags.patch | 44 ---------------- 4 files changed, 138 deletions(-) diff --git a/dev-util/perf/files/perf-5.1.15-fix-clang8.patch b/dev-util/perf/files/perf-5.1.15-fix-clang8.patch deleted file mode 100644 index 743f4b017b1..00000000000 --- a/dev-util/perf/files/perf-5.1.15-fix-clang8.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/678652 -Created-By: Maciej S. Szmigiero <m...@maciej.szmigiero.name> ---- ---- a/tools/build/feature/test-clang.cpp 2018-12-24 00:55:59.000000000 +0100 -+++ b/tools/build/feature/test-clang.cpp 2019-04-06 16:05:56.828757243 +0200 -@@ -1,10 +1,10 @@ - // SPDX-License-Identifier: GPL-2.0 --#include "clang/Basic/VirtualFileSystem.h" - #include "clang/Driver/Driver.h" - #include "clang/Frontend/TextDiagnosticPrinter.h" - #include "llvm/ADT/IntrusiveRefCntPtr.h" - #include "llvm/Support/ManagedStatic.h" - #include "llvm/Support/raw_ostream.h" -+#include "llvm/Support/VirtualFileSystem.h" - - using namespace clang; - using namespace clang::driver; diff --git a/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch b/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch deleted file mode 100644 index 9fa191f720a..00000000000 --- a/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 Mon Sep 17 00:00:00 2001 -From: Changbin Du <changbin...@gmail.com> -Date: Tue, 28 Jan 2020 23:29:38 +0800 -Subject: perf: Make perf able to build with latest libbfd - -libbfd has changed the bfd_section_* macros to inline functions -bfd_section_<field> since 2019-09-18. See below two commits: - o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html - o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html - -This fix make perf able to build with both old and new libbfd. - -Signed-off-by: Changbin Du <changbin...@gmail.com> -Acked-by: Jiri Olsa <jo...@redhat.com> -Cc: Peter Zijlstra <pet...@infradead.org> -Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin...@gmail.com -Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> ---- - tools/perf/util/srcline.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c -index 6ccf6f6..5b7d6c1 100644 ---- a/tools/perf/util/srcline.c -+++ b/tools/perf/util/srcline.c -@@ -193,16 +193,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) - bfd_vma pc, vma; - bfd_size_type size; - struct a2l_data *a2l = data; -+ flagword flags; - - if (a2l->found) - return; - -- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) -+#ifdef bfd_get_section_flags -+ flags = bfd_get_section_flags(abfd, section); -+#else -+ flags = bfd_section_flags(section); -+#endif -+ if ((flags & SEC_ALLOC) == 0) - return; - - pc = a2l->addr; -+#ifdef bfd_get_section_vma - vma = bfd_get_section_vma(abfd, section); -+#else -+ vma = bfd_section_vma(section); -+#endif -+#ifdef bfd_get_section_size - size = bfd_get_section_size(section); -+#else -+ size = bfd_section_size(section); -+#endif - - if (pc < vma || pc >= vma + size) - return; --- -cgit v1.1 - diff --git a/dev-util/perf/files/perf-5.4.6-fix-clang9.patch b/dev-util/perf/files/perf-5.4.6-fix-clang9.patch deleted file mode 100644 index 614e62f676d..00000000000 --- a/dev-util/perf/files/perf-5.4.6-fix-clang9.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/695726 -Created-By: Maciej S. Szmigiero <m...@maciej.szmigiero.name> -Created-By: Dennis Schridde <devuran...@gmx.net> ---- a/tools/perf/util/c++/clang.cpp.orig 2019-12-20 16:39:21.015363866 +0100 -+++ b/tools/perf/util/c++/clang.cpp 2019-12-20 16:40:04.051639185 +0100 -@@ -71,7 +71,11 @@ - CompilerInstance Clang; - Clang.createDiagnostics(); - -+#if CLANG_VERSION_MAJOR < 9 - Clang.setVirtualFileSystem(&*VFS); -+#else -+ Clang.createFileManager(&*VFS); -+#endif - - #if CLANG_VERSION_MAJOR < 4 - IntrusiveRefCntPtr<CompilerInvocation> CI = diff --git a/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch b/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch deleted file mode 100644 index b1a9bcc25a1..00000000000 --- a/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 55542113c690a567e728e40d4181d7d037fc21b0 Mon Sep 17 00:00:00 2001 -From: Jiri Olsa <jo...@kernel.org> -Date: Fri, 11 Oct 2019 14:21:55 +0200 -Subject: perf tools: Propagate CFLAGS to libperf - -Andi reported that 'make DEBUG=1' does not propagate to the libbperf -code. It's true also for the other flags. Changing the code to propagate -the global build flags to libperf compilation. - -Reported-by: Andi Kleen <a...@linux.intel.com> -Signed-off-by: Jiri Olsa <jo...@kernel.org> -Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> -Cc: Michael Petlan <mpet...@redhat.com> -Cc: Namhyung Kim <namhy...@kernel.org> -Cc: Peter Zijlstra <pet...@infradead.org> -Link: http://lore.kernel.org/lkml/20191011122155.15738-1-jo...@kernel.org -Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> ---- - tools/perf/lib/core.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -(limited to 'tools/perf/lib/core.c') - -diff --git a/tools/perf/lib/core.c b/tools/perf/lib/core.c -index d0b9ae422b9f..58fc894b76c5 100644 ---- a/tools/perf/lib/core.c -+++ b/tools/perf/lib/core.c -@@ -5,11 +5,12 @@ - #include <stdio.h> - #include <stdarg.h> - #include <unistd.h> -+#include <linux/compiler.h> - #include <perf/core.h> - #include <internal/lib.h> - #include "internal.h" - --static int __base_pr(enum libperf_print_level level, const char *format, -+static int __base_pr(enum libperf_print_level level __maybe_unused, const char *format, - va_list args) - { - return vfprintf(stderr, format, args); --- -cgit 1.2-0.3.lf.el7 -
