From d045074b91afd10b9b36aa636ac93df55144b532 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Sat, 9 Mar 2024 18:16:24 +0100 Subject: vendorcode/edk2-stable202302: Remove wchar_t asserts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove those MSVC compiler defaults checks so that the GCC defaults for wchar_t can be used. The FSP interface does not depend on wchar_t. TEST: the resulting binaries are the same for intel/mtlrvp Change-Id: I0ee1abc7e9ba46665838b63a6cfe0f4aa300114c Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/81192 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik Reviewed-by: Wonkyu Kim Reviewed-by: Dinesh Gehlot Reviewed-by: Felix Singer Reviewed-by: Ronak Kanabar Reviewed-by: Jérémy Compostella --- src/vendorcode/intel/edk2/edk2-stable202302/MdePkg/Include/Base.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/vendorcode/intel') diff --git a/src/vendorcode/intel/edk2/edk2-stable202302/MdePkg/Include/Base.h b/src/vendorcode/intel/edk2/edk2-stable202302/MdePkg/Include/Base.h index f1b9c1429d..8cdf6aa5ae 100644 --- a/src/vendorcode/intel/edk2/edk2-stable202302/MdePkg/Include/Base.h +++ b/src/vendorcode/intel/edk2/edk2-stable202302/MdePkg/Include/Base.h @@ -792,8 +792,9 @@ STATIC_ASSERT (sizeof (INT64) == 8, "sizeof (INT64) does not meet UEFI Specifi STATIC_ASSERT (sizeof (UINT64) == 8, "sizeof (UINT64) does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); -STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements"); -STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements"); +// Removed to have coreboot code compile with the Linux gcc defaults. The FSP interface does not need wchar_t anyway. +//STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements"); +//STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements"); // // The following three enum types are used to verify that the compiler -- cgit v1.2.3