diff options
author | Denys Dmytriyenko <denys@konsulko.com> | 2024-07-15 19:45:38 -0400 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2024-07-17 09:11:43 -0500 |
commit | 5d658dc3907e3b57181641eabbcb65fa054a445e (patch) | |
tree | 4c9a8228ba68528844d8a6f0f9b0660af0b70abb | |
parent | fb23cc6a0f53fbbfe31a457b5f7a381281cfa2ea (diff) | |
download | meta-ti-5d658dc3907e3b57181641eabbcb65fa054a445e.tar.gz |
linux: remove old unused patches
These patches are not used anywhere now.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2 files changed, 0 insertions, 157 deletions
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-gcc-plugins-Fix-build-for-upcoming-GCC-release.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-gcc-plugins-Fix-build-for-upcoming-GCC-release.patch deleted file mode 100644 index 3dfa31a1..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/0001-gcc-plugins-Fix-build-for-upcoming-GCC-release.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 3cd29a3d7c25cca9989e7d8966141f725fa99c68 Mon Sep 17 00:00:00 2001 | ||
2 | From: Palmer Dabbelt <palmer@rivosinc.com> | ||
3 | Date: Fri, 13 Jan 2023 09:30:33 -0800 | ||
4 | Subject: [PATCH] gcc-plugins: Fix build for upcoming GCC release | ||
5 | |||
6 | The upcoming GCC release has refactored the gimple plugin interface a | ||
7 | bit and unless gimple-iterator.h is included before gimple-fold.h I end | ||
8 | up with a bunch of missing declarations when building the stack | ||
9 | protector plugin. | ||
10 | |||
11 | Upstream-Status: Backport [https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/] | ||
12 | Reported-by: Palmer Dabbelt <palmer@rivosinc.com> | ||
13 | Acked-by: Palmer Dabbelt <palmer@rivosinc.com> | ||
14 | Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/ | ||
15 | Cc: linux-hardening@vger.kernel.org | ||
16 | Signed-off-by: Kees Cook <keescook@chromium.org> | ||
17 | --- | ||
18 | scripts/gcc-plugins/gcc-common.h | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | --- a/scripts/gcc-plugins/gcc-common.h | ||
22 | +++ b/scripts/gcc-plugins/gcc-common.h | ||
23 | @@ -108,7 +108,9 @@ | ||
24 | #include "varasm.h" | ||
25 | #include "stor-layout.h" | ||
26 | #include "internal-fn.h" | ||
27 | +#include "gimple.h" | ||
28 | #include "gimple-expr.h" | ||
29 | +#include "gimple-iterator.h" | ||
30 | #include "gimple-fold.h" | ||
31 | #include "context.h" | ||
32 | #include "tree-ssa-alias.h" | ||
33 | @@ -124,13 +126,10 @@ | ||
34 | #include "gimplify.h" | ||
35 | #endif | ||
36 | |||
37 | -#include "gimple.h" | ||
38 | - | ||
39 | #if BUILDING_GCC_VERSION >= 4009 | ||
40 | #include "tree-ssa-operands.h" | ||
41 | #include "tree-phinodes.h" | ||
42 | #include "tree-cfg.h" | ||
43 | -#include "gimple-iterator.h" | ||
44 | #include "gimple-ssa.h" | ||
45 | #include "ssa-iterators.h" | ||
46 | #endif | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch b/meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch deleted file mode 100644 index e1e04c34..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch +++ /dev/null | |||
@@ -1,111 +0,0 @@ | |||
1 | |||
2 | Adaption of a patch [A] applied to meta-arm for the kernel. But since TI has it's own | ||
3 | kernel we have to "adjust" the patch to match our files. | ||
4 | |||
5 | [A] https://patchwork.yoctoproject.org/project/arm/patch/20220824025819.4888-1-jon.mason@arm.com/#5104 | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Ryan Eatmon <reatmon@ti.com> | ||
10 | |||
11 | |||
12 | |||
13 | From 1b2013986271de39360cf79e62ed9b7d2cc59f9b Mon Sep 17 00:00:00 2001 | ||
14 | From: Andres Freund <andres@anarazel.de> | ||
15 | Date: Wed, 22 Jun 2022 11:19:18 -0700 | ||
16 | Subject: [PATCH] init_disassemble_info() signature changes causes compile | ||
17 | failures | ||
18 | MIME-Version: 1.0 | ||
19 | Content-Type: text/plain; charset=UTF-8 | ||
20 | Content-Transfer-Encoding: 8bit | ||
21 | |||
22 | Hi, | ||
23 | |||
24 | binutils changed the signature of init_disassemble_info(), which now causes | ||
25 | perf and bpftool to fail to compile (e.g. on debian unstable). | ||
26 | |||
27 | Relevant binutils commit: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=60a3da00bd5407f07d64dff82a4dae98230dfaac | ||
28 | |||
29 | util/annotate.c: In function ?symbol__disassemble_bpf?: | ||
30 | util/annotate.c:1765:9: error: too few arguments to function ?init_disassemble_info? | ||
31 | 1765 | init_disassemble_info(&info, s, | ||
32 | | ^~~~~~~~~~~~~~~~~~~~~ | ||
33 | In file included from util/annotate.c:1718: | ||
34 | /usr/include/dis-asm.h:472:13: note: declared here | ||
35 | 472 | extern void init_disassemble_info (struct disassemble_info *dinfo, void *stream, | ||
36 | | ^~~~~~~~~~~~~~~~~~~~~ | ||
37 | |||
38 | with equivalent failures in | ||
39 | |||
40 | tools/bpf/bpf_jit_disasm.c | ||
41 | tools/bpf/bpftool/jit_disasm.c | ||
42 | |||
43 | The fix is easy enough, add a wrapper around fprintf() that conforms to the | ||
44 | new signature. | ||
45 | |||
46 | However I assume the necessary feature test and wrapper should only be added | ||
47 | once? I don't know the kernel stuff well enough to choose the right structure | ||
48 | here. | ||
49 | |||
50 | Attached is my local fix for perf. Obviously would need work to be a real | ||
51 | solution. | ||
52 | |||
53 | Greetings, | ||
54 | |||
55 | Andres Freund | ||
56 | --- | ||
57 | |||
58 | binutils 2.39 changed the signature of init_disassemble_info(), | ||
59 | which now causes perf and bpftool to fail to compile. | ||
60 | |||
61 | Relevant binutils commit: [1] | ||
62 | |||
63 | There is a proper fix in development upstream[2]. | ||
64 | This is a work-around for older kernels. | ||
65 | |||
66 | [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=60a3da00bd5407f07d64dff82a4dae98230dfaac | ||
67 | [2] https://patchwork.kernel.org/project/netdevbpf/cover/20220801013834.156015-1-andres@anarazel.de/ | ||
68 | |||
69 | Upstream-Status: Pending | ||
70 | Signed-off-by: Anton Antonov <Anton.Antonov@arm.com> | ||
71 | |||
72 | |||
73 | tools/perf/util/annotate.c | 15 ++++++++++++++- | ||
74 | 1 file changed, 14 insertions(+), 1 deletion(-) | ||
75 | |||
76 | diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c | ||
77 | index 308189454788..6573d2b07548 100644 | ||
78 | --- a/tools/perf/util/annotate.c | ||
79 | +++ b/tools/perf/util/annotate.c | ||
80 | @@ -1685,6 +1685,18 @@ | ||
81 | #include <bfd.h> | ||
82 | #include <dis-asm.h> | ||
83 | |||
84 | +static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) | ||
85 | +{ | ||
86 | + va_list args; | ||
87 | + int r; | ||
88 | + | ||
89 | + va_start(args, fmt); | ||
90 | + r = vprintf(fmt, args); | ||
91 | + va_end(args); | ||
92 | + | ||
93 | + return r; | ||
94 | +} | ||
95 | + | ||
96 | static int symbol__disassemble_bpf(struct symbol *sym, | ||
97 | struct annotate_args *args) | ||
98 | { | ||
99 | @@ -1727,7 +1739,8 @@ static int symbol__disassemble_bpf(struct symbol *sym, | ||
100 | goto out; | ||
101 | } | ||
102 | init_disassemble_info(&info, s, | ||
103 | - (fprintf_ftype) fprintf); | ||
104 | + (fprintf_ftype) fprintf, | ||
105 | + fprintf_styled); | ||
106 | |||
107 | info.arch = bfd_get_arch(bfdf); | ||
108 | info.mach = bfd_get_mach(bfdf); | ||
109 | -- | ||
110 | 2.17.1 | ||
111 | |||