summaryrefslogtreecommitdiffstats
path: root/MdeModulePkg
diff options
context:
space:
mode:
authorNickle Wang <nicklew@nvidia.com>2023-04-21 14:48:30 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-04-28 08:55:56 +0000
commitecbcff0f4935395f66ecc9e9ac76b804ecdec2e8 (patch)
tree527277aaaee0187cc40af2f3e35eac225e3d5a00 /MdeModulePkg
parentd226811a6644c1746c0c92dbba3f85b7b4b6b476 (diff)
downloadedk2-ecbcff0f4935395f66ecc9e9ac76b804ecdec2e8.tar.gz
edk2-ecbcff0f4935395f66ecc9e9ac76b804ecdec2e8.tar.bz2
edk2-ecbcff0f4935395f66ecc9e9ac76b804ecdec2e8.zip
MdeModulePkg/RegularExpressionDxe: Fix Arm build error
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 Fix: - Update memset() implementation to match memset() definition in ArmPkg/Library/CompilerIntrinsicsLib. - memcpy() is supported by ArmPkg/Library/CompilerIntrinsicsLib. Exclude it in OnigurumaUefiPort.c. 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> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Diffstat (limited to 'MdeModulePkg')
-rw-r--r--MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c8
-rw-r--r--MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h7
2 files changed, 11 insertions, 4 deletions
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c
index 6661c67f97..0d8984dde0 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,
@@ -119,14 +121,16 @@ memcpy (
return CopyMem (dest, src, (UINTN)count);
}
+#endif
+
void *
memset (
void *dest,
- char ch,
+ int ch,
unsigned int count
)
{
- return SetMem (dest, count, ch);
+ return SetMem (dest, (UINTN)count, (UINT8)ch);
}
void
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h
index 248109b0c9..8931f8ec50 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,
@@ -114,10 +115,12 @@ memcpy (
unsigned int count
);
+#endif
+
void *
memset (
void *dest,
- char ch,
+ int ch,
unsigned int count
);