diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2024-03-09 18:16:24 +0100 |
|---|---|---|
| committer | Subrata Banik <subratabanik@google.com> | 2024-03-14 15:53:09 +0000 |
| commit | d045074b91afd10b9b36aa636ac93df55144b532 (patch) | |
| tree | 386bd5871bc82accff8622d40e02be6aa8e2b301 /src | |
| parent | 2fd6a6758b221ca7812bbb86177e4a96376abf45 (diff) | |
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 <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81192
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Wonkyu Kim <wonkyu.kim@intel.com>
Reviewed-by: Dinesh Gehlot <digehlot@google.com>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Reviewed-by: Ronak Kanabar <ronak.kanabar@intel.com>
Reviewed-by: Jérémy Compostella <jeremy.compostella@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/soc/intel/meteorlake/Makefile.mk | 1 | ||||
| -rw-r--r-- | src/vendorcode/intel/edk2/edk2-stable202302/MdePkg/Include/Base.h | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/soc/intel/meteorlake/Makefile.mk b/src/soc/intel/meteorlake/Makefile.mk index 39a1d652f0..893523c304 100644 --- a/src/soc/intel/meteorlake/Makefile.mk +++ b/src/soc/intel/meteorlake/Makefile.mk @@ -60,5 +60,4 @@ smm-y += xhci.c 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 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 |