From ab0ada59ab14c9da15f2fcd14219524d5aef963b Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 12 Mar 2020 11:12:19 +0000 Subject: [PATCH 01/14] NVR bump to enable rebuild against updated gcc. Related: #1810941 --- annobin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/annobin.spec b/annobin.spec index c85a3a9..6e56b28 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Binary annotation plugin for GCC Version: 9.06 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # Maintainer: nickc@redhat.com @@ -241,6 +241,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Thu Mar 12 2020 Nick Clifton - 9.06-2 +- NVR bump to enable rebuild against updated gcc. (#1810941) + * Tue Feb 11 2020 Nick Clifton - 9.06-1 - Annobin: Note when stack clash notes are generated. - Annocheck: Handle multiple builder IDs in the .comment section. From 7de481b6d8d89d7d0e113e65beeb1f6c49d4b87d Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 13 Mar 2020 09:54:29 +0000 Subject: [PATCH 02/14] NVR bump to enable rebuild against updated gcc (F32 iteration). Related: #1810941 --- annobin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 6e56b28..843680a 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Binary annotation plugin for GCC Version: 9.06 -Release: 2%{?dist} +Release: 4%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # Maintainer: nickc@redhat.com @@ -44,7 +44,7 @@ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # in the size of gcc's global_options structure. In order to rebuild annobin # against the changed gcc it is necessary to disable annobin as otherwise # the configuration step of annobin's build will fail. -# %%undefine _annotated_build +%undefine _annotated_build #--------------------------------------------------------------------------------- Source: https://nickc.fedorapeople.org/annobin-%{version}.tar.xz @@ -241,6 +241,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Fri Mar 13 2020 Nick Clifton - 9.06-3 +- NVR bump to enable rebuild against updated gcc (F32 iteration). (#1810941) + * Thu Mar 12 2020 Nick Clifton - 9.06-2 - NVR bump to enable rebuild against updated gcc. (#1810941) From 652edd22ed2b454056d42d6f724a8577c2b95d39 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 26 Mar 2020 12:18:07 +0000 Subject: [PATCH 03/14] NVR bump to allow rebuilding against new gcc --- annobin.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 843680a..b00e774 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Binary annotation plugin for GCC Version: 9.06 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # Maintainer: nickc@redhat.com @@ -241,7 +241,13 @@ fi #--------------------------------------------------------------------------------- %changelog -* Fri Mar 13 2020 Nick Clifton - 9.06-3 +* Thu Mar 26 2020 Nick Clifton - 9.06-6 +- NVR bump to enable rebuild against updated gcc. + +* Fri Mar 13 2020 Nick Clifton - 9.06-5 +- NVR bump to enable rebuild against updated gcc with the new annobin installed in the buildroot. (#1810941) + +* Fri Mar 13 2020 Nick Clifton - 9.06-4 - NVR bump to enable rebuild against updated gcc (F32 iteration). (#1810941) * Thu Mar 12 2020 Nick Clifton - 9.06-2 From eece91e97d691395af5dec26275298840d9d0287 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 26 Mar 2020 16:14:53 +0000 Subject: [PATCH 04/14] Use offsets stored in gcc's cl_option structure to access the global_options array, thus removing the need to check for changes in the size of this structure. Rename gcc plugin directory to gcc-plugin. Stop annocheck from complaining about missing options when the binary has been built in a mixed environment. Improve builtby tool. Stop annocheck complaining about missing notes when the binary is not compiled by either gcc or clang. Skip the check of the ENTRY instruction for binaries not compiled by gcc or clang. (#1809656) Fix infinite loop hangup in annocheck. Disable debuginfod support by default. Improve parsing of .comment section. Fix clang plugin to use hidden symbols. Add ability to build clang plugin (disabled by default). Annocheck: Fix error printing out the version number. Annobin: Add checks of the exact location of the examined switches. --- .gitignore | 1 + annobin.spec | 30 +++++++++++++++++++++++------- sources | 2 +- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 9b973c8..00a9cc3 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,4 @@ /annobin-9.04.tar.xz /annobin-9.05.tar.xz /annobin-9.06.tar.xz +/annobin-9.14.tar.xz diff --git a/annobin.spec b/annobin.spec index b00e774..5b502bd 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,8 +1,8 @@ Name: annobin Summary: Binary annotation plugin for GCC -Version: 9.06 -Release: 6%{?dist} +Version: 9.14 +Release: 1%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # Maintainer: nickc@redhat.com @@ -44,7 +44,7 @@ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # in the size of gcc's global_options structure. In order to rebuild annobin # against the changed gcc it is necessary to disable annobin as otherwise # the configuration step of annobin's build will fail. -%undefine _annotated_build +# %%undefine _annotated_build #--------------------------------------------------------------------------------- Source: https://nickc.fedorapeople.org/annobin-%{version}.tar.xz @@ -165,7 +165,7 @@ echo "Requires: (gcc >= %{gcc_major} with gcc < %{gcc_next})" # The plugin has to be configured with the same arcane configure # scripts used by gcc. Hence we must not allow the Fedora build # system to regenerate any of the configure files. -touch aclocal.m4 plugin/config.h.in +touch aclocal.m4 gcc-plugin/config.h.in touch configure */configure Makefile.in */Makefile.in # Similarly we do not want to rebuild the documentation. touch doc/annobin.info @@ -187,12 +187,12 @@ touch doc/annobin.info # double annotations in it. (If the build system enables annotations # for plugins by default). I have not tested this yet, but I think # that it should be OK. -cp plugin/.libs/annobin.so.0.0.0 %{_tmppath}/tmp_annobin.so -make -C plugin clean +cp gcc-plugin/.libs/annobin.so.0.0.0 %{_tmppath}/tmp_annobin.so +make -C gcc-plugin clean BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so -fplugin-arg-tmp_annobin-rename" # If building on RHEL7, enable the next option as the .attach_to_group assembler pseudo op is not available in the assembler. # BUILD_FLAGS="$BUILD_FLAGS -fplugin-arg-tmp_annobin-no-attach" -make -C plugin CXXFLAGS="%{optflags} $BUILD_FLAGS" +make -C gcc-plugin CXXFLAGS="%{optflags} $BUILD_FLAGS" rm %{_tmppath}/tmp_annobin.so #--------------------------------------------------------------------------------- @@ -241,6 +241,22 @@ fi #--------------------------------------------------------------------------------- %changelog + +* Thu Mar 26 2020 Nick Clifton - 9.14-1 +- Use offsets stored in gcc's cl_option structure to access the global_options array, thus removing the need to check for changes in the size of this structure. +- Rename gcc plugin directory to gcc-plugin. +- Stop annocheck from complaining about missing options when the binary has been built in a mixed environment. +- Improve builtby tool. +- Stop annocheck complaining about missing notes when the binary is not compiled by either gcc or clang. +- Skip the check of the ENTRY instruction for binaries not compiled by gcc or clang. (#1809656) +- Fix infinite loop hangup in annocheck. +- Disable debuginfod support by default. +- Improve parsing of .comment section. +- Fix clang plugin to use hidden symbols. +- Add ability to build clang plugin (disabled by default). +- Annocheck: Fix error printing out the version number. +- Annobin: Add checks of the exact location of the examined switches. + * Thu Mar 26 2020 Nick Clifton - 9.06-6 - NVR bump to enable rebuild against updated gcc. diff --git a/sources b/sources index 6c8344c..717d46c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-9.06.tar.xz) = 72bf0675de0dd28908526cf2c7ef400dda21538f94e80d9211711b73d1d876ab7519f6c848867f873e207a647700055e6a4b1cec46ac84353f33d869aebf6a53 +SHA512 (annobin-9.14.tar.xz) = 39d2b6d67ce6303bf375b157c04dc58a46cba3467f8003f50892caffa8d7c8e4f3fddbf5f09468aa29b05fc7deb7a7610a153a84e0d6d3b10bd04f9e990eb1c6 From 9d32ae06fac0b8b675b45c69b2d103ff170fa5ed Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 30 Mar 2020 10:43:16 +0100 Subject: [PATCH 05/14] Annobin: Fix access to the -flto and -fsanitize flags. --- .gitignore | 1 + annobin.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 00a9cc3..976189e 100644 --- a/.gitignore +++ b/.gitignore @@ -123,3 +123,4 @@ /annobin-9.05.tar.xz /annobin-9.06.tar.xz /annobin-9.14.tar.xz +/annobin-9.16.tar.xz diff --git a/annobin.spec b/annobin.spec index 5b502bd..42f406e 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Binary annotation plugin for GCC -Version: 9.14 +Version: 9.16 Release: 1%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark @@ -44,7 +44,7 @@ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # in the size of gcc's global_options structure. In order to rebuild annobin # against the changed gcc it is necessary to disable annobin as otherwise # the configuration step of annobin's build will fail. -# %%undefine _annotated_build +%undefine _annotated_build #--------------------------------------------------------------------------------- Source: https://nickc.fedorapeople.org/annobin-%{version}.tar.xz @@ -241,6 +241,8 @@ fi #--------------------------------------------------------------------------------- %changelog +* Mon Mar 30 2020 Nick Clifton - 9.16-1 +- Annobin: Fix access to the -flto and -fsanitize flags. * Thu Mar 26 2020 Nick Clifton - 9.14-1 - Use offsets stored in gcc's cl_option structure to access the global_options array, thus removing the need to check for changes in the size of this structure. diff --git a/sources b/sources index 717d46c..ca984f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-9.14.tar.xz) = 39d2b6d67ce6303bf375b157c04dc58a46cba3467f8003f50892caffa8d7c8e4f3fddbf5f09468aa29b05fc7deb7a7610a153a84e0d6d3b10bd04f9e990eb1c6 +SHA512 (annobin-9.16.tar.xz) = 8de941e4db9f355d7584ed97d524dcb021ff14375a2d79ee4b112d3e6a308bd9c6f5bdacab38f40fc94ca0f7f895aa41dc98e0dea772561028084c7c79fbda39 From b6230191a214de7eff39e829a1e114b9289ff13f Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 30 Mar 2020 11:04:13 +0100 Subject: [PATCH 06/14] NVR bump to rebuild with the new annobin. --- annobin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 42f406e..68618dc 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Binary annotation plugin for GCC Version: 9.16 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # Maintainer: nickc@redhat.com @@ -44,7 +44,7 @@ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # in the size of gcc's global_options structure. In order to rebuild annobin # against the changed gcc it is necessary to disable annobin as otherwise # the configuration step of annobin's build will fail. -%undefine _annotated_build +# %%undefine _annotated_build #--------------------------------------------------------------------------------- Source: https://nickc.fedorapeople.org/annobin-%{version}.tar.xz @@ -241,6 +241,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Mon Mar 30 2020 Nick Clifton - 9.16-2 +- NVR bump to rebuild with the new annobin. + * Mon Mar 30 2020 Nick Clifton - 9.16-1 - Annobin: Fix access to the -flto and -fsanitize flags. From 7b10140287ff2b4a27992ea1ee8bff1f6059e2af Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 30 Mar 2020 11:42:35 +0100 Subject: [PATCH 07/14] Fixes for rebuilding. --- annobin.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/annobin.spec b/annobin.spec index 68618dc..e5ab5c8 100644 --- a/annobin.spec +++ b/annobin.spec @@ -44,7 +44,7 @@ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # in the size of gcc's global_options structure. In order to rebuild annobin # against the changed gcc it is necessary to disable annobin as otherwise # the configuration step of annobin's build will fail. -# %%undefine _annotated_build +%undefine _annotated_build #--------------------------------------------------------------------------------- Source: https://nickc.fedorapeople.org/annobin-%{version}.tar.xz @@ -158,7 +158,7 @@ if [ -z "%{gcc_vr}" ]; then exit 1 fi -echo "Requires: (gcc >= %{gcc_major} with gcc < %{gcc_next})" +echo "Requires: (gcc >= %{gcc_major} and gcc < %{gcc_next})" %autosetup -p1 @@ -175,9 +175,9 @@ touch doc/annobin.info %build %if %{with debuginfod} -%configure --quiet --with-gcc-plugin-dir=%{ANNOBIN_PLUGIN_DIR} --with-debuginfod +%configure --quiet --with-gcc-plugin-dir=%{ANNOBIN_PLUGIN_DIR} --with-debuginfod || cat config.log %else -%configure --quiet --with-gcc-plugin-dir=%{ANNOBIN_PLUGIN_DIR} +%configure --quiet --with-gcc-plugin-dir=%{ANNOBIN_PLUGIN_DIR} || cat config.log %endif %make_build From fdb341191eb79aebd351c895488cec8076366196 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 30 Mar 2020 17:14:45 +0100 Subject: [PATCH 08/14] Annocheck: Fix a division by zero error when parsing GO binaries. Resolves: #1818863 --- .gitignore | 1 + annobin.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 976189e..a6a4b3e 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,4 @@ /annobin-9.06.tar.xz /annobin-9.14.tar.xz /annobin-9.16.tar.xz +/annobin-9.18.tar.xz diff --git a/annobin.spec b/annobin.spec index e5ab5c8..d54808f 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,8 +1,8 @@ Name: annobin Summary: Binary annotation plugin for GCC -Version: 9.16 -Release: 2%{?dist} +Version: 9.18 +Release: 1%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # Maintainer: nickc@redhat.com @@ -44,7 +44,7 @@ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # in the size of gcc's global_options structure. In order to rebuild annobin # against the changed gcc it is necessary to disable annobin as otherwise # the configuration step of annobin's build will fail. -%undefine _annotated_build +# %%undefine _annotated_build #--------------------------------------------------------------------------------- Source: https://nickc.fedorapeople.org/annobin-%{version}.tar.xz @@ -241,6 +241,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Mon Mar 30 2020 Nick Clifton - 9.18-1 +- Annocheck: Fix a division by zero error when parsing GO binaries. (#1818863) + * Mon Mar 30 2020 Nick Clifton - 9.16-2 - NVR bump to rebuild with the new annobin. diff --git a/sources b/sources index ca984f6..9314557 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-9.16.tar.xz) = 8de941e4db9f355d7584ed97d524dcb021ff14375a2d79ee4b112d3e6a308bd9c6f5bdacab38f40fc94ca0f7f895aa41dc98e0dea772561028084c7c79fbda39 +SHA512 (annobin-9.18.tar.xz) = cd7b19ffde8dcab6bcf75e997d743ccbbd3bcd17690061cb1a2ff05651bfbb43b37df408b6efc4e683d52ae5654dfaf23b56e1c3c58928759610576afdcd9346 From 1989d6b51604fbe3269f0f9c6d23ce5d3c2382fe Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 1 Apr 2020 14:09:47 +0100 Subject: [PATCH 09/14] Annobin: If option name mismatch occurs, seach for the real option. (#1817452) --- .gitignore | 1 + annobin.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a6a4b3e..5748fbc 100644 --- a/.gitignore +++ b/.gitignore @@ -125,3 +125,4 @@ /annobin-9.14.tar.xz /annobin-9.16.tar.xz /annobin-9.18.tar.xz +/annobin-9.19.tar.xz diff --git a/annobin.spec b/annobin.spec index d54808f..e6ace4d 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Binary annotation plugin for GCC -Version: 9.18 +Version: 9.19 Release: 1%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark @@ -241,6 +241,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Apr 01 2020 Nick Clifton - 9.19-1 +- Annobin: If option name mismatch occurs, seach for the real option. (#1817452) + * Mon Mar 30 2020 Nick Clifton - 9.18-1 - Annocheck: Fix a division by zero error when parsing GO binaries. (#1818863) diff --git a/sources b/sources index 9314557..14c198d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-9.18.tar.xz) = cd7b19ffde8dcab6bcf75e997d743ccbbd3bcd17690061cb1a2ff05651bfbb43b37df408b6efc4e683d52ae5654dfaf23b56e1c3c58928759610576afdcd9346 +SHA512 (annobin-9.19.tar.xz) = 5fbedd42123f1c7ff73a3bd4afca3941cfcc702bc49e2de7b32548badd2f06cd0c69abea676fc11fb96c6e0ccdb94bbe9e445bbc6a0c4866d6353280cfc4248b From fd0e28fa793a44d201bac02c26717b770911c9cd Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 4 May 2020 10:31:48 +0100 Subject: [PATCH 10/14] Annobin: Fall back on using the flags if the option cannot be found in cl_options. Annocheck: Detect Fortran compiled programs. Resolves: #1817659 --- .gitignore | 1 + annobin.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5748fbc..4466fe7 100644 --- a/.gitignore +++ b/.gitignore @@ -126,3 +126,4 @@ /annobin-9.16.tar.xz /annobin-9.18.tar.xz /annobin-9.19.tar.xz +/annobin-9.21.tar.xz diff --git a/annobin.spec b/annobin.spec index e6ace4d..6b51230 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Binary annotation plugin for GCC -Version: 9.19 +Version: 9.21 Release: 1%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark @@ -241,6 +241,10 @@ fi #--------------------------------------------------------------------------------- %changelog +* Mon May 04 2020 Nick Clifton - 9.21-1 +- Annobin: Fall back on using the flags if the option cannot be found in cl_options. (#1817659) +- Annocheck: Detect Fortran compiled programs. (#1824393) + * Wed Apr 01 2020 Nick Clifton - 9.19-1 - Annobin: If option name mismatch occurs, seach for the real option. (#1817452) diff --git a/sources b/sources index 14c198d..fed9b7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-9.19.tar.xz) = 5fbedd42123f1c7ff73a3bd4afca3941cfcc702bc49e2de7b32548badd2f06cd0c69abea676fc11fb96c6e0ccdb94bbe9e445bbc6a0c4866d6353280cfc4248b +SHA512 (annobin-9.21.tar.xz) = baf1c9f90b6bcfdc5db865a5f897edcac4abe6449cf520cdec856bbca9741a937798196603b486259d0981216b2e8363ee003a9c5d1cfffe5a2a65284ab53e34 From 5584ddf8de3f54cb1d77615413f9301d27cce384 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 29 Jul 2020 16:19:36 +0100 Subject: [PATCH 11/14] Rebase to 9.25 - fixing AArch64 pointer size problems. --- .gitignore | 1 + annobin.spec | 27 ++++++++++++++++++--------- sources | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 4466fe7..dd88879 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,4 @@ /annobin-9.18.tar.xz /annobin-9.19.tar.xz /annobin-9.21.tar.xz +/annobin-9.25.tar.xz diff --git a/annobin.spec b/annobin.spec index 6b51230..1714e4e 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Binary annotation plugin for GCC -Version: 9.21 +Version: 9.25 Release: 1%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark @@ -148,7 +148,7 @@ hardening options. #--------------------------------------------------------------------------------- -%global ANNOBIN_PLUGIN_DIR %(gcc --print-file-name=plugin) +%global ANNOBIN_GCC_PLUGIN_DIR %(gcc --print-file-name=plugin) #--------------------------------------------------------------------------------- @@ -174,13 +174,22 @@ touch doc/annobin.info %build +CONFIG_ARGS= + %if %{with debuginfod} -%configure --quiet --with-gcc-plugin-dir=%{ANNOBIN_PLUGIN_DIR} --with-debuginfod || cat config.log +CONFIG_ARGS="$CONFIG_ARGS --with-debuginfod" %else -%configure --quiet --with-gcc-plugin-dir=%{ANNOBIN_PLUGIN_DIR} || cat config.log +CONFIG_ARGS="$CONFIG_ARGS --without-debuginfod" %endif +%if %{without tests} +CONFIG_ARGS="$CONFIG_ARGS --without-test" +%endif + +%configure --quiet --with-gcc-plugin-dir=%{ANNOBIN_GCC_PLUGIN_DIR} ${CONFIG_ARGS} || cat config.log + %make_build + # Rebuild the plugin, this time using the plugin itself! This # ensures that the plugin works, and that it contains annotations # of its own. This could mean that we end up with a plugin with @@ -216,11 +225,7 @@ fi #--------------------------------------------------------------------------------- %files -%{ANNOBIN_PLUGIN_DIR} -%{_bindir}/built-by -%{_bindir}/check-abi -%{_bindir}/hardened -%{_bindir}/run-on-binaries-in +%{ANNOBIN_GCC_PLUGIN_DIR} %license COPYING3 LICENSE %exclude %{_datadir}/doc/annobin-plugin/COPYING3 %exclude %{_datadir}/doc/annobin-plugin/LICENSE @@ -241,6 +246,10 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Jul 29 2020 Nick Clifton - 9.25-1 +- Improved target pointer size discovery. +- Annocheck: Do not skip tests of the short-enums notes. (#1743635) + * Mon May 04 2020 Nick Clifton - 9.21-1 - Annobin: Fall back on using the flags if the option cannot be found in cl_options. (#1817659) - Annocheck: Detect Fortran compiled programs. (#1824393) diff --git a/sources b/sources index fed9b7a..28528de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-9.21.tar.xz) = baf1c9f90b6bcfdc5db865a5f897edcac4abe6449cf520cdec856bbca9741a937798196603b486259d0981216b2e8363ee003a9c5d1cfffe5a2a65284ab53e34 +SHA512 (annobin-9.25.tar.xz) = a103724a0ae54962c8dcb08cff20872032fd99649de95da3022e34f94572c57898022f4c8abab5dda724e8333d803c59a9f7afb36108fb76cafbfc765fd6664f From cd1ece23e93586354376e341bf06558ecca51648 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 31 Jul 2020 12:10:52 +0100 Subject: [PATCH 12/14] Use more robust checks for AArch64 options. Detect CLANG compiled assembler that is missing IBT support. --- .gitignore | 1 + annobin.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dd88879..060b690 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,4 @@ /annobin-9.19.tar.xz /annobin-9.21.tar.xz /annobin-9.25.tar.xz +/annobin-9.27.tar.xz diff --git a/annobin.spec b/annobin.spec index 1714e4e..b071077 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Binary annotation plugin for GCC -Version: 9.25 +Version: 9.27 Release: 1%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark @@ -44,7 +44,7 @@ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # in the size of gcc's global_options structure. In order to rebuild annobin # against the changed gcc it is necessary to disable annobin as otherwise # the configuration step of annobin's build will fail. -# %%undefine _annotated_build +%undefine _annotated_build #--------------------------------------------------------------------------------- Source: https://nickc.fedorapeople.org/annobin-%{version}.tar.xz @@ -246,6 +246,10 @@ fi #--------------------------------------------------------------------------------- %changelog +* Fri Jul 31 2020 Nick Clifton - 9.27-1 +- Use more robust checks for AArch64 options. +- Detect CLANG compiled assembler that is missing IBT support. + * Wed Jul 29 2020 Nick Clifton - 9.25-1 - Improved target pointer size discovery. - Annocheck: Do not skip tests of the short-enums notes. (#1743635) diff --git a/sources b/sources index 28528de..888c6f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-9.25.tar.xz) = a103724a0ae54962c8dcb08cff20872032fd99649de95da3022e34f94572c57898022f4c8abab5dda724e8333d803c59a9f7afb36108fb76cafbfc765fd6664f +SHA512 (annobin-9.27.tar.xz) = 35911c21486b0222f09367d7dae7b119fd2af9a42ee0a3973375770fd17d33e4453b45509e96f50150df99d2610698a690c1ef419199aec7df77be079acc8efd From db20a08ea63d83ae937fb9f90c23a77b33896e25 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 6 Oct 2020 20:41:01 +0200 Subject: [PATCH 13/14] Rebuilt for gcc 10.2.1-5 --- annobin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/annobin.spec b/annobin.spec index b071077..a3b22e2 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Binary annotation plugin for GCC Version: 9.27 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # Maintainer: nickc@redhat.com @@ -246,6 +246,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Tue Oct 06 2020 Jakub Jelinek - 9.28-2 +- Rebuilt for gcc 10.2.1-5 + * Fri Jul 31 2020 Nick Clifton - 9.27-1 - Use more robust checks for AArch64 options. - Detect CLANG compiled assembler that is missing IBT support. From d1f1948339618a2916eda62301498a268b3c936e Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sun, 25 Apr 2021 19:07:31 +0200 Subject: [PATCH 14/14] 9.27-3 --- annobin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index a3b22e2..753c327 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Binary annotation plugin for GCC Version: 9.27 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ URL: https://fedoraproject.org/wiki/Toolchain/Watermark # Maintainer: nickc@redhat.com @@ -246,7 +246,10 @@ fi #--------------------------------------------------------------------------------- %changelog -* Tue Oct 06 2020 Jakub Jelinek - 9.28-2 +* Sun Apr 25 2021 Jakub Jelinek - 9.27-3 +- Rebuilt for gcc 10.3.1-1 + +* Tue Oct 06 2020 Jakub Jelinek - 9.27-2 - Rebuilt for gcc 10.2.1-5 * Fri Jul 31 2020 Nick Clifton - 9.27-1