[PATCH V3] MdeModulePkg/RegularExpressionDxe: Fix GCC build error

[PATCH V3] MdeModulePkg/RegularExpressionDxe: Fix GCC build error

[Nickle Wang]

Fix GCC build error on AARCH64 system.

Signed-off-by: Nickle Wang <nicklew@nvidia.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Nick Ramirez <nramirez@nvidia.com>
---
 .../Universal/RegularExpressionDxe/OnigurumaUefiPort.h     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h
index 3dc207da3e..248109b0c9 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h
@@ -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) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -36,11 +37,9 @@ typedef INTN    intptr_t;
 #define offsetof  OFFSET_OF
 #endif
 
-#ifdef MDE_CPU_IA32
+#if defined (MDE_CPU_IA32) || defined (MDE_CPU_ARM) || defined (MDE_CPU_EBC)
 #define SIZEOF_VOIDP  4
-#endif
-
-#ifdef MDE_CPU_X64
+#else
 #define SIZEOF_VOIDP  8
 #endif
 
-- 
2.38.1.windows.1

Re: [edk2-devel] [PATCH V3] MdeModulePkg/RegularExpressionDxe: Fix GCC build error

[Michael D Kinney]

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Nickle Wang via groups.io
> Sent: Thursday, December 1, 2022 4:42 AM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J <jian.j.wang@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Nick Ramirez <nramirez@nvidia.com>
> Subject: [edk2-devel] [PATCH V3] MdeModulePkg/RegularExpressionDxe: Fix GCC build error
> 
> Fix GCC build error on AARCH64 system.
> 
> Signed-off-by: Nickle Wang <nicklew@nvidia.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Nick Ramirez <nramirez@nvidia.com>
> ---
>  .../Universal/RegularExpressionDxe/OnigurumaUefiPort.h     | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h
> b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h
> index 3dc207da3e..248109b0c9 100644
> --- a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h
> +++ b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h
> @@ -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) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -36,11 +37,9 @@ typedef INTN    intptr_t;
>  #define offsetof  OFFSET_OF
>  #endif
> 
> -#ifdef MDE_CPU_IA32
> +#if defined (MDE_CPU_IA32) || defined (MDE_CPU_ARM) || defined (MDE_CPU_EBC)
>  #define SIZEOF_VOIDP  4
> -#endif
> -
> -#ifdef MDE_CPU_X64
> +#else
>  #define SIZEOF_VOIDP  8
>  #endif
> 
> --
> 2.38.1.windows.1
> 
> 
> 
> 
> 

Re: [edk2-devel] [PATCH V3] MdeModulePkg/RegularExpressionDxe: Fix GCC build error

[Nickle Wang]

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

Hi Mike,

It looks like this fix is not merged. Could you please help to merge this fix? There is CI build error which is related to this.

Thanks,
Nickle

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

Re: [edk2-devel] [PATCH V3] MdeModulePkg/RegularExpressionDxe: Fix GCC build error

[Michael D Kinney]

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

Merged

PR: https://github.com/tianocore/edk2/pull/4270

Commit: https://github.com/tianocore/edk2/commit/55b67b6950e648338adfe8ec54aeb26ed89d2c97

Mike

From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Nickle Wang via groups.io
Sent: Wednesday, April 12, 2023 9:44 PM
To: Kinney, Michael D <michael.d.kinney@intel.com>; devel@edk2.groups.io
Subject: Re: [edk2-devel] [PATCH V3] MdeModulePkg/RegularExpressionDxe: Fix GCC build error

Hi Mike,


It looks like this fix is not merged. Could you please help to merge this fix? There is CI build error which is related to this.

Thanks,
Nickle


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

Re: [edk2-devel] [PATCH V3] MdeModulePkg/RegularExpressionDxe: Fix GCC build error

[Nickle Wang]

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

Hi Mike,

Thanks for your help!

Regards,
Nickle

From: Kinney, Michael D <michael.d.kinney@intel.com>
Sent: Friday, April 14, 2023 2:23 AM
To: devel@edk2.groups.io; Nickle Wang <nicklew@nvidia.com>
Cc: Kinney, Michael D <michael.d.kinney@intel.com>
Subject: RE: [edk2-devel] [PATCH V3] MdeModulePkg/RegularExpressionDxe: Fix GCC build error

External email: Use caution opening links or attachments

Merged

PR: https://github.com/tianocore/edk2/pull/4270

Commit: https://github.com/tianocore/edk2/commit/55b67b6950e648338adfe8ec54aeb26ed89d2c97

Mike

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 12, 2023 9:44 PM
To: Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io>
Subject: Re: [edk2-devel] [PATCH V3] MdeModulePkg/RegularExpressionDxe: Fix GCC build error

Hi Mike,


It looks like this fix is not merged. Could you please help to merge this fix? There is CI build error which is related to this.

Thanks,
Nickle


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