From 115cebbe4d7541c795b4f9baefc38f9a1733b7f6 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Wed, 26 Oct 2022 21:51:38 +0200 Subject: [PATCH] ArmVirtPkg/ArmVirtQemu: Clear XIP flags instead of overriding them Clang does not support undoing the effects of -mstrict-align by passing the -mno-strict-align counterpart, so appending the latter to the compiler's XIPFLAGS does not work. Instead, clear the flags entirely. This also removes -mgeneral-regs-only, but this is fine - we can tolerate SIMD codegen in PEIMs or BASE libraries as they run with the MMU and caches enabled. Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index fbd9270db5..28a4453068 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -117,7 +117,7 @@ UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf [BuildOptions] - GCC:*_*_AARCH64_CC_XIPFLAGS = -mno-strict-align + GCC:*_*_AARCH64_CC_XIPFLAGS == !include NetworkPkg/NetworkBuildOptions.dsc.inc