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.129.124]) by mx.groups.io with SMTP id smtpd.web08.11151.1649772469317911316 for ; Tue, 12 Apr 2022 07:07:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=GwioB4K/; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649772468; 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=+K+6fFeKUBd/pITQy2bMTwyLstq6P4qWScr3tE6r7xI=; b=GwioB4K/eohifuayRZEG0mVul25gUFKh5Z+NJCAO8c3gJi/NIcftkHc3HGaQ4v1zDXLVZx GveqGCBlnoZxYFxA88WdzKc6dFX45s6PK0O89clVxK+F7OPYgEblPGEZzK3wG7dSU1htDO eIh5h0rG3tiZPXMGFoScJBmovYfnVx4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-131-vD8unPV4NNSA270_0wS4ZA-1; Tue, 12 Apr 2022 10:07:43 -0400 X-MC-Unique: vD8unPV4NNSA270_0wS4ZA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3EA97811E81; Tue, 12 Apr 2022 14:07:41 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F3EFF4229D2; Tue, 12 Apr 2022 14:07:40 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5DE1A1800606; Tue, 12 Apr 2022 16:07:37 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Maurice Ma , Andrew Fish , Pawel Polawski , Benjamin You , Yuwei Chen , Zhiguang Liu , Rebecca Cran , Xiaoyu Lu , Supreeth Venkatesh , Zhichao Gao , Brijesh Singh , Julien Grall , Erdem Aktas , Maciej Rabeda , Liming Gao , Michael D Kinney , kilian_kegel@hotmail.com, Siyuan Fu , Oliver Steffen , Ray Ni , Abner Chang , James Bottomley , Sean Brogan , Alexei Fedorov , Tom Lendacky , Guo Dong , Jiewen Yao , Sami Mujawar , Sebastien Boeuf , Peter Grehan , Min Xu , Anthony Perard , Jordan Justen , Jian J Wang , Gerd Hoffmann , Bob Feng , Bret Barkelew , Nickle Wang , Wei6 Xu , Daniel Schaefer , Jiaxin Wu , Leif Lindholm , Guomin Jiang , Sami Mujawar , Ard Biesheuvel , Jiewen Yao , Ard Biesheuvel Subject: [PATCH v2 02/10] MdePkg/CompilerIntrinsicsLib: fix msft sources for x64 Date: Tue, 12 Apr 2022 16:07:29 +0200 Message-Id: <20220412140737.1738157-3-kraxel@redhat.com> In-Reply-To: <20220412140737.1738157-1-kraxel@redhat.com> References: <20220412140737.1738157-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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 --- 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