summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-Adjust-to-build-with-llvm-17.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-Adjust-to-build-with-llvm-17.patch')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-Adjust-to-build-with-llvm-17.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-Adjust-to-build-with-llvm-17.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-Adjust-to-build-with-llvm-17.patch
deleted file mode 100644
index 6720ea0..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-Adjust-to-build-with-llvm-17.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From 3aa0c5caadb03b1c30d0ac366dbc7b592076dc43 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 6 Jul 2023 08:59:41 -0700
4Subject: [PATCH] Adjust to build with llvm 17
5
6PassManagerBuilder has been removed in llvm 17
7itaniumDemangle() API signature has changed too
8
9Upstream-Status: Submitted [https://github.com/iovisor/bpftrace/pull/2667]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/ast/passes/codegen_llvm.cpp | 4 ++++
13 src/cxxdemangler/cxxdemangler_llvm.cpp | 4 ++++
14 2 files changed, 8 insertions(+)
15
16diff --git a/src/ast/passes/codegen_llvm.cpp b/src/ast/passes/codegen_llvm.cpp
17index 1af2a23e..49ab8c9d 100644
18--- a/src/ast/passes/codegen_llvm.cpp
19+++ b/src/ast/passes/codegen_llvm.cpp
20@@ -7,7 +7,9 @@
21 #include <ctime>
22 #include <fstream>
23
24+#if LLVM_VERSION_MAJOR <= 16
25 #include <llvm-c/Transforms/IPO.h>
26+#endif
27 #include <llvm/IR/Constants.h>
28 #include <llvm/IR/LLVMContext.h>
29 #include <llvm/IR/LegacyPassManager.h>
30@@ -17,7 +19,9 @@
31 #include <llvm/Passes/PassBuilder.h>
32 #endif
33 #include <llvm/Transforms/IPO.h>
34+#if LLVM_VERSION_MAJOR <= 16
35 #include <llvm/Transforms/IPO/PassManagerBuilder.h>
36+#endif
37 #if LLVM_VERSION_MAJOR >= 14
38 #include <llvm/MC/TargetRegistry.h>
39 #else
40diff --git a/src/cxxdemangler/cxxdemangler_llvm.cpp b/src/cxxdemangler/cxxdemangler_llvm.cpp
41index e9a9db24..1b0bf7ea 100644
42--- a/src/cxxdemangler/cxxdemangler_llvm.cpp
43+++ b/src/cxxdemangler/cxxdemangler_llvm.cpp
44@@ -6,7 +6,11 @@ namespace bpftrace {
45
46 char* cxxdemangle(const char* mangled)
47 {
48+#if LLVM_VERSION_MAJOR <= 16
49 return llvm::itaniumDemangle(mangled, nullptr, nullptr, nullptr);
50+#else
51+ return llvm::itaniumDemangle(mangled);
52+#endif
53 }
54
55 } // namespace bpftrace
56--
572.41.0
58