diff --git a/gnu-efi.spec b/gnu-efi.spec index 55484e02ec79b055f1e5a4bf49896b4d91cba8ca..f0c59481b8edc350ed4cc2d5ea54849e1e1020ac 100644 --- a/gnu-efi.spec +++ b/gnu-efi.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: gnu-efi Version: 3.0.8 -Release: 6 +Release: 7 Summary: Development Libraries and headers for EFI Epoch: 1 License: BSD @@ -77,6 +77,9 @@ mv ia32/apps/{route80h.efi,modelist.efi} %{buildroot}/boot/efi/EFI/%{efidir}/ia3 %{_includedir}/efi %changelog +* Wed Mar 18 2020 likexin - 3.0.8-7 +- Fix up modify-cflags.patch + * Wed Mar 18 2020 likexin - 3.0.8-6 - Add cflags -fstack-protector-strong diff --git a/modify-cflags.patch b/modify-cflags.patch index bf9ee00d74a4a653a3c1a8df93e9c7f70a1faed9..7b3aaf75c553383cc8c57b41580981af802fc140 100644 --- a/modify-cflags.patch +++ b/modify-cflags.patch @@ -1,21 +1,22 @@ -diff -Nur gnu-efi-3.0.8.orig/Make.defaults gnu-efi-3.0.8-2/Make.defaults +diff -Nur gnu-efi-3.0.8.orig/Make.defaults gnu-efi-3.0.8/Make.defaults --- gnu-efi-3.0.8.orig/Make.defaults 2018-03-15 02:54:51.000000000 +0800 -+++ gnu-efi-3.0.8-2/Make.defaults 2020-03-17 23:23:49.602158451 +0800 -@@ -87,7 +87,7 @@ - # Arch-specific compilation flags - CPPFLAGS += -DCONFIG_$(ARCH) - --CFLAGS += -Wno-error=pragmas -+CFLAGS += -Wno-error=pragmas -fstack-protector-strong ++++ gnu-efi-3.0.8/Make.defaults 2020-03-18 15:33:04.818719470 +0800 +@@ -155,6 +155,9 @@ + CFLAGS += -marm + endif - ifeq ($(ARCH),ia64) - CFLAGS += -mfixed-range=f32-f127 -@@ -168,16 +168,15 @@ ++ifeq ($(ARCH),aarch64) ++CFLAGS += -fstack-protector-strong ++endif + # Generic compilation flags + INCDIR += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \ + -I$(TOPDIR)/inc/protocol +@@ -168,16 +171,18 @@ ifeq (FreeBSD, $(findstring FreeBSD, $(OS))) CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ -fshort-wchar -fno-strict-aliasing \ - -ffreestanding -fno-stack-protector -+ -ffreestanding ++ -ffreestanding -fno-stack-protector else CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ -fshort-wchar -fno-strict-aliasing \ @@ -23,10 +24,13 @@ diff -Nur gnu-efi-3.0.8.orig/Make.defaults gnu-efi-3.0.8-2/Make.defaults - -fno-stack-check \ + -ffreestanding \ $(if $(findstring gcc,$(CC)),-fno-merge-all-constants,) ++ifneq ($(ARCH),aarch64) ++CFLAGS += -fno-stack-protector -fno-stack-check ++endif endif ARFLAGS := rDv ASFLAGS += $(ARCH3264) -LDFLAGS += -nostdlib --warn-common --no-undefined --fatal-warnings \ -+LDFLAGS += -nostdlib --warn-common --fatal-warnings \ ++LDFLAGS += -nostdlib --warn-common --fatal-warnings \ --build-id=sha1