Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Panu Matilainen
6c3330fefc Really enable annocheck sub-package
Commit 4656334c92 supposedly added
annocheck as a sub-package but is missing the corresponding %files
section, which causes the whole sub-package to be ignored and annocheck
ending up in the main annobin package. Which creates a nasty "bootstrap"
dependency issue for compilation when rpm soname changes.

(cherry picked from commit fcc5d2b097)
2019-06-20 21:02:11 +02:00
Nick Clifton
5744d75eed Ensure GNU Property notes are 8-byte aligned in x86_64 binaries.
Resolves: #1645817
2018-11-05 16:49:04 +00:00
2 changed files with 24 additions and 1 deletions

View file

@ -0,0 +1,14 @@
--- annobin.orig/plugin/x86_64.annobin.cc 2018-11-05 16:31:45.253977255 +0000
+++ annobin-8.23/plugin/x86_64.annobin.cc 2018-11-05 16:35:40.572266029 +0000
@@ -239,7 +239,10 @@ annobin_target_specific_loader_notes (vo
annobin_inform (1, "Creating notes for the dynamic loader");
fprintf (asm_out_file, "\t.section %s, \"a\", %%note\n", NOTE_GNU_PROPERTY_SECTION_NAME);
- fprintf (asm_out_file, "\t.balign 4\n");
+ if (annobin_is_64bit)
+ fprintf (asm_out_file, "\t.balign 8\n");
+ else
+ fprintf (asm_out_file, "\t.balign 4\n");
ptr = buffer;

View file

@ -12,7 +12,7 @@
Name: annobin
Summary: Binary annotation plugin for GCC
Version: 8.23
Release: 1%{?dist}
Release: 3%{?dist}
License: GPLv3+
URL: https://fedoraproject.org/wiki/Toolchain/Watermark
@ -35,6 +35,8 @@ Source: https://nickc.fedorapeople.org/annobin-%{version}.tar.xz
# Insert patches here, if needed.
# Patch01: annobin-xxx.patch
Patch01: annobin-8-byte-align-property-notes.patch
#---------------------------------------------------------------------------------
BuildRequires: gcc gcc-plugin-devel gcc-c++
@ -193,6 +195,7 @@ make check
%doc %{_mandir}/man1/run-on-binaries-in.1.gz
%if %{with annocheck}
%files annocheck
%{_bindir}/annocheck
%doc %{_mandir}/man1/annocheck.1.gz
%endif
@ -200,6 +203,12 @@ make check
#---------------------------------------------------------------------------------
%changelog
* Thu Jun 06 2019 Panu Matilainen <pmatilai@redhat.com> - 8.23-3
- Really enable annocheck sub-package
* Mon Nov 05 2018 Nick Clifton <nickc@redhat.com> - 8.23-2
- Ensure GNU Property notes are 8-byte aligned in x86_64 binaries. (#1645817)
* Wed Aug 08 2018 Nick Clifton <nickc@redhat.com> - 8.23-1
- Skip checks in __stack_chk_local_fail.