diff options
| author | Nickle Wang <nicklew@nvidia.com> | 2024-02-15 18:58:50 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-02-29 03:25:18 +0000 |
| commit | d9a6e7b0b8a67392a57788d97634256546207a64 (patch) | |
| tree | 521c4300c8b5362bff2bbaa97a1610e6557e7c43 | |
| parent | d4c76fa17d9caccb48926a20404512cc7c371684 (diff) | |
| download | edk2-d9a6e7b0b8a67392a57788d97634256546207a64.tar.gz edk2-d9a6e7b0b8a67392a57788d97634256546207a64.tar.bz2 edk2-d9a6e7b0b8a67392a57788d97634256546207a64.zip | |
RedfishPkg/RedfishCrtLib: fix unresolved external symbol issue
-Fix below compiler error reported in edk2 CI.
ERROR - Linker #2001 from JsonLib.lib(load.obj) : unresolved external
symbol __ftol2
-The file MathFtol.c is copied from IntrinsicLib in CryptoPkg.
-Add MathFtol.c to EccCheck IgnoreFiles.
Signed-off-by: Nickle Wang <nicklew@nvidia.com>
Cc: Abner Chang <abner.chang@amd.com>
Cc: Igor Kulchytskyy <igork@ami.com>
Cc: Nick Ramirez <nramirez@nvidia.com>
Reviewed-by: Abner Chang <abner.chang@amd.com>
Reviewed-by: Igor Kulchytskyy <igork@ami.com>
| -rw-r--r-- | RedfishPkg/PrivateLibrary/RedfishCrtLib/Ia32/MathFtol.c | 37 | ||||
| -rw-r--r-- | RedfishPkg/PrivateLibrary/RedfishCrtLib/RedfishCrtLib.inf | 7 | ||||
| -rw-r--r-- | RedfishPkg/RedfishPkg.ci.yaml | 2 |
3 files changed, 45 insertions, 1 deletions
diff --git a/RedfishPkg/PrivateLibrary/RedfishCrtLib/Ia32/MathFtol.c b/RedfishPkg/PrivateLibrary/RedfishCrtLib/Ia32/MathFtol.c new file mode 100644 index 0000000000..e49f00eaf5 --- /dev/null +++ b/RedfishPkg/PrivateLibrary/RedfishCrtLib/Ia32/MathFtol.c @@ -0,0 +1,37 @@ +/** @file This file is copied from CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c
+ 64-bit Math Worker Function.
+ The 32-bit versions of C compiler generate calls to library routines
+ to handle 64-bit math. These functions use non-standard calling conventions.
+
+Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+/*
+ * Floating point to integer conversion.
+ */
+__declspec(naked) void
+_ftol2 (
+ void
+ )
+{
+ _asm {
+ fistp qword ptr [esp-8]
+ mov edx, [esp-4]
+ mov eax, [esp-8]
+ ret
+ }
+}
+
+__declspec(naked) void
+_ftol2_sse (
+ void
+ )
+{
+ _asm {
+ fistp dword ptr [esp-4]
+ mov eax,[esp-4]
+ ret
+ }
+}
diff --git a/RedfishPkg/PrivateLibrary/RedfishCrtLib/RedfishCrtLib.inf b/RedfishPkg/PrivateLibrary/RedfishCrtLib/RedfishCrtLib.inf index 6ff5dba75c..3a5e309d1a 100644 --- a/RedfishPkg/PrivateLibrary/RedfishCrtLib/RedfishCrtLib.inf +++ b/RedfishPkg/PrivateLibrary/RedfishCrtLib/RedfishCrtLib.inf @@ -3,6 +3,7 @@ #
# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
# (C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>
+# Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -23,6 +24,9 @@ [Sources]
RedfishCrtLib.c
+[Sources.IA32]
+ Ia32/MathFtol.c | MSFT
+
[LibraryClasses]
BaseLib
SortLib
@@ -35,4 +39,5 @@ MdeModulePkg/MdeModulePkg.dec
RedfishPkg/RedfishPkg.dec
-
+[BuildOptions]
+ MSFT:*_*_IA32_CC_FLAGS = /GL-
diff --git a/RedfishPkg/RedfishPkg.ci.yaml b/RedfishPkg/RedfishPkg.ci.yaml index 69b6bf39f5..b95e8bfdc7 100644 --- a/RedfishPkg/RedfishPkg.ci.yaml +++ b/RedfishPkg/RedfishPkg.ci.yaml @@ -2,6 +2,7 @@ # CI configuration for NetworkPkg
#
# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
+# Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent
##
{
@@ -38,6 +39,7 @@ "PrivateInclude/Crt/string.h",
"PrivateInclude/Crt/time.h",
"PrivateLibrary/RedfishCrtLib/RedfishCrtLib.c",
+ "PrivateLibrary/RedfishCrtLib/Ia32/MathFtol.c",
"Include/Library/RedfishCrtLib.h",
##
## For jansson library open source
|