From 689a7f6f5474dee466cabfe019137f0f188211d9 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 30 Apr 2021 09:50:06 +0100 Subject: [PATCH] gcc-plugin: Replace ICE messsages with verbose messages. --- annobin.spec | 43 +++++++++++++++++++++++++++++++++++-------- sources | 2 +- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/annobin.spec b/annobin.spec index 61a3615..54205e4 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 9.69 +Version: 9.70 Release: 1%{?dist} License: GPLv3+ # ProtocolURL: https://fedoraproject.org/wiki/Toolchain/Watermark @@ -131,14 +131,19 @@ Requires: annobin-plugin-llvm Requires: annobin-plugin-clang %endif -BuildRequires: gcc gcc-plugin-devel gcc-c++ # The documentation uses pod2man... -BuildRequires: perl-interpreter perl-podlators -%if %{with clangplugin} -BuildRequires: clang clang-devel llvm llvm-devel compiler-rt gawk +BuildRequires: gcc perl-interpreter perl-podlators gawk + +%if %{with gccplugin} +BuildRequires: gcc-c++ gcc-plugin-devel %endif + +%if %{with clangplugin} +BuildRequires: clang clang-devel llvm llvm-devel compiler-rt +%endif + %if %{with llvmplugin} -BuildRequires: clang clang-devel llvm llvm-devel compiler-rt gawk +BuildRequires: clang clang-devel llvm llvm-devel compiler-rt %endif %description @@ -187,6 +192,10 @@ Requires: %{name}-docs = %{version}-%{release} Provides a means to test the generation of annotated binaries and the parsing of the resulting files. +%if %{with debuginfod} +BuildRequires: elfutils-debuginfod-client-devel +%endif + %endif #---------------------------------------------------------------------------- @@ -197,9 +206,9 @@ Summary: A tool for checking the security hardening status of binaries BuildRequires: gcc elfutils elfutils-devel elfutils-libelf-devel rpm-devel binutils-devel %if %{with debuginfod} -BuildRequires: elfutils-debuginfod-client-devel -BuildRequires: make +BuildRequires: elfutils-debuginfod-client-devel make %endif + Requires: %{name}-docs = %{version}-%{release} %description annocheck @@ -283,6 +292,12 @@ CONFIG_ARGS="--quiet --with-gcc-plugin-dir=%{ANNOBIN_GCC_PLUGIN_DIR}" %if %{with debuginfod} CONFIG_ARGS="$CONFIG_ARGS --with-debuginfod" %else +# Note - we explicitly disable debuginfod support if it was not configured. +# This is because by default annobin's configue script will assume --with-debuginfod=auto +# and then run a build time test to see if debugingfod is available. It +# may well be, but the build time environment may not match the run time +# environment, and the rpm will not have a Requirement on the debuginfod +# client. CONFIG_ARGS="$CONFIG_ARGS --without-debuginfod" %endif @@ -368,6 +383,15 @@ make check if [ -f tests/test-suite.log ]; then cat tests/test-suite.log fi + +%if %{with clangplugin} +# FIXME: RUN CLANG tests +%endif + +%if %{with llvmplugin} +# FIXME: RUN LLVM tests +%endif + %endif #--------------------------------------------------------------------------------- @@ -408,6 +432,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Fri Apr 30 2021 Nick Clifton - 9.70-1 +- gcc-plugin: Replace ICE messsages with verbose messages. + * Thu Apr 22 2021 Nick Clifton - 9.69-1 - Fix the testsuite so that it can be run in parallel. diff --git a/sources b/sources index ebbeded..320e93d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-9.69.tar.xz) = 8a9c4beb27a9cc74883ac1542f89e0b38c2854896b94e5889e0cc8ad36207175e5b6227d8834ad847215948242d165a101c97e395dfc64637999393b4f4a193b +SHA512 (annobin-9.70.tar.xz) = 08a04dff35601b0a704a9ecc26baa3b005dfc2c3290d98a5f3960ed21aca45e5730729150d941aacdd8ddc0b36a6d8792051d2d4326f3e5013dd7d946e4b2544