回复: [edk2-devel] [PATCH 1/1] MdeModulePkg/RegularExpressionDxe: Fix Arm build error

["gaoliming" <gaoliming@byosoft.com.cn>]

[-- Attachment #1: Type: text/plain, Size: 7048 bytes --]

Nickle:

 I check memset implementation in CryptoPkg\Library\IntrinsicLib and ArmPkg\Library\CompilerIntrinsicsLib. They both use int type for the second parameter. So, I suggest to update RegularExpressionDxe implementation to match them. Can you help to verify this solution?

 

Thanks

Liming

发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Nickle Wang via groups.io
发送时间: 2023年4月21日 11:13
收件人: devel@edk2.groups.io; gaoliming@byosoft.com.cn; 'Jian J Wang' <jian.j.wang@intel.com>
抄送: 'Michael D Kinney' <michael.d.kinney@intel.com>; Nick Ramirez <nramirez@nvidia.com>
主题: Re: [edk2-devel] [PATCH 1/1] MdeModulePkg/RegularExpressionDxe: Fix Arm build error

 

Hi Liming,

 

I noticed the build error from this CI test: Build and Test NetworkPkg,RedfishPkg IA32,X64,ARM,AARCH64,RISCV64,LOONGARCH64. And after applying my patch, CI reports build pass. Since this CI test also cover AARCH64, RISCV64 and LOONGARCH64, I think that the failure only happens to MDE_CPU_ARM.

 

Thanks,

Nickle

 

From: devel@edk2.groups.io <mailto:devel@edk2.groups.io>  <devel@edk2.groups.io <mailto:devel@edk2.groups.io> > On Behalf Of gaoliming via groups.io
Sent: Friday, April 21, 2023 10:52 AM
To: devel@edk2.groups.io <mailto:devel@edk2.groups.io> ; Nickle Wang <nicklew@nvidia.com <mailto:nicklew@nvidia.com> >; 'Jian J Wang' <jian.j.wang@intel.com <mailto:jian.j.wang@intel.com> >
Cc: 'Michael D Kinney' <michael.d.kinney@intel.com <mailto:michael.d.kinney@intel.com> >; Nick Ramirez <nramirez@nvidia.com <mailto:nramirez@nvidia.com> >
Subject: 回复: [edk2-devel] [PATCH 1/1] MdeModulePkg/RegularExpressionDxe: Fix Arm build error

 


External email: Use caution opening links or attachments 

 

Nickle:

 Is this only for MDE_CPU_ARM? I may propose to add the judgement of MDE_CPU_IA32 and MDE_CPU_X64 for memcpy & memset. memcpy & memset are for X86 only.

 

Thanks

Liming

发件人: devel@edk2.groups.io <devel@edk2.groups.io <mailto:devel@edk2.groups.io> > 代表 Nickle Wang via groups.io
发送时间: 2023年4月21日 8:26
收件人: devel@edk2.groups.io <mailto:devel@edk2.groups.io> ; Nickle Wang <nicklew@nvidia.com <mailto:nicklew@nvidia.com> >; Jian J Wang <jian.j.wang@intel.com <mailto:jian.j.wang@intel.com> >; Liming Gao <gaoliming@byosoft.com.cn <mailto:gaoliming@byosoft.com.cn> >
抄送: Michael D Kinney <michael.d.kinney@intel.com <mailto:michael.d.kinney@intel.com> >; Nick Ramirez <nramirez@nvidia.com <mailto:nramirez@nvidia.com> >
主题: Re: [edk2-devel] [PATCH 1/1] MdeModulePkg/RegularExpressionDxe: Fix Arm build error

 

Hi  <mailto:jian.j.wang@intel.com> @Jian J Wang,  <mailto:gaoliming@byosoft.com.cn> @Liming Gao,

 

Could you please help me to review this patch? There is CI build error, and it blocks my pull request here: https://github.com/tianocore/edk2/pull/4285  

 

Thanks,

Nickle

 

> -----Original Message-----

> From: devel@edk2.groups.io <mailto:devel@edk2.groups.io>  <devel@edk2.groups.io <mailto:devel@edk2.groups.io> > On Behalf Of Nickle

> Wang via groups.io

> Sent: Wednesday, April 19, 2023 4:30 PM

> To: devel@edk2.groups.io <mailto:devel@edk2.groups.io> 

> Cc: Jian J Wang <jian.j.wang@intel.com <mailto:jian.j.wang@intel.com> >; Liming Gao

> <gaoliming@byosoft.com.cn <mailto:gaoliming@byosoft.com.cn> >; Michael D Kinney <michael.d.kinney@intel.com <mailto:michael.d.kinney@intel.com> >;

> Nick Ramirez <nramirez@nvidia.com <mailto:nramirez@nvidia.com> >

> Subject: [edk2-devel] [PATCH 1/1] MdeModulePkg/RegularExpressionDxe: Fix

> Arm build error

> 

> External email: Use caution opening links or attachments

> 

> 

> Fix Arm CI build error:

> - ArmPkg/Library/CompilerIntrinsicsLib/memset.c:39:1: warning: type of

> ‘memset’ does not match original declaration [-Wlto-type-mismatch]

> MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c:123:1:

> note: type ‘char’ should match type ‘int’

> - multiple definition of `memcpy'; OnigurumaUefiPort.obj (symbol from

> plugin):(.text+0x0): first defined here

> 

> There is intrinsics library for Arm so we don't need memset and memcpy

> function in OnigurumaUefiPort.c.

> 

> Signed-off-by: Nickle Wang < <mailto:nicklew@nvidia.com> nicklew@nvidia.com>

> Cc: Jian J Wang < <mailto:jian.j.wang@intel.com> jian.j.wang@intel.com>

> Cc: Liming Gao < <mailto:gaoliming@byosoft.com.cn> gaoliming@byosoft.com.cn>

> Cc: Michael D Kinney < <mailto:michael.d.kinney@intel.com> michael.d.kinney@intel.com>

> Cc: Nick Ramirez < <mailto:nramirez@nvidia.com> nramirez@nvidia.com>

> ---

>  .../Universal/RegularExpressionDxe/OnigurumaUefiPort.h       | 5 ++++-

>  .../Universal/RegularExpressionDxe/OnigurumaUefiPort.c       | 4 ++++

>  2 files changed, 8 insertions(+), 1 deletion(-)

> 

> diff --git

> a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h

> b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h

> index 248109b0c96e..8f8581df6783 100644

> --- a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h

> +++ b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h

> @@ -4,7 +4,7 @@

> 

>    (C) Copyright 2014-2021 Hewlett Packard Enterprise Development LP<BR>

>    Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>

> -  Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.

> +  Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights

> reserved.

> 

>    SPDX-License-Identifier: BSD-2-Clause-Patent  **/ @@ -107,6 +107,7 @@

> realloc (

>    size_t  size

>    );

> 

> +#if !defined (MDE_CPU_ARM)

>  void *

>  memcpy (

>    void          *dest,

> @@ -121,6 +122,8 @@ memset (

>    unsigned int  count

>    );

> 

> +#endif

> +

>  void

>  free (

>    void  *ptr

> diff --git

> a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c

> b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c

> index 6661c67f976e..8af57f3a93c7 100644

> --- a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c

> +++ b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c

> @@ -4,6 +4,7 @@

> 

>    (C) Copyright 2014-2021 Hewlett Packard Enterprise Development LP<BR>

>    Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>

> +  Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.

> 

>    SPDX-License-Identifier: BSD-2-Clause-Patent  **/ @@ -109,6 +110,7 @@

> realloc (

>    return NULL;

>  }

> 

> +#if !defined (MDE_CPU_ARM)

>  void *

>  memcpy (

>    void          *dest,

> @@ -129,6 +131,8 @@ memset (

>    return SetMem (dest, count, ch);

>  }

> 

> +#endif

> +

>  void

>  free (

>    void  *ptr

> --

> 2.17.1

> 

> 

> 

> 

> 

 




[-- Attachment #2: Type: text/html, Size: 24043 bytes --]