From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: zailiang.sun@intel.com) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Mon, 22 Jul 2019 18:31:57 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jul 2019 18:31:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,297,1559545200"; d="scan'208";a="174397336" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga006.jf.intel.com with ESMTP; 22 Jul 2019 18:31:51 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 22 Jul 2019 18:31:51 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 22 Jul 2019 18:31:51 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.110]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.240]) with mapi id 14.03.0439.000; Tue, 23 Jul 2019 09:31:49 +0800 From: "Sun, Zailiang" To: "devel@edk2.groups.io" , "Kinney, Michael D" CC: "Qian, Yi" , Gary Lin Subject: Re: [edk2-devel] [edk2-platforms Patch V3 11/12] Vlv2TbltDevicePkg: Remove __GNUC__ specific #ifdefs Thread-Topic: [edk2-devel] [edk2-platforms Patch V3 11/12] Vlv2TbltDevicePkg: Remove __GNUC__ specific #ifdefs Thread-Index: AQHVQOEc8rUzx2FsrUiEM3FdqV2h46bXawWg Date: Tue, 23 Jul 2019 01:31:49 +0000 Message-ID: <7CB7EF03E15B5D48981329A508747A9850C990DE@SHSMSX104.ccr.corp.intel.com> References: <20190722225859.24724-1-michael.d.kinney@intel.com> <20190722225859.24724-12-michael.d.kinney@intel.com> In-Reply-To: <20190722225859.24724-12-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zailiang.sun@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Zailiang Sun > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Michael D Kinney > Sent: Tuesday, July 23, 2019 6:59 AM > To: devel@edk2.groups.io > Cc: Sun, Zailiang ; Qian, Yi = ; > Gary Lin > Subject: [edk2-devel] [edk2-platforms Patch V3 11/12] Vlv2TbltDevicePkg: > Remove __GNUC__ specific #ifdefs >=20 > Remove #ifdefs for __GNUC__, so the builds are the same for GCC, VS20xx, > and XCODE5. This resolves an > XCODE5 build break for an unsupported pragma. >=20 > Cc: Zailiang Sun > Cc: Yi Qian > Cc: Gary Lin > Signed-off-by: Michael D Kinney > --- > .../AcpiPlatform/AcpiPlatform.c | 3 -- > .../BoardClkGens/BoardClkGens.c | 8 ---- > .../PlatformInitPei/CpuInitPeim.c | 12 ----- > .../PlatformInitPei/PlatformEarlyInit.c | 46 ------------------- > .../PlatformInitPei/PlatformEarlyInit.h | 6 --- > 5 files changed, 75 deletions(-) >=20 > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.= c > b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c > index 3e0b978120..37f899d7f5 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c > +++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c > @@ -51,9 +51,6 @@ CHAR16 gACPIOSFRRefDataBlockVariableName[] =3D > ACPI_OSFR_REF_DATA_BLOCK_VARIABL > CHAR16 gACPIOSFRMfgStringVariableName[] =3D > ACPI_OSFR_MFG_STRING_VARIABLE_NAME; >=20 > EFI_GLOBAL_NVS_AREA_PROTOCOL mGlobalNvsArea; > -#ifndef __GNUC__ > -#pragma optimize("", off) > -#endif > BOOLEAN mFirstNotify; > EFI_PLATFORM_INFO_HOB *mPlatformInfo; > EFI_GUID mSystemConfigurationGuid =3D > SYSTEM_CONFIGURATION_GUID; > diff --git > a/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens > /BoardClkGens.c > b/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens > /BoardClkGens.c > index 4356f7b366..f00f10cfcc 100644 > --- > a/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens > /BoardClkGens.c > +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClk > +++ Gens/BoardClkGens.c > @@ -12,10 +12,6 @@ > #include > #include >=20 > -#ifndef __GNUC__ > -#pragma optimize( "", off ) > -#endif > - > #define CLKGEN_EN 1 > #define EFI_DEBUG 1 >=20 > @@ -415,7 +411,3 @@ InstallPlatformClocksNotify ( > return EFI_SUCCESS; >=20 > } > - > -#ifndef __GNUC__ > -#pragma optimize( "", on ) > -#endif > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPei= m.c > b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c > index a3a3d5cbc9..d52c449318 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c > +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c > @@ -28,17 +28,5 @@ PlatformCpuInit ( > IN EFI_PLATFORM_CPU_INFO *PlatformCpuInfo > ) > { > - BOOLEAN ResetRequired; > - > - // > - // Variable initialization > - // > - ResetRequired =3D FALSE; > - > - > - if (ResetRequired) { > - CpuOnlyReset(PeiServices); > - } > - > return EFI_SUCCESS; > } > diff --git > a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c > b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c > index d3e62e3bd0..59845a69c4 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit= .c > +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit > +++ .c > @@ -17,15 +17,6 @@ Abstract: >=20 > #include "PlatformEarlyInit.h" >=20 > -#ifdef __GNUC__ > -#pragma GCC push_options > -#pragma GCC optimize ("O0") > -#else > -#pragma optimize ("", off) > -#endif > - > - > - > static EFI_PEI_STALL_PPI mStallPpi =3D { > PEI_STALL_RESOLUTION, > Stall > @@ -963,40 +954,3 @@ PlatformEarlyInitEntry ( >=20 > return Status; > } > - > -EFI_STATUS > -EFIAPI > -CpuOnlyReset ( > - IN CONST EFI_PEI_SERVICES **PeiServices > - ) > -{ > -// MsgBus32Write(CDV_UNIT_PUNIT, PUNIT_CPU_RST, 0x01) -#ifdef > __GNUC__ > - __asm__ > - ( > - "xorl %ecx, %ecx\n" > - "1:hlt; hlt; hlt\n" > - "jmp 1b\n" > - ); > -#else > - _asm { > - xor ecx, ecx > - HltLoop: > - hlt > - hlt > - hlt > - loop HltLoop > - } > -#endif > - // > - // If we get here we need to mark it as a failure. > - // > - return EFI_UNSUPPORTED; > -} > - > - > -#ifdef __GNUC__ > -#pragma GCC pop_options > -#else > -#pragma optimize ("", on) > -#endif > diff --git > a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h > b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h > index 8c02adba64..4c6b0795ec 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit= .h > +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit > +++ .h > @@ -1375,12 +1375,6 @@ BOOLEAN > IsA16Inverted ( > ); >=20 > -EFI_STATUS > -EFIAPI > -CpuOnlyReset ( > - IN CONST EFI_PEI_SERVICES **PeiServices > - ); > - > EFI_STATUS > EFIAPI > InitLan ( > -- > 2.21.0.windows.1 >=20 >=20 >=20