From: "Guomin Jiang" <guomin.jiang@intel.com>
To: devel@edk2.groups.io
Cc: Jian J Wang <jian.j.wang@intel.com>, Xiaoyu Lu <xiaoyux.lu@intel.com>
Subject: [PATCH v2 2/2] CryptoPkg/IntrinsicLib: Remove _fltused to avoid duplication
Date: Thu, 23 Apr 2020 11:07:51 +0800 [thread overview]
Message-ID: <20200423030751.2178-3-guomin.jiang@intel.com> (raw)
In-Reply-To: <20200423030751.2178-1-guomin.jiang@intel.com>
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@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@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
prev parent reply other threads:[~2020-04-23 3:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 3:07 [PATCH v2 0/2] Define the unique _fltused in BaseLib Guomin Jiang
2020-04-23 3:07 ` [PATCH v2 1/2] MdePkg/BaseLib: Add _fltused to feed MSVC compiler Guomin Jiang
2020-04-23 3:07 ` Guomin Jiang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200423030751.2178-3-guomin.jiang@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox