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

Nickle Wang via groups.io posted 1 patch 2 months, 1 week ago
Failed in applying to current master (apply log)
There is a newer version of this series
.../Universal/RegularExpressionDxe/OnigurumaUefiPort.h     | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
[edk2-devel] [PATCH V2] MdeModulePkg/RegularExpressionDxe: Fix GCC build error
Posted by Nickle Wang via groups.io 2 months, 1 week ago
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: 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 (#96823): https://edk2.groups.io/g/devel/message/96823
Mute This Topic: https://groups.io/mt/95380353/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-