$ git show --format=fuller --patch-with-stat --summary ded6d68b6b64ce24aec4c07a612ae48eab407f83
commit ded6d68b6b64ce24aec4c07a612ae48eab407f83
Author: tpgxyz <tpgxyz@gmail.com>
AuthorDate: Thu Oct 17 01:57:20 2019 +0200
Commit: tpgxyz <tpgxyz@gmail.com>
CommitDate: Thu Oct 17 01:57:20 2019 +0200
try with gcc
---
...le-AVX-instruction-set-on-IA32-and-x86_64.patch | 44 ----------------------
gnu-efi.spec | 11 +++---
2 files changed, 5 insertions(+), 50 deletions(-)
delete mode 100644 0001-PATCH-Disable-AVX-instruction-set-on-IA32-and-x86_64.patch
diff --git a/0001-PATCH-Disable-AVX-instruction-set-on-IA32-and-x86_64.patch b/0001-PATCH-Disable-AVX-instruction-set-on-IA32-and-x86_64.patch
deleted file mode 100644
index 6511d83..0000000
--- a/0001-PATCH-Disable-AVX-instruction-set-on-IA32-and-x86_64.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 99d94682de590719f9333fcf091910a9581b44c0 Mon Sep 17 00:00:00 2001
-From: Nigel Croxon <ncroxon@redhat.com>
-Date: Thu, 13 Jul 2017 08:43:16 -0400
-Subject: [PATCH 01/25] [PATCH] Disable AVX instruction set on IA32 and x86_64
- platforms
-
-If gnu-efi is compiled with "-march=native" on a host that supports AVX, both
-gcc and clang will use AVX instructions freely which is currently not supported
-and will result in a non-functional gnu-efi build (e.g. black screen, hangs).
-
-For now, disable AVX on IA32 and x86_64 by checking first if the compiler does
-actually support the appropriate flag (-mno-avx) and use it if possible.
-
-Credit for the compiler command line to check if a flag is supported goes to
-Gentoo's awesome flag-o-matic eclass, where it is taken from. Thanks.
-
-Signed-off-by: Matthias Dahl <matthias.dahl@binary-island.eu>
-Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
----
- Make.defaults | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/Make.defaults b/Make.defaults
-index 16f1fd21848..446e676dc14 100755
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -120,6 +120,14 @@ ifeq ($(ARCH),x86_64)
- endif
- endif
-
-+ifneq (,$(filter $(ARCH),ia32 x86_64))
-+ # Disable AVX, if the compiler supports that.
-+ CC_CAN_DISABLE_AVX=$(shell $(CC) -Werror -c -o /dev/null -xc -mno-avx - </dev/null >/dev/null 2>&1 && echo 1)
-+ ifeq ($(CC_CAN_DISABLE_AVX), 1)
-+ CFLAGS += -mno-avx
-+ endif
-+endif
-+
- ifeq ($(ARCH),mips64el)
- CFLAGS += -march=mips64r2
- ARCH3264 = -mabi=64
---
-2.15.0
-
diff --git a/gnu-efi.spec b/gnu-efi.spec
index 3b39317..45ab751 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -18,17 +18,16 @@
Summary: Development Libraries and headers for EFI
Name: gnu-efi
Version: 3.0.10
-Release: 1
+Release: 2
Group: System/Kernel and hardware
License: BSD
Url: http://sourceforge.net/projects/gnu-efi
Source0: http://freefr.dl.sourceforge.net/project/gnu-efi/gnu-efi-%{version}.tar.bz2
Source100: %{name}.rpmlintrc
-# (tpg) patches from fedora
-Patch1: 0001-PATCH-Disable-AVX-instruction-set-on-IA32-and-x86_64.patch
Patch2: gnu-efi-3.0.10-fallthroug.patch
BuildRequires: glibc-devel
BuildRequires: kernel-source
+BuildRequires: gcc
%description
This package contains development headers and libraries for developing
@@ -38,7 +37,7 @@ applications that run under EFI (Extensible Firmware Interface).
%autosetup -n %{name}-%{dirver} -p1
# (tpg) 2019-10-12 remove this so clang may compile it with success
-sed -i -e 's/-maccumulate-outgoing-args//g' Make.defaults
+#sed -i -e 's/-maccumulate-outgoing-args//g' Make.defaults
# (tpg) pass -z norelro for LLD
sed -i -e 's/build-id=sha1/build-id=sha1 -z norelro/g' Make.defaults
# or use LD.BFD
@@ -60,8 +59,8 @@ done
%build
# Makefiles aren't SMP clean and do not pass our optflags and ldflags
-make CC=clang PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot}
-make apps CC=clang PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot}
+make CC=gcc HOSTCC=gcc PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot}
+make apps CC=gcc HOSTCC=gcc PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot}
%install
%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot}