From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com []) by mx.groups.io with SMTP id smtpd.web11.659.1587611274407833926 for ; Wed, 22 Apr 2020 20:07:56 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: guomin.jiang@intel.com) IronPort-SDR: lMCpaxS/b9tKTEJN+MTG5YWpOlNvTYeJT1WKbNoK4BocqIzIl1IXaMLpY/puV7Y5z9ZQXUzgnO UYf3HNDEVUpg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2020 20:07:55 -0700 IronPort-SDR: NgE+mrxosRERzhpjCYG6MTUUTszm/R1K4L6dMRq82+lj1Ia/oTM6i7UiPpfk6XMz7tSqBq1HgZ WHDILqBWZQHA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,305,1583222400"; d="scan'208";a="280247369" Received: from guominji-mobl.ccr.corp.intel.com ([10.238.5.173]) by fmsmga004.fm.intel.com with ESMTP; 22 Apr 2020 20:07:54 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Jian J Wang , Xiaoyu Lu Subject: [PATCH v2 2/2] CryptoPkg/IntrinsicLib: Remove _fltused to avoid duplication Date: Thu, 23 Apr 2020 11:07:51 +0800 Message-Id: <20200423030751.2178-3-guomin.jiang@intel.com> X-Mailer: git-send-email 2.25.1.windows.1 In-Reply-To: <20200423030751.2178-1-guomin.jiang@intel.com> References: <20200423030751.2178-1-guomin.jiang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2596 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=0D Cryptographic Library.=0D =0D -Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
=0D +Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D =0D **/=0D @@ -13,16 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =0D typedef UINTN size_t;=0D =0D -#if defined(__GNUC__) || defined(__clang__)=0D - #define GLOBAL_USED __attribute__((used))=0D -#else=0D - #define GLOBAL_USED=0D -#endif=0D -=0D -/* OpenSSL will use floating point support, and C compiler produces the _f= ltused=0D - symbol by default. Simply define this symbol here to satisfy the linker= . */=0D -int GLOBAL_USED _fltused =3D 1;=0D -=0D /* Sets buffers to a specified character */=0D void * memset (void *dest, int ch, size_t count)=0D {=0D --=20 2.25.1.windows.1