From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (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 92C49203BA51A for ; Wed, 26 Dec 2018 13:43:30 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F00628E3E5; Wed, 26 Dec 2018 21:43:29 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-121-136.rdu2.redhat.com [10.10.121.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89CAD608DD; Wed, 26 Dec 2018 21:43:28 +0000 (UTC) To: Hao Wu , edk2-devel@lists.01.org Cc: Ruiyu Ni , Eric Dong References: <20181221072959.11168-1-hao.a.wu@intel.com> From: Laszlo Ersek Message-ID: <92ab3a16-789b-e110-e2af-20e72d954882@redhat.com> Date: Wed, 26 Dec 2018 22:43:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20181221072959.11168-1-hao.a.wu@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 26 Dec 2018 21:43:30 +0000 (UTC) Subject: Re: [PATCH v1] UefiCpuPkg: Merge StuffRsb.inc files into one in UefiCpuPkg/Include X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Dec 2018 21:43:30 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 12/21/18 08:29, Hao Wu wrote: > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1091 > > Previously, when compiling NASM source files, BaseTools did not support > including files outside of the NASM source file directory. As a result, we > duplicated multiple copies of "StuffRsb.inc" files in UefiCpuPkg. Those > INC files contain the common logic to stuff the Return Stack Buffer and > are identical. > > After the fix of BZ 1085: > https://bugzilla.tianocore.org/show_bug.cgi?id=1085 > The above support was introduced. > > Thus, this commit will merge all the StuffRsb.inc files in UefiCpuPkg into > one file. The merged file will be named 'StuffRsbNasm.inc' and be placed > under folder UefiCpuPkg/Include/. > > Cc: Eric Dong > Cc: Ruiyu Ni > Cc: Laszlo Ersek > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Hao Wu > --- > UefiCpuPkg/{Library/SmmCpuFeaturesLib/Ia32/StuffRsb.inc => Include/StuffRsbNasm.inc} | 3 +- > UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm | 2 +- > UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm | 2 +- > UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm | 2 +- > UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm | 2 +- > UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/StuffRsb.inc | 55 -------------------- > UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm | 2 +- > UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm | 2 +- > UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/StuffRsb.inc | 55 -------------------- > UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 2 +- > UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm | 2 +- > UefiCpuPkg/PiSmmCpuDxeSmm/X64/StuffRsb.inc | 55 -------------------- > 12 files changed, 10 insertions(+), 174 deletions(-) Reviewed-by: Laszlo Ersek Thanks! Laszlo