From 438dd33afc7918f60426137c8e8a26fc260af462 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 16 Aug 2021 19:09:10 +0000 Subject: [PATCH] Rebuild for LLVM 13.0.0-rc1 --- ...flegacy-pass-manager-option-to-the-t.patch | 27 +++++++++++++++++++ annobin.spec | 8 +++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-llvm-plugin-Add-flegacy-pass-manager-option-to-the-t.patch diff --git a/0001-llvm-plugin-Add-flegacy-pass-manager-option-to-the-t.patch b/0001-llvm-plugin-Add-flegacy-pass-manager-option-to-the-t.patch new file mode 100644 index 0000000..17a1626 --- /dev/null +++ b/0001-llvm-plugin-Add-flegacy-pass-manager-option-to-the-t.patch @@ -0,0 +1,27 @@ +From bda340f0754972944ec115a72f1a8547ffa21f1c Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Mon, 16 Aug 2021 18:04:53 +0000 +Subject: [PATCH] llvm-plugin: Add -flegacy-pass-manager option to the test + case + +The plugin does not work with the new pass manager yet. +--- + llvm-plugin/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/llvm-plugin/Makefile.in b/llvm-plugin/Makefile.in +index bdd8b19..92bcc9a 100644 +--- a/llvm-plugin/Makefile.in ++++ b/llvm-plugin/Makefile.in +@@ -48,7 +48,7 @@ PLUGIN_TEST_OPTIONS = \ + # -fcf-protection \ + + check: @srcdir@/hello.c +- @ $(CLANG) -Xclang -load -Xclang $(PLUGIN) $(PLUGIN_TEST_OPTIONS) -c @srcdir@/hello.c ++ @ $(CLANG) -flegacy-pass-manager -Xclang -load -Xclang $(PLUGIN) $(PLUGIN_TEST_OPTIONS) -c @srcdir@/hello.c + @ $(READELF) --wide --notes hello.o > llvm-plugin-test.out + @ grep --silent -e "annobin built by llvm version" llvm-plugin-test.out + @ grep --silent -e "running on LLVM version" llvm-plugin-test.out +-- +2.26.2 + diff --git a/annobin.spec b/annobin.spec index 3999bb3..ab33227 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 9.87 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ # Maintainer: nickc@redhat.com # Web Page: https://sourceware.org/annobin/ @@ -61,6 +61,9 @@ Source: https://nickc.fedorapeople.org/annobin-%{version}.tar.xz # Insert patches here, if needed. Eg: # Patch01: annobin-foo.patch +# We need to force use of legacy pass manager until annobin is ported to the new +# pass manager. +Patch0: 0001-llvm-plugin-Add-flegacy-pass-manager-option-to-the-t.patch #--------------------------------------------------------------------------------- @@ -460,6 +463,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Aug 16 2021 Tom Stellard - 9.87-2 +- Rebuild for LLVM 13.0.0-rc1 + * Mon Aug 16 2021 Nick Clifton - 9.87-1 - Annocheck: Fix memory corruption. (#1988715)