From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web09.6547.1654259208772368697 for ; Fri, 03 Jun 2022 05:26:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RyLTWcwd; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654259208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ovuT4LbUuMrTozMh/+05PrYTgO0qlCzxLVpD5VdLaFg=; b=RyLTWcwd61jyvled0yzo2X2q66L6EzLkHKHXVroO6xSxRZzSKVKCb9ePOL4ZFF5+lFra3B vm8x9d3r8gp+d4VayCUhVZgc/Om9r3cAmJMfLXIYiRDTjBrVhrxP2vPiek7Uocgluwrq4Y sRuXcNYuFsX/GDweIUFpKf51uCpvFlw= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-398-9sbONNj4O2m9c62UHbNwZQ-1; Fri, 03 Jun 2022 08:26:46 -0400 X-MC-Unique: 9sbONNj4O2m9c62UHbNwZQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 63D87280695A; Fri, 3 Jun 2022 12:26:44 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 13B3C10725; Fri, 3 Jun 2022 12:26:44 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 006BB18009D1; Fri, 3 Jun 2022 14:26:38 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jian J Wang , Jiaxin Wu , Sean Brogan , Anthony Perard , Leif Lindholm , Zhiguang Liu , Xiaoyu Lu , Pawel Polawski , Sami Mujawar , Maciej Rabeda , Bob Feng , Jiewen Yao , Andrew Fish , Bret Barkelew , Alexei Fedorov , Guo Dong , Gerd Hoffmann , kilian_kegel@hotmail.com, Maurice Ma , Siyuan Fu , Abner Chang , Zhichao Gao , Wei6 Xu , Supreeth Venkatesh , Julien Grall , Daniel Schaefer , Ard Biesheuvel , Guomin Jiang , Jordan Justen , Oliver Steffen , Sebastien Boeuf , Benjamin You , Min Xu , Ray Ni , Rebecca Cran , Nickle Wang , Michael D Kinney , Tom Lendacky , Sami Mujawar , Peter Grehan , Erdem Aktas , Brijesh Singh , James Bottomley , Yuwei Chen , Liming Gao , Jiewen Yao , Ard Biesheuvel Subject: [PATCH v4 2/9] MdePkg/CompilerIntrinsicsLib: fix msft sources for x64 Date: Fri, 3 Jun 2022 14:26:31 +0200 Message-Id: <20220603122638.1547060-3-kraxel@redhat.com> In-Reply-To: <20220603122638.1547060-1-kraxel@redhat.com> References: <20220603122638.1547060-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Update #if conditions so the 64bit version is picked for X64 too. Signed-off-by: Gerd Hoffmann Acked-by: Jiewen Yao Acked-by: Ard Biesheuvel Acked-by: Liming Gao --- 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