[XS] Change in coreboot[main]: vendorcode/edk2-stable202302: Remove wchar_t asserts

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/81192?usp=email )

Change subject: vendorcode/edk2-stable202302: Remove wchar_t asserts
......................................................................

vendorcode/edk2-stable202302: Remove wchar_t asserts

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 
---
M src/soc/intel/meteorlake/Makefile.mk
M src/vendorcode/intel/edk2/edk2-stable202302/MdePkg/Include/Base.h
2 files changed, 3 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/81192/1

diff --git a/src/soc/intel/meteorlake/Makefile.mk b/src/soc/intel/meteorlake/Makefile.mk
index 39a1d65..893523c 100644
--- a/src/soc/intel/meteorlake/Makefile.mk
+++ b/src/soc/intel/meteorlake/Makefile.mk
@@ -60,5 +60,4 @@
 CPPFLAGS_common += -I$(src)/soc/intel/meteorlake
 CPPFLAGS_common += -I$(src)/soc/intel/meteorlake/include

-CFLAGS_common += -fshort-wchar
 endif
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 f1b9c14..8cdf6aa 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 (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