From: "Gerd Hoffmann" <kraxel@redhat.com>
To: devel@edk2.groups.io
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>,
Erdem Aktas <erdemaktas@google.com>,
Maciej Rabeda <maciej.rabeda@linux.intel.com>,
Abner Chang <abner.chang@hpe.com>,
Peter Grehan <grehan@freebsd.org>,
Gerd Hoffmann <kraxel@redhat.com>,
Yuwei Chen <yuwei.chen@intel.com>,
Jiaxin Wu <jiaxin.wu@intel.com>, Siyuan Fu <siyuan.fu@intel.com>,
Sean Brogan <sean.brogan@microsoft.com>,
Anthony Perard <anthony.perard@citrix.com>,
Benjamin You <benjamin.you@intel.com>,
Guomin Jiang <guomin.jiang@intel.com>,
Leif Lindholm <quic_llindhol@quicinc.com>,
Rebecca Cran <rebecca@bsdio.com>, Wei6 Xu <wei6.xu@intel.com>,
Nickle Wang <nickle.wang@hpe.com>,
Xiaoyu Lu <xiaoyu1.lu@intel.com>,
Zhichao Gao <zhichao.gao@intel.com>,
kilian_kegel@hotmail.com, Liming Gao <gaoliming@byosoft.com.cn>,
Jordan Justen <jordan.l.justen@intel.com>,
Sami Mujawar <Sami.Mujawar@arm.com>,
Andrew Fish <afish@apple.com>,
Sami Mujawar <sami.mujawar@arm.com>,
Oliver Steffen <osteffen@redhat.com>,
Alexei Fedorov <Alexei.Fedorov@arm.com>,
Guo Dong <guo.dong@intel.com>,
Brijesh Singh <brijesh.singh@amd.com>,
Jian J Wang <jian.j.wang@intel.com>,
Supreeth Venkatesh <supreeth.venkatesh@arm.com>,
Min Xu <min.m.xu@intel.com>,
Bret Barkelew <Bret.Barkelew@microsoft.com>,
Maurice Ma <maurice.ma@intel.com>,
Pawel Polawski <ppolawsk@redhat.com>,
Daniel Schaefer <daniel.schaefer@hpe.com>,
Bob Feng <bob.c.feng@intel.com>,
James Bottomley <jejb@linux.ibm.com>,
Jiewen Yao <jiewen.yao@intel.com>, Ray Ni <ray.ni@intel.com>,
Julien Grall <julien@xen.org>,
Michael D Kinney <michael.d.kinney@intel.com>,
Sebastien Boeuf <sebastien.boeuf@intel.com>,
Zhiguang Liu <zhiguang.liu@intel.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Jiewen Yao <Jiewen.yao@intel.com>,
Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH v3 02/10] MdePkg/CompilerIntrinsicsLib: fix msft sources for x64
Date: Fri, 29 Apr 2022 12:20:11 +0200 [thread overview]
Message-ID: <20220429102019.1375348-3-kraxel@redhat.com> (raw)
In-Reply-To: <20220429102019.1375348-1-kraxel@redhat.com>
Update #if conditions so the 64bit version is picked for X64 too.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Liming Gao <gaoliming@byosoft.com.cn>
---
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.35.1
next prev parent reply other threads:[~2022-04-29 10:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-29 10:20 [PATCH v3 00/10] consolidate compiler intrinsics Gerd Hoffmann
2022-04-29 10:20 ` [PATCH v3 01/10] MdePkg: promote CompilerIntrinsicsLib from ArmPkg to MdePkg Gerd Hoffmann
2022-04-29 10:20 ` Gerd Hoffmann [this message]
2022-04-29 10:20 ` [PATCH v3 03/10] MdePkg/CompilerIntrinsicsLib: move size_t typedef to header file Gerd Hoffmann
2022-04-29 10:20 ` [PATCH v3 04/10] MdePkg/CompilerIntrinsicsLib: move ia32 intrinsics and strcmp Gerd Hoffmann
2022-04-29 10:20 ` [PATCH v3 05/10] MdePkg/CompilerIntrinsicsLib: copy over intrinsics from edk2-libc repo Gerd Hoffmann
2022-05-05 9:50 ` Leif Lindholm
2022-05-05 10:23 ` Gerd Hoffmann
2022-05-05 12:10 ` Leif Lindholm
2022-05-06 7:22 ` [edk2-devel] " Gerd Hoffmann
2022-04-29 10:20 ` [PATCH v3 06/10] MdePkg/CompilerIntrinsicsLib: add SPDX License tags Gerd Hoffmann
2022-04-29 10:20 ` [PATCH v3 07/10] MdePkg/CompilerIntrinsicsLib: drop include from Gcc.c Gerd Hoffmann
2022-04-29 10:20 ` [PATCH v3 08/10] MdePkg/CompilerIntrinsicsLib: drop debug logging " Gerd Hoffmann
2022-04-29 10:20 ` [PATCH v3 09/10] MdePkg/CompilerIntrinsicsLib: remove duplicate functions " Gerd Hoffmann
2022-04-29 10:20 ` [PATCH v3 10/10] MdePkg/CompilerIntrinsicsLib: add new sources to CompilerIntrinsicsLib.inf Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220429102019.1375348-3-kraxel@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox