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.5611.1646119114507302082 for ; Mon, 28 Feb 2022 23:18:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Um7WYQrF; 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=1646119113; 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=93Wvg1xhli/tHPn+6JTGR15wVyw5VGJFnqRg6gAFDew=; b=Um7WYQrFCcKA2F6hxnIvoWIZGe9TZ6sh4hpSbKo67jYM39dHjyEe3M13SWyhufUR6byvFl XYnbHRGWXGfMtRF9XxHpuCirRH+1bZ87Qpn1RbebFi6ylTBi5yA58hAR80rmBwIP8gtQlk GepO0+kynZF5WbeKQ87wUFA9TSjYbSY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-537-z5xcPaAeMG2RMeCGhE84cA-1; Tue, 01 Mar 2022 02:18:30 -0500 X-MC-Unique: z5xcPaAeMG2RMeCGhE84cA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 31B6251DF; Tue, 1 Mar 2022 07:18:26 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.195.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BA66B827A9; Tue, 1 Mar 2022 07:18:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 15E5A1800852; Tue, 1 Mar 2022 08:18:20 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Xiaoyu Lu , Bob Feng , Rebecca Cran , James Bottomley , Sami Mujawar , Jordan Justen , Erdem Aktas , Jiewen Yao , Supreeth Venkatesh , Sebastien Boeuf , Zhichao Gao , Zhiguang Liu , Maciej Rabeda , Maurice Ma , Andrew Fish , Ard Biesheuvel , Tom Lendacky , Peter Grehan , Sean Brogan , Guomin Jiang , Bret Barkelew , Yuwei Chen , Benjamin You , Daniel Schaefer , Liming Gao , Michael D Kinney , Wei6 Xu , Jian J Wang , Jiaxin Wu , Siyuan Fu , Gerd Hoffmann , Sami Mujawar , Guo Dong , kilian_kegel@hotmail.com, Abner Chang , Oliver Steffen , Leif Lindholm , Brijesh Singh , Min Xu , Ray Ni , Alexei Fedorov , Julien Grall , Nickle Wang , Pawel Polawski , Anthony Perard Subject: [PATCH 2/3] MdePkg/CompilerIntrinsicsLib: fix msft sources for x64 Date: Tue, 1 Mar 2022 08:18:19 +0100 Message-Id: <20220301071820.3135133-3-kraxel@redhat.com> In-Reply-To: <20220301071820.3135133-1-kraxel@redhat.com> References: <20220301071820.3135133-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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" Update #if contitions so the the 64bit version is picked for X64 too. Signed-off-by: Gerd Hoffmann --- 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