From nobody Mon Apr 29 14:40:38 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+58214+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+58214+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588057341; cv=none; d=zohomail.com; s=zohoarc; b=gjqqq7DKCgOCbkKoqB/SGuCr7pyH29Qqw5luh6/v4iI/twerR7rwC3wvmnPic+B8cWptGz6J+tLvYmak4mgS7Tc185B5uHGKApuaciBfRId3hY60AUJX78ZswQCKKA9OvITB9sTvYo+tMeHsgqQN9X3sJH+9ULPi/Fsknj1Cerk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588057341; 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=UmtVM2DzveMJWHNSaeXYCYy7XmpoHRSc/xXNi4NJ/7g=; b=gkpTUun4JMGsv3JUAFG/ul0wdade4kG2JVqqpWAW4jFSf7PaIGxId7WidtXnR4lk+/0pSNI5tFspEVJMQrMW/5AAygggud2Nz0u5pKqgDbe9CbHRblwjI9ZSMKufzTMeeQaxskgJ4LI9Hcv9cqE4tieYrkyGoiWK5kCM5zl9xnw= 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+58214+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 158805734187518.819257495348893; Tue, 28 Apr 2020 00:02:21 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id wrwEYY1788612xVVh9duCnVY; Tue, 28 Apr 2020 00:02:21 -0700 X-Received: from mga18.intel.com (mga18.intel.com []) by mx.groups.io with SMTP id smtpd.web10.2731.1588057338787952898 for ; Tue, 28 Apr 2020 00:02:19 -0700 IronPort-SDR: xGfx3u+Q44FDcd5E8jLrR+KZk9J57X3MagZzbKvOzE9iLIO57JIAq1KFyCdq12v2mQa2IGkIgv uy9zSSpMnWXA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:18 -0700 IronPort-SDR: 0iKxpI8J+8/mIPd62+O8An1qIpR9p47rR6+T2NJzQeTRPLZCmgXGaVzsf8X8ZHGZ5n9apyin9M cLyKTJHxGbMA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,327,1583222400"; d="scan'208";a="292764373" X-Received: from guominji-mobl.ccr.corp.intel.com ([10.238.5.173]) by fmsmga002.fm.intel.com with ESMTP; 28 Apr 2020 00:01:17 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao Subject: [edk2-devel] [PATCH v3 1/2] MdePkg/BaseLib: Add _fltused to feed MSVC compiler Date: Tue, 28 Apr 2020 15:01:14 +0800 Message-Id: <20200428070115.830-2-guomin.jiang@intel.com> In-Reply-To: <20200428070115.830-1-guomin.jiang@intel.com> References: <20200428070115.830-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: <27952.devel.edk2.groups.io> 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: 4FL3LBZexLV4oSbpjubcUbp4x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588057341; bh=WSnGzO2UPXjm6EuTewfsVfNqBGxYqryrPSXEqxZv5PY=; h=Cc:Date:From:Reply-To:Subject:To; b=hzJ9fIWH/+7ixBIArniD1oJLt7EINmo2qnwDaL2lOjcdtDC+vcLW+0z+Doh6VnyxHN9 X4hGzA8S5xz3QuQAlwtirAR7NefBBt3uUe7iw7er2Resk9OLyjxYvKxx38OiYSfQoFAmn +KhwjMk4yRXdZq2Gbzw6QjkisfeBWMhc8mI= 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 (#58214): https://edk2.groups.io/g/devel/message/58214 Mute This Topic: https://groups.io/mt/73322390/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 Mon Apr 29 14:40:38 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+58215+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+58215+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588057341; cv=none; d=zohomail.com; s=zohoarc; b=gEk+Vx1QfE7t0ukoyrEBh81bZnddH+Ou5FxPjTmieMmSOqim0QD5h924Zcb7/deTNpR3zr0dOKz3tBJlmsYj36ME9MZQdFq71+J5hpnRDXzojcZPp+Ue3cHpELTQ4ItPuczmvAvRaLWxiU4156K6xSyA87fbZSHvBRP3vhhDvzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588057341; 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=Gr06tI6923+3bgWP2MD41NeGOxMIXPPk9/V1tq1g3s8=; b=SEMAfjJYQq5Ue+CfnxPWYdEL/LZDMGhKf+95iQgSd7wKg8x9jVH30NUXZThtFh0KvMKyEpdEB18mIypgj6tZqR4tXhyliqGbD4k1f4ASk/Jo/J1v5CE4RBstyoTpe1lBlizkPmYd3xPZRg3vP9Euy6+j4maXXtkce7SrrzF3wrs= 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+58215+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 1588057341389198.41934405946904; Tue, 28 Apr 2020 00:02:21 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id s4kNYY1788612x9aHrajyaqV; Tue, 28 Apr 2020 00:02:21 -0700 X-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 IronPort-SDR: IqlkxWfmRneoxzJ9EMR9b68pwY3xNhLCHeNDLONQugwh1RA0tq4cI/NGVS6g4UMoBfHGVgv+wQ 9Yx9K9ecjfyw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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" X-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: [edk2-devel] [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> In-Reply-To: <20200428070115.830-1-guomin.jiang@intel.com> References: <20200428070115.830-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: <27952.devel.edk2.groups.io> 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: 5WhlrM7jAgzLSVdcvrWhhmGbx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588057341; bh=1HZDfqtFO3F2plp3N4qdblhJDDFMPDYawuIMyqfpFJo=; h=Cc:Date:From:Reply-To:Subject:To; b=Uqs8Gt1ze96Gk/cHNF7tX44zTtrexk/fVTod5dynsjR2tg7NPyqgJKTvIOY6mHJWdlH 8tCzNgyq0ChcCuFRLxQgQarXRCRoHgUKQfXBIkbF8SJIGsHaMLgcCtrao65re6HakZBBL 3HtCsHimFZlc+zYksqiunVY5mGs/J0OpnNY= 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 (#58215): https://edk2.groups.io/g/devel/message/58215 Mute This Topic: https://groups.io/mt/73322391/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-