10.65: gcc-plugin: Add support for CLVC_INTEGER

This commit is contained in:
Nick Clifton 2022-04-12 17:53:12 +01:00
parent 098cf0d690
commit e0ddeb63a3
3 changed files with 5 additions and 44 deletions

View File

@ -1,42 +0,0 @@
From f278b500124ee9d49cb990f6a0333b28794fddb1 Mon Sep 17 00:00:00 2001
From: sergesanspaille <sguelton@redhat.com>
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<AnnobinModulePass>
{
- 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

View File

@ -1,7 +1,7 @@
Name: annobin
Summary: Annotate and examine compiled binary files
Version: 10.64
Version: 10.65
Release: 1%{?dist}
License: GPLv3+
# Maintainer: nickc@redhat.com
@ -484,6 +484,9 @@ fi
#---------------------------------------------------------------------------------
%changelog
* Tue Apr 12 2022 Nick Clifton <nickc@redhat.com> - 10.65-1
- gcc-plugin: Add support for CLVC_INTEGER options.
* Wed Apr 06 2022 Nick Clifton <nickc@redhat.com> - 10.64-1
- Annocheck: Even more special cases for AArch64 glibc on RHEL-8. (#2072082)

View File

@ -1 +1 @@
SHA512 (annobin-10.64.tar.xz) = e8c6b4cfb7443fb9405ae85b6cd16636e17d08b037c75d104fc80e95d484376f6825e2c9257094c7d9c406233acd9f1ffa8d28024fc6f0d546d7569b0f8b99bc
SHA512 (annobin-10.65.tar.xz) = c7191fc88072431f3c62ae2abe405b88c78b3d703353810aef6bb6bf0c3fa16ad2db84d5e5e940864518474119393454aadc40fdca84bdbba18d686face59ce1