diff --git a/0001-Compatibility-patch-for-llvm14.patch b/0001-Compatibility-patch-for-llvm14.patch new file mode 100644 index 0000000..c4d260e --- /dev/null +++ b/0001-Compatibility-patch-for-llvm14.patch @@ -0,0 +1,42 @@ +From f278b500124ee9d49cb990f6a0333b28794fddb1 Mon Sep 17 00:00:00 2001 +From: sergesanspaille +Date: Wed, 30 Mar 2022 16:07:17 +0200 +Subject: [PATCH] Compatibility patch for llvm14 + +--- + llvm-plugin/annobin.cpp | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/llvm-plugin/annobin.cpp b/llvm-plugin/annobin.cpp +index a119ab9..6a43580 100644 +--- a/llvm-plugin/annobin.cpp ++++ b/llvm-plugin/annobin.cpp +@@ -484,9 +484,14 @@ namespace + + struct AnnobinModulePass : llvm::PassInfoMixin + { +- llvm::PassBuilder::OptimizationLevel OptLevel; ++#if __clang_major__ > 13 ++ using OptimizationLevel = llvm::OptimizationLevel; ++#else ++ using OptimizationLevel = llvm::PassBuilder::OptimizationLevel; ++#endif ++ OptimizationLevel OptLevel; + +- AnnobinModulePass(llvm::PassBuilder::OptimizationLevel OptLevel) : OptLevel(OptLevel) {} ++ AnnobinModulePass(OptimizationLevel OptLevel) : OptLevel(OptLevel) {} + llvm::PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM) + { + AnnobinModule Annobin; +@@ -505,7 +510,7 @@ llvm::PassPluginLibraryInfo getAnnobinLLVMPluginInfo () + { + PB.registerPipelineStartEPCallback + ([](llvm::ModulePassManager &PM, +- llvm::PassBuilder::OptimizationLevel Level) ++ AnnobinModulePass::OptimizationLevel Level) + { + PM.addPass(AnnobinModulePass(Level)); + }); +-- +1.8.3.1 + diff --git a/annobin.spec b/annobin.spec index 0810957..2353148 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 10.59 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ # Maintainer: nickc@redhat.com # Web Page: https://sourceware.org/annobin/ @@ -67,6 +67,7 @@ Source: https://nickc.fedorapeople.org/%{annobin_sources} # Insert patches here, if needed. Eg: # Patch01: annobin-foo.patch +Patch01: 0001-Compatibility-patch-for-llvm14.patch #--------------------------------------------------------------------------------- @@ -483,6 +484,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Mar 30 2022 Serge Guelton - 10.59-2 +- Rebuilt against new LLVM release, with patch. + * Wed Mar 30 2022 Nick Clifton - 10.59-1 - Annocheck: Fix test for AArch64 property notes. (#2068657)