.../Universal/RegularExpressionDxe/OnigurumaUefiPort.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
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
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#96824): https://edk2.groups.io/g/devel/message/96824
Mute This Topic: https://groups.io/mt/95380408/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
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 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96832): https://edk2.groups.io/g/devel/message/96832 Mute This Topic: https://groups.io/mt/95380408/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2023 Red Hat, Inc.