[edk2-devel] [PATCH v3 2/2] CryptoPkg/IntrinsicLib: Remove _fltused to avoid duplication
Guomin Jiang
guomin.jiang at intel.com
Tue Apr 28 07:01:15 UTC 2020
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2596
Out of edk2 may need _fltused symbol such as mu_plus
OnScreenKeyboard and UiToolKit. those driver will define the symbol to
feed MSVC, but it will conflict with CryptoPkg. so move the symbol to
BaseLib.
Signed-off-by: Guomin Jiang <guomin.jiang at intel.com>
Cc: Jian J Wang <jian.j.wang at intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu at intel.com>
---
CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
index 94fe341bec..c4136916d0 100644
--- a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
+++ b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
@@ -2,7 +2,7 @@
Intrinsic Memory Routines Wrapper Implementation for OpenSSL-based
Cryptographic Library.
-Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -13,16 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
typedef UINTN size_t;
-#if defined(__GNUC__) || defined(__clang__)
- #define GLOBAL_USED __attribute__((used))
-#else
- #define GLOBAL_USED
-#endif
-
-/* OpenSSL will use floating point support, and C compiler produces the _fltused
- symbol by default. Simply define this symbol here to satisfy the linker. */
-int GLOBAL_USED _fltused = 1;
-
/* Sets buffers to a specified character */
void * memset (void *dest, int ch, size_t count)
{
--
2.25.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#58215): https://edk2.groups.io/g/devel/message/58215
Mute This Topic: https://groups.io/mt/73322391/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list