[edk2-devel] [edk2-platforms Patch V3 11/12] Vlv2TbltDevicePkg: Remove __GNUC__ specific #ifdefs
Michael D Kinney
michael.d.kinney at intel.com
Mon Jul 22 22:58:58 UTC 2019
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 at intel.com>
Cc: Yi Qian <yi.qian at intel.com>
Cc: Gary Lin <glin at suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney at intel.com>
---
.../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(-)
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[] = 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 4356f7b366..f00f10cfcc 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 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 = 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:
#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 8c02adba64..4c6b0795ec 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
@@ -1375,12 +1375,6 @@ BOOLEAN
IsA16Inverted (
);
-EFI_STATUS
-EFIAPI
-CpuOnlyReset (
- IN CONST EFI_PEI_SERVICES **PeiServices
- );
-
EFI_STATUS
EFIAPI
InitLan (
--
2.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#44170): https://edk2.groups.io/g/devel/message/44170
Mute This Topic: https://groups.io/mt/32564737/1813853
Mute #ifdefs: https://groups.io/mk?hashtag=ifdefs&subid=3943202
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list