From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8E09621D2E62A for ; Mon, 21 Aug 2017 01:23:15 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Aug 2017 01:25:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,408,1498546800"; d="scan'208";a="142054825" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga005.fm.intel.com with ESMTP; 21 Aug 2017 01:25:46 -0700 Received: from fmsmsx157.amr.corp.intel.com (10.18.116.73) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 21 Aug 2017 01:25:46 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX157.amr.corp.intel.com (10.18.116.73) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 21 Aug 2017 01:25:46 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.183]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.114]) with mapi id 14.03.0319.002; Mon, 21 Aug 2017 16:25:44 +0800 From: "Yao, Jiewen" To: "Song, BinX" CC: "edk2-devel@lists.01.org" Thread-Topic: [PATCH V2] IntelFsp2Pkg: Fix build error with WHOLEARCHIVE option Thread-Index: AdMaR4/UYVIifvoQTgaAWdAk42hJAQAD1T1g Date: Mon, 21 Aug 2017 08:25:43 +0000 Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503A993B2C@shsmsx102.ccr.corp.intel.com> References: <559D2DF22BC9A3468B4FA1AA547F0EF10258DBE0@shsmsx102.ccr.corp.intel.com> In-Reply-To: <559D2DF22BC9A3468B4FA1AA547F0EF10258DBE0@shsmsx102.ccr.corp.intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH V2] IntelFsp2Pkg: Fix build error with WHOLEARCHIVE option X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Aug 2017 08:23:15 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Can we add "JMP $" before ret for the empty function? It is to prevent the empty function is linked by mistake. Thank you Yao Jiewen > -----Original Message----- > From: Song, BinX > Sent: Monday, August 21, 2017 2:35 PM > To: Yao, Jiewen > Cc: edk2-devel@lists.01.org > Subject: [PATCH V2] IntelFsp2Pkg: Fix build error with WHOLEARCHIVE optio= n >=20 > V2: > - Recover TempRamInitApi API and add dummy TempRamInitApi function to fix > build error with WHOLEARCHIVE option >=20 > V1: > - Delete useless external TempRamInitApi API to fix /WHOLEARCHIVE build > error with VS2015 tool chain >=20 > Cc: Jiewen Yao > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Bell Song > --- > IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm | 10 ++++++++++ > IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm | 10 ++++++++++ > 2 files changed, 20 insertions(+) >=20 > diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm > b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm > index 9744e16..81b531e 100644 > --- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm > +++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm > @@ -195,6 +195,16 @@ ASM_PFX(AsmGetPeiCoreOffset): > ret >=20 > ;-----------------------------------------------------------------------= ----- > +; TempRamInit API > +; > +; Dummy function for VS2015 WHOLEARCHIVE build option > +; > +;-----------------------------------------------------------------------= ----- > +global ASM_PFX(TempRamInitApi) > +ASM_PFX(TempRamInitApi): > + ret > + > +;-----------------------------------------------------------------------= ----- > ; Module Entrypoint API > ;-----------------------------------------------------------------------= ----- > global ASM_PFX(_ModuleEntryPoint) > diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm > b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm > index cdc1149..06a791f 100644 > --- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm > +++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm > @@ -54,6 +54,16 @@ ASM_PFX(FspApiCommonContinue): > ret >=20 > ;-----------------------------------------------------------------------= ----- > +; TempRamInit API > +; > +; Dummy function for VS2015 WHOLEARCHIVE build option > +; > +;-----------------------------------------------------------------------= ----- > +global ASM_PFX(TempRamInitApi) > +ASM_PFX(TempRamInitApi): > + ret > + > +;-----------------------------------------------------------------------= ----- > ; Module Entrypoint API > ;-----------------------------------------------------------------------= ----- > global ASM_PFX(_ModuleEntryPoint) > -- > 2.10.2.windows.1