From 2c8f8fd278ea4caffb762ad69072653020a154d1 Mon Sep 17 00:00:00 2001
From: lkx690 <likexin4@huawei.com>
Date: Wed, 18 Mar 2020 23:28:00 +0800
Subject: [PATCH] delete modify-cflags.patch

---
 gnu-efi.spec        |  6 ++++--
 modify-cflags.patch | 36 ------------------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 modify-cflags.patch

diff --git a/gnu-efi.spec b/gnu-efi.spec
index f0c5948..9ac4e71 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:       7
+Release:       8
 Summary:       Development Libraries and headers for EFI
 Epoch:         1
 License:       BSD
@@ -10,7 +10,6 @@ ExclusiveArch: x86_64 aarch64
 Source:        http://superb-dca2.dl.sourceforge.net/project/gnu-efi/gnu-efi-3.0.8.tar.bz2
 #stubs-32.h comes from http://www.gnu.org/software/glibc/
 Source1:       stubs-32.h
-Patch1:        modify-cflags.patch
 
 %global efidir %(eval echo $(grep ^ID= /etc/os-release | sed  's/^ID=//'))
 
@@ -77,6 +76,9 @@ mv ia32/apps/{route80h.efi,modelist.efi} %{buildroot}/boot/efi/EFI/%{efidir}/ia3
 %{_includedir}/efi
 
 %changelog
+* Wed Mar 18 2020 likexin <likexin4@huawei.com> - 3.0.8-8
+- Delete modify-cflags.patch
+
 * Wed Mar 18 2020 likexin <likexin4@huawei.com> - 3.0.8-7
 - Fix up modify-cflags.patch
 
diff --git a/modify-cflags.patch b/modify-cflags.patch
deleted file mode 100644
index 7b3aaf7..0000000
--- a/modify-cflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/Make.defaults	2020-03-18 15:33:04.818719470 +0800
-@@ -155,6 +155,9 @@
- CFLAGS += -marm
- endif
- 
-+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 -fno-stack-protector 
- else
- CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
-            -fshort-wchar -fno-strict-aliasing \
--	   -ffreestanding -fno-stack-protector -fno-stack-check \
--           -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 \
- 	   --build-id=sha1
-- 
Gitee