From nobody Sun May 19 14:14:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57901+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57901+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587611277; cv=none; d=zohomail.com; s=zohoarc; b=g5jbpV8EkJ6ym1BRyTHLRpeLc2W7qlIy0uOcrkZ/xYdw/gJ+YBC5MQYcGP5ikG1OEXiNsXHsdK1ousIpe/MkW3LBISDnwHns/fYrbeTwnF9dR02kbzHUnLW+MuadLBPVfZL5FDL4ABTKOzSsA29iuWZG8yRr8qBbkpwESdVVdtE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587611277; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=1ulaTtl9np274br4mJcFz6k984JRmvsgdag9zHYyJJ4=; b=GUoTJm3A2+JNxTK9GXDhVbQuM75+g6z2tlo9uBXC7joWTXrEVOKOB9Ky/LCv2uWKuzFazcO6LsKP7oCjlsdY1lWCh05SyjCQnKvd/vlFphU6ZZT/FgmP+b9vxA/61T0EuXU57VD2cGrnn3Ui6z89teZKGVZjVGB92yQcq2xm+8o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57901+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1587611277454645.5823271405951; Wed, 22 Apr 2020 20:07:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id trZTYY1788612xw8mfZeStfJ; Wed, 22 Apr 2020 20:07:57 -0700 X-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:55 -0700 IronPort-SDR: TI4sov7u8asE/p8C/W/bflKd4oLVva72uqnccPC+Ne8O759HY6ACnQ4T18OoGcf11r1HYJELGC 4D3dgHChEwWA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:54 -0700 IronPort-SDR: qhVZPCfIXfbegF+P7CgFmRPTlf7ybfzk1J1JY37NBK4V9/rTQI6R7O3WQzyeeB1y/AJirZLzen ffXbgsnVstvA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,305,1583222400"; d="scan'208";a="280247364" X-Received: from guominji-mobl.ccr.corp.intel.com ([10.238.5.173]) by fmsmga004.fm.intel.com with ESMTP; 22 Apr 2020 20:07:53 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao Subject: [edk2-devel] [PATCH v2 1/2] MdePkg/BaseLib: Add _fltused to feed MSVC compiler Date: Thu, 23 Apr 2020 11:07:50 +0800 Message-Id: <20200423030751.2178-2-guomin.jiang@intel.com> In-Reply-To: <20200423030751.2178-1-guomin.jiang@intel.com> References: <20200423030751.2178-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,guomin.jiang@intel.com X-Gm-Message-State: nIzZdAtlzkgvkbYg0VfmRJhix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587611277; bh=LChLqPM/4Q6aFEg1VVh0PXH+GjKycIZAwQ0sscSM93U=; h=Cc:Date:From:Reply-To:Subject:To; b=lNN27M0+FWtTtBHhXn8JvE79KpksdBiWcOy0arYIy3saHOLdDM6gmZthP4+QwlEFKp3 DExWCSAKxl//kA1NOWa/BqPcoY5Wq0qx6Ngk2NonhKZNRx24U31dbcMkXTI8e3xNFgcrN 0xB2ID6m4q8CFkvkAuZ7l/04j6hQvNCCUw8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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: Michael D Kinney Cc: Liming Gao --- MdePkg/Library/BaseLib/BaseLib.inf | 3 ++- MdePkg/Library/BaseLib/FltUsed.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 MdePkg/Library/BaseLib/FltUsed.c diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/Ba= seLib.inf index 3586beb0ab..bab31c07c7 100644 --- a/MdePkg/Library/BaseLib/BaseLib.inf +++ b/MdePkg/Library/BaseLib/BaseLib.inf @@ -1,7 +1,7 @@ ## @file # Base Library implementation. # -# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2020, Intel Corporation. All rights reserved.
# Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
# Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.
# @@ -60,6 +60,7 @@ String.c FilePaths.c BaseLibInternals.h + FltUsed.c | MSFT =20 [Sources.Ia32] Ia32/WriteTr.nasm diff --git a/MdePkg/Library/BaseLib/FltUsed.c b/MdePkg/Library/BaseLib/FltU= sed.c new file mode 100644 index 0000000000..c065594266 --- /dev/null +++ b/MdePkg/Library/BaseLib/FltUsed.c @@ -0,0 +1,14 @@ +/** @file + Declare _fltused symbol for MSVC + + MSVC need this symbol for float, andd it here to feed MSVC. it may remove + if MSVC not need it any more. + + Copyright (c) 2020 - 2020, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent +**/ + +// +// Just for MSVC float +// +int _fltused =3D 0x1; --=20 2.25.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57901): https://edk2.groups.io/g/devel/message/57901 Mute This Topic: https://groups.io/mt/73211935/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 14:14:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57902+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57902+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587611278; cv=none; d=zohomail.com; s=zohoarc; b=k6OoiNNMcGSog8xYyqgsnQ/psfOj1rz/eE/KJVFAXIb0l9Qigd7uITwxBI7gAyQFvlzchqn0cLeYIMnXbOBbtRuHbq2OiMtaMS/7M6+ceI8obJD1MbBM9chx0int7sJ9vKhOFkJzKUXLzTQd91x0kDSZC7nV4ohDKQIMP8+nvjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587611278; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=oYkH7hrR1Hj8evNYeZf8uHAXLrr3Aq5ptNExqIO3ehs=; b=GT4si+vIn4vFEkKVwnmRcbUk3I6cWZhjN2FfL3RN87ZfqxF20NdNNnHgu0DBJcOXwJ94YBiIJl+md1A4oyG7wSgnMofrskIuY8nwG7BWay4nT5uklBqyI4XZdXGjvXoiSxSs3dCgkNbdXnw4fGkxZxzY+YgOKklZv5eZtNCBsUU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57902+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 158761127823797.87890582362695; Wed, 22 Apr 2020 20:07:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id WQjVYY1788612xRgYTnrcUKL; Wed, 22 Apr 2020 20:07:57 -0700 X-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 IronPort-SDR: lMCpaxS/b9tKTEJN+MTG5YWpOlNvTYeJT1WKbNoK4BocqIzIl1IXaMLpY/puV7Y5z9ZQXUzgnO UYf3HNDEVUpg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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" X-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: [edk2-devel] [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> In-Reply-To: <20200423030751.2178-1-guomin.jiang@intel.com> References: <20200423030751.2178-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,guomin.jiang@intel.com X-Gm-Message-State: VeN4na8iPztRX4f2w2xhMhPkx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587611277; bh=pJN9EPEuYLp4Mq2h3Rn/h+kLXhru2YS71aw5GXPTe70=; h=Cc:Date:From:Reply-To:Subject:To; b=mzbyu8uqGRDouzvKd/XaXPIikQlxESSh0sL4a0ecMfbQeKNruFecjbUIgmNBQMdMpQ7 jdOCCAHCSsa+MKuWoO5TtudL3njkMmfwSe7ZVniNtlAdKm8Ss5p5+GJDzywUQl2ZmVz/Q RkoLs1Bf428dqXfBW9uNY3nYwQcTp0XAoVQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Cryptographic Library. =20 -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 =20 **/ @@ -13,16 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 typedef UINTN size_t; =20 -#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 _f= ltused - symbol by default. Simply define this symbol here to satisfy the linker= . */ -int GLOBAL_USED _fltused =3D 1; - /* Sets buffers to a specified character */ void * memset (void *dest, int ch, size_t count) { --=20 2.25.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57902): https://edk2.groups.io/g/devel/message/57902 Mute This Topic: https://groups.io/mt/73211936/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-