From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.2735.1588057339797549479 for ; Tue, 28 Apr 2020 00:02:19 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: guomin.jiang@intel.com) IronPort-SDR: IqlkxWfmRneoxzJ9EMR9b68pwY3xNhLCHeNDLONQugwh1RA0tq4cI/NGVS6g4UMoBfHGVgv+wQ 9Yx9K9ecjfyw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2020 00:01:19 -0700 IronPort-SDR: vVGFaAhRvzORvklwS2XVjwxrSY2KSBy6Ar4hrCmRR+W3pZE/kowdI/9aG6NE1OBwgFJDUVAG6o RY4KMk1a4QwA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,327,1583222400"; d="scan'208";a="292764385" Received: from guominji-mobl.ccr.corp.intel.com ([10.238.5.173]) by fmsmga002.fm.intel.com with ESMTP; 28 Apr 2020 00:01:18 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Jian J Wang , Xiaoyu Lu Subject: [PATCH v3 2/2] CryptoPkg/IntrinsicLib: Remove _fltused to avoid duplication Date: Tue, 28 Apr 2020 15:01:15 +0800 Message-Id: <20200428070115.830-3-guomin.jiang@intel.com> X-Mailer: git-send-email 2.25.1.windows.1 In-Reply-To: <20200428070115.830-1-guomin.jiang@intel.com> References: <20200428070115.830-1-guomin.jiang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Cc: Jian J Wang Cc: Xiaoyu Lu --- 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.
+Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.
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