From 11416716fe5f8584f7e6a5470ef02548cf7f56ff Mon Sep 17 00:00:00 2001
From: Daniel P. Berrangé <berrange@redhat.com>
Date: Dec 06 2021 10:26:36 +0000
Subject: Drop glibc strcmp workaround


Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

---

diff --git a/edk2.spec b/edk2.spec
index 1861206..31b7ecd 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -47,7 +47,7 @@ ExclusiveArch: x86_64 aarch64
 
 Name:       edk2
 Version:    %{GITDATE}git%{GITCOMMIT}
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    UEFI firmware for 64-bit virtual machines
 License:    BSD-2-Clause-Patent and OpenSSL and MIT
 URL:        http://www.tianocore.org
@@ -280,16 +280,6 @@ tar -xf %{SOURCE50} --strip-components=1 --directory ArmPkg/Library/ArmSoftFloat
 
 
 %build
-
-# Workaround brokenness triggered by glibc >= 2.34.9000-17.fc36.x86_64
-# Suspected EVEX strcmp impl is not working, and hiding
-# this CPU flag prevents IFunc choosing the EVEX impl
-#
-# Remove once there is resolution to
-#
-#   https://bugzilla.redhat.com/show_bug.cgi?id=2026399
-export GLIBC_TUNABLES=glibc.cpu.hwcaps=-AVX512VL
-
 export PYTHON_COMMAND=%{__python3}
 source ./edksetup.sh
 %make_build -C "$EDK_TOOLS_PATH" \
@@ -752,6 +742,9 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep '^/lib/modules/[^/]+/vmlinuz$')
 
 
 %changelog
+* Mon Dec  6 2021 Daniel P. Berrangé <berrange@redhat.com> - 20210527gite1999b264f1f-5
+- Drop glibc strcmp workaround
+
 * Mon Nov 29 2021 Daniel P. Berrangé <berrange@redhat.com> - 20210527gite1999b264f1f-4
 - Drop customized splash screen boot logo
 - Temporary workaround for suspected glibc strcmp bug breaking builds in koji