diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2019-07-22 13:31:14 -0700 |
|---|---|---|
| committer | Michael D Kinney <michael.d.kinney@intel.com> | 2019-07-23 09:51:44 -0700 |
| commit | e9241770e84a82be091c4ba64755143f05de4ba4 (patch) | |
| tree | 541970e9396d03068d2c99da0b679ea04b1c294e | |
| parent | dbc210212ee99df2da980ffee72240005de584cd (diff) | |
Vlv2TbltDevicePkg: Remove __GNUC__ specific #ifdefs
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.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Zailiang Sun <zailiang.sun@intel.com>
Tested-by: Gary Lin <glin@suse.com>
5 files changed, 0 insertions, 75 deletions
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c index 3e0b9781..37f899d7 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c @@ -51,9 +51,6 @@ CHAR16 gACPIOSFRRefDataBlockVariableName[] = ACPI_OSFR_REF_DATA_BLOCK_VARIABL CHAR16 gACPIOSFRMfgStringVariableName[] = ACPI_OSFR_MFG_STRING_VARIABLE_NAME;
EFI_GLOBAL_NVS_AREA_PROTOCOL mGlobalNvsArea;
-#ifndef __GNUC__
-#pragma optimize("", off)
-#endif
BOOLEAN mFirstNotify;
EFI_PLATFORM_INFO_HOB *mPlatformInfo;
EFI_GUID mSystemConfigurationGuid = SYSTEM_CONFIGURATION_GUID;
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c index 4356f7b3..f00f10cf 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c @@ -12,10 +12,6 @@ #include <Ppi/ReadOnlyVariable2.h>
#include <Library/BaseMemoryLib.h>
-#ifndef __GNUC__
-#pragma optimize( "", off )
-#endif
-
#define CLKGEN_EN 1
#define EFI_DEBUG 1
@@ -415,7 +411,3 @@ InstallPlatformClocksNotify ( return EFI_SUCCESS;
}
-
-#ifndef __GNUC__
-#pragma optimize( "", on )
-#endif
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c index a3a3d5cb..d52c4493 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 = 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 d3e62e3b..59845a69 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c @@ -17,15 +17,6 @@ Abstract: #include "PlatformEarlyInit.h"
-#ifdef __GNUC__
-#pragma GCC push_options
-#pragma GCC optimize ("O0")
-#else
-#pragma optimize ("", off)
-#endif
-
-
-
static EFI_PEI_STALL_PPI mStallPpi = {
PEI_STALL_RESOLUTION,
Stall
@@ -963,40 +954,3 @@ PlatformEarlyInitEntry ( 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 8c02adba..4c6b0795 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h @@ -1377,12 +1377,6 @@ IsA16Inverted ( EFI_STATUS
EFIAPI
-CpuOnlyReset (
- IN CONST EFI_PEI_SERVICES **PeiServices
- );
-
-EFI_STATUS
-EFIAPI
InitLan (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN SYSTEM_CONFIGURATION *Buffer
|