Nerf some new gcc 'features'

For now, completely nerf annobin and -fstack-clash-protection; at least
one of those things makes grubx64.efi crash on start.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-01-18 18:22:02 -05:00
parent a91fed7f66
commit 28076bb004
2 changed files with 8 additions and 1 deletions

View file

@ -18,6 +18,9 @@
sed \\\ sed \\\
-e 's/-O. //g' \\\ -e 's/-O. //g' \\\
-e 's/-g /-g3 /g' \\\ -e 's/-g /-g3 /g' \\\
-e 's/-fstack-clash-protection //g' \\\
-e 's/-fplugin=annobin //g' \\\
-e 's,-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 ,,g' \\\
-e 's/-fstack-protector[[:alpha:]-]\\+//g' \\\ -e 's/-fstack-protector[[:alpha:]-]\\+//g' \\\
-e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]\\+//g' \\\ -e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]\\+//g' \\\
-e 's/--param=ssp-buffer-size=4//g' \\\ -e 's/--param=ssp-buffer-size=4//g' \\\
@ -25,6 +28,7 @@
-e 's/-fexceptions//g' \\\ -e 's/-fexceptions//g' \\\
-e 's/-fasynchronous-unwind-tables//g' \\\ -e 's/-fasynchronous-unwind-tables//g' \\\
-e 's/^/ -fno-strict-aliasing /' \\\ -e 's/^/ -fno-strict-aliasing /' \\\
-e 's/^/ -fno-stack-clash-protection /' \\\
%{nil} %{nil}
%global efi_cflags \\\ %global efi_cflags \\\

View file

@ -7,7 +7,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.02 Version: 2.02
Release: 21%{?dist} Release: 22%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base Group: System Environment/Base
License: GPLv3+ License: GPLv3+
@ -454,6 +454,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Jan 18 2018 Peter Jones <pjones@redhat.com> - 2.02-22
- Nerf some gcc 7.2.1-6 'features' that cause grub to crash on start.
* Thu Jan 18 2018 Peter Jones <pjones@redhat.com> - 2.02-21 * Thu Jan 18 2018 Peter Jones <pjones@redhat.com> - 2.02-21
- Fix grub2-efi-modules provides/obsoletes generation - Fix grub2-efi-modules provides/obsoletes generation
Resolves: rhbz#1506704 Resolves: rhbz#1506704