diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 81c27831f..a8f40bf59 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -2523,6 +2523,7 @@ RELEASE_XCODE5_X64_ASM_FLAGS = -arch x86_64 # $(PLATFORM_FLAGS) RELEASE_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -Os -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mms-bitfields -Wno-unused-parameter -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -DNO_MSABI_VA_FUNCS +RELEASE_XCODE5_X64_CXX_FLAGS = -target x86_64-pc-win32-macho -nostdinc -c -Os -Wall -Werror -Wextra -include AutoGen.h -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mms-bitfields -Wno-unused-parameter -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -DNO_MSABI_VA_FUNCS -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings # -mno-implicit-float # -Wno-varargs # -Wno-unused-const-variable diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h index 505afd0b8..6d5143845 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h @@ -831,8 +831,11 @@ STATIC_ASSERT (sizeof (UINT32) == 4, "sizeof (UINT32) does not meet UEFI Specif STATIC_ASSERT (sizeof (INT64) == 8, "sizeof (INT64) does not meet UEFI Specification Data Type requirements"); 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"); +#ifdef __cplusplus + //sizeof(CHAR16) == 4 +#else STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); - +#endif // // The following three enum types are used to verify that the compiler // configuration for enum types is compliant with Section 2.3.1 of the diff --git a/MdePkg/Include/X64/ProcessorBind.h b/MdePkg/Include/X64/ProcessorBind.h index 348de98bb..355f4d921 100644 --- a/MdePkg/Include/X64/ProcessorBind.h +++ b/MdePkg/Include/X64/ProcessorBind.h @@ -215,7 +215,10 @@ // To work with edk2 library, you need to compile them without -short-wchar. // And of course that cannot be used to create a launchable efi file ! // But that works for unit tests that run on macOS, Linux, Windows... + // Slice: ??? + // STATIC_ASSERT (˙sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); #define CHAR16 wchar_t + // #define CHAR16 short #endif #else #if __WCHAR_MAX__ <= 0xFFFF diff --git a/Qemu/launch b/Qemu/launch index 39e083e9c..1e4fb934e 100755 --- a/Qemu/launch +++ b/Qemu/launch @@ -18,7 +18,7 @@ then echo clover_efi_file="$clover_efi_file" fi -qemu_path="$SCRIPT_DIR"/qemu_portable-v4.2.0/qemu-system-x86_64 +#qemu_path="$SCRIPT_DIR"/qemu_portable-v4.2.0/qemu-system-x86_64 qemu_path="$SCRIPT_DIR"/qemu_portable-v5.2.0/qemu-system-x86_64 #set -x diff --git a/Qemu/qemu_portable-v4.2.0/bios.bin-1.13.0 b/Qemu/qemu_portable-v4.2.0/bios.bin-1.13.0 deleted file mode 100644 index f7bb4f409..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/bios.bin-1.13.0 and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/efi-e1000e.rom b/Qemu/qemu_portable-v4.2.0/efi-e1000e.rom deleted file mode 100644 index f536bdbd4..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/efi-e1000e.rom and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/kvmvapic.bin b/Qemu/qemu_portable-v4.2.0/kvmvapic.bin deleted file mode 100644 index 045f5c288..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/kvmvapic.bin and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu-img b/Qemu/qemu_portable-v4.2.0/qemu-img deleted file mode 100755 index 05225a233..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu-img and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu-system-x86_64 b/Qemu/qemu_portable-v4.2.0/qemu-system-x86_64 deleted file mode 100755 index 54ed5867f..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu-system-x86_64 and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libcrypto.1.1.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libcrypto.1.1.dylib deleted file mode 100644 index 091310209..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libcrypto.1.1.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libffi.6.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libffi.6.dylib deleted file mode 100644 index 11b6a62b2..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libffi.6.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libglib-2.0.0.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libglib-2.0.0.dylib deleted file mode 100644 index affa26df1..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libglib-2.0.0.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libgmp.10.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libgmp.10.dylib deleted file mode 100644 index b527031ba..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libgmp.10.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libgnutls.30.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libgnutls.30.dylib deleted file mode 100644 index 7cfd32cf9..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libgnutls.30.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libgthread-2.0.0.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libgthread-2.0.0.dylib deleted file mode 100644 index 635c9278d..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libgthread-2.0.0.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libhogweed.4.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libhogweed.4.dylib deleted file mode 100644 index c155120ce..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libhogweed.4.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libidn2.0.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libidn2.0.dylib deleted file mode 100644 index 096f4db19..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libidn2.0.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libintl.8.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libintl.8.dylib deleted file mode 100644 index e999e2a30..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libintl.8.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libjpeg.9.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libjpeg.9.dylib deleted file mode 100644 index eaae1fcac..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libjpeg.9.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/liblzo2.2.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/liblzo2.2.dylib deleted file mode 100644 index 92bb22c5c..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/liblzo2.2.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libncursesw.6.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libncursesw.6.dylib deleted file mode 100644 index 52da89901..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libncursesw.6.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libnettle.6.5.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libnettle.6.5.dylib deleted file mode 100644 index 700ecb733..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libnettle.6.5.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libnettle.6.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libnettle.6.dylib deleted file mode 120000 index e48c448fd..000000000 --- a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libnettle.6.dylib +++ /dev/null @@ -1 +0,0 @@ -libnettle.6.5.dylib \ No newline at end of file diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libp11-kit.0.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libp11-kit.0.dylib deleted file mode 100644 index f3db50815..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libp11-kit.0.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libpcre.1.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libpcre.1.dylib deleted file mode 100644 index 8904936e8..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libpcre.1.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libpixman-1.0.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libpixman-1.0.dylib deleted file mode 100644 index 43978802e..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libpixman-1.0.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libpng16.16.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libpng16.16.dylib deleted file mode 100644 index 40ee80933..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libpng16.16.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libssh.4.8.4.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libssh.4.8.4.dylib deleted file mode 100644 index 0874080c6..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libssh.4.8.4.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libssh.4.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libssh.4.dylib deleted file mode 120000 index ecf760c68..000000000 --- a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libssh.4.dylib +++ /dev/null @@ -1 +0,0 @@ -libssh.4.8.4.dylib \ No newline at end of file diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libtasn1.6.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libtasn1.6.dylib deleted file mode 100644 index 831124800..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libtasn1.6.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libunistring.2.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libunistring.2.dylib deleted file mode 100644 index d80244b21..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libunistring.2.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libusb-1.0.0.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libusb-1.0.0.dylib deleted file mode 100644 index 4c0b1d679..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libusb-1.0.0.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libvdeplug.3.dylib b/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libvdeplug.3.dylib deleted file mode 100644 index 318cf3ea4..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/qemu.dylibs/libvdeplug.3.dylib and /dev/null differ diff --git a/Qemu/qemu_portable-v4.2.0/vgabios-stdvga.bin b/Qemu/qemu_portable-v4.2.0/vgabios-stdvga.bin deleted file mode 100644 index 5123c5fd0..000000000 Binary files a/Qemu/qemu_portable-v4.2.0/vgabios-stdvga.bin and /dev/null differ