[PATCH 4/7] arm/sbsa-acs: update to 7.1.4

[Jon Mason <jon.mason@arm.com>]

Update to the latest version.  Also, remove the gcc12 workaround, as
that was added in edk2 commit 206168e83f090, which has been included
since the 202305 release.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../uefi/{sbsa-acs_7.1.2.bb => sbsa-acs_7.1.4.bb}      | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
 rename meta-arm/recipes-bsp/uefi/{sbsa-acs_7.1.2.bb => sbsa-acs_7.1.4.bb} (72%)

diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb
similarity index 72%
rename from meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb
rename to meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb
index 2cc9372dfe5e..b61658c44bba 100644
--- a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb
+++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb
@@ -8,16 +8,10 @@ SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Appl
             git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \
             file://0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch \
             file://0002-Enforce-using-good-old-BFD-linker.patch \
-            file://0001-Fix-for-mismatch-in-function-prototype.patch;patchdir=ShellPkg/Application/sbsa-acs \
             "
 
-
-SRCREV_acs = "23253befbed2aee7304470fd83b78672488a7fc2"
-SRCREV_libc = "d3dea661da9ae4a3421a80905e75a8dc77aa980e"
-
-# GCC12 trips on it
-#see https://src.fedoraproject.org/rpms/edk2/blob/rawhide/f/0032-Basetools-turn-off-gcc12-warning.patch
-BUILD_CFLAGS += "-Wno-error=stringop-overflow"
+SRCREV_acs = "be169f0008d86341e1e48cb70d524bd1518c3acc"
+SRCREV_libc = "4667a82f0d873221f8b25ea701ce57a29270e4cb"
 
 COMPATIBLE_HOST = "aarch64.*-linux"
 COMPATIBLE_MACHINE = ""
-- 
2.39.3 (Apple Git-146)