Updating uefi-edk2-bhyve

[Rebecca Cran]

On 3/22/19 2:25 PM, D Scott Phillips wrote:

> Hmm, I guess it might be some diference in the code generation between
> gcc 4.8 and gcc 5.


I've just tested switching from gcc 4.8 to 8.3.0 and everything seems to 
work fine - both build and runtime - so I think it may be more 
productive to upgrade and use that instead, since it's a supported 
version (gcc 4.8 is pretty old now). Would you agree?


The DEBUG build did complain about unused definitions and functions in 
FeatureControl.c though, so I ended up with the following patch:


diff --git a/OvmfPkg/PlatformPei/FeatureControl.c 
b/OvmfPkg/PlatformPei/FeatureControl.c
index 09f33fe5b1..051dbbdac0 100644
--- a/OvmfPkg/PlatformPei/FeatureControl.c
+++ b/OvmfPkg/PlatformPei/FeatureControl.c
@@ -24,7 +24,7 @@
  //
  // The value to be written to the Feature Control MSR, retrieved from 
fw_cfg.
  //
-STATIC UINT64 mFeatureControlValue;
+//STATIC UINT64 mFeatureControlValue;^M

  /**
    Write the Feature Control MSR on an Application Processor or the Boot
@@ -36,6 +36,7 @@ STATIC UINT64 mFeatureControlValue;
    @param[in,out] WorkSpace  Pointer to the input/output argument workspace
                              shared by all processors.
  **/
+#if 0^M
  STATIC
  VOID
  EFIAPI
@@ -45,7 +46,7 @@ WriteFeatureControl (
  {
    AsmWriteMsr64 (MSR_CORE2_FEATURE_CONTROL, mFeatureControlValue);
  }
-
+#endif^M
  /**
    Notification function called when EFI_PEI_MP_SERVICES_PPI becomes 
available.

@@ -57,6 +58,7 @@ WriteFeatureControl (
    @return  Status of the notification. The status code returned from this
             function is ignored.
  **/
+#if 0^M
  STATIC
  EFI_STATUS
  EFIAPI
@@ -94,17 +96,17 @@ OnMpServicesAvailable (
    WriteFeatureControl (NULL);
    return EFI_SUCCESS;
  }
-
+#endif^M
  //
  // Notification object for registering the callback, for when
  // EFI_PEI_MP_SERVICES_PPI becomes available.
  //
-STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mMpServicesNotify = {
-  EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | // Flags
-  EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,
-  &gEfiPeiMpServicesPpiGuid,               // Guid
-  OnMpServicesAvailable                    // Notify
-};
+//STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mMpServicesNotify = {^M
+//  EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | // Flags^M
+//  EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,^M
+//  &gEfiPeiMpServicesPpiGuid,               // Guid^M
+//  OnMpServicesAvailable                    // Notify^M
+//};^M

  VOID
  InstallFeatureControlCallback (