[PATCH v4 2/9] MdePkg/CompilerIntrinsicsLib: fix msft sources for x64


Gerd Hoffmann
 

Update #if conditions so the 64bit version is picked for X64 too.

Signed-off-by: Gerd Hoffmann <kraxel@...>
Acked-by: Jiewen Yao <Jiewen.yao@...>
Acked-by: Ard Biesheuvel <ardb@...>
Acked-by: Liming Gao <gaoliming@...>
---
MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c | 2 +-
MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c | 2 +-
MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c | 2 +-
MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c b/MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c
index cedbfca47139..2fac8f1e23e3 100644
--- a/MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c
+++ b/MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c
@@ -7,7 +7,7 @@
//
// ------------------------------------------------------------------------------

-#if defined (_M_ARM64)
+#if defined (_M_ARM64) || defined (_M_X64)
typedef unsigned __int64 size_t;
#else
typedef unsigned __int32 size_t;
diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c b/MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c
index 0eafa83ed476..730aa806d50b 100644
--- a/MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c
+++ b/MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c
@@ -7,7 +7,7 @@
//
// ------------------------------------------------------------------------------

-#if defined (_M_ARM64)
+#if defined (_M_ARM64) || defined (_M_X64)
typedef unsigned __int64 size_t;
#else
typedef unsigned __int32 size_t;
diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c b/MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c
index f68eb52a6ca5..3207b94a8675 100644
--- a/MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c
+++ b/MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c
@@ -7,7 +7,7 @@
//
// ------------------------------------------------------------------------------

-#if defined (_M_ARM64)
+#if defined (_M_ARM64) || defined (_M_X64)
typedef unsigned __int64 size_t;
#else
typedef unsigned __int32 size_t;
diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c b/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c
index 5882cd28b06d..deb902c6ae88 100644
--- a/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c
+++ b/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c
@@ -7,7 +7,7 @@
//
// ------------------------------------------------------------------------------

-#if defined (_M_ARM64)
+#if defined (_M_ARM64) || defined (_M_X64)
typedef unsigned __int64 size_t;
#else
typedef unsigned __int32 size_t;
--
2.36.1

Join {devel@edk2.groups.io to automatically receive all group messages.