InOsEmuPkg/Unix: Fix build issues for GCC44 IA32

Signed-off-by: jljusten
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11880 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c b/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c
index 0f04e0a3c423df77ba177074cad7bfd0c93c4c15..b590ed2552b77d488b23deb823877277e28762d7 100644 (file)
--- a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c
+++ b/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c
@@ -148,6 +148,7 @@ EmuBusDriverBindingStart (
   EMU_VENDOR_DEVICE_PATH_NODE     *Node;\r
   BOOLEAN                         CreateDevice;\r
 \r
+  InstallStatus = EFI_UNSUPPORTED;\r
   Status = EFI_UNSUPPORTED;\r
 \r
   //\r

diff --git a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c b/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c
index ba032614332bf2c37919d6e3cf664c61def839c5..551b54332c9c92b2c4db8c5473f1de350d50a1a4 100644 (file)
--- a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c
+++ b/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c
@@ -489,6 +489,8 @@ EmuSimpleFileSystemOpenVolume (
   EMU_EFI_FILE_PRIVATE              *PrivateFile;\r
   EFI_TPL                           OldTpl;\r
 \r
+  Status = EFI_UNSUPPORTED;\r
+\r
   if (This == NULL || Root == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

diff --git a/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.c b/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.c
index 59d8e98b7982ffa7e7d9ac4016f368f7f2d93764..4432218b511e0500ba3773ac82c89af3341d2d46 100644 (file)
--- a/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.c
+++ b/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.c
@@ -667,10 +667,11 @@ EmuSnpDriverBindingStart (
   MAC_ADDR_DEVICE_PATH        Node;\r
   EFI_DEVICE_PATH_PROTOCOL    *ParentDevicePath;\r
 \r
+  Private = NULL;\r
+\r
   //\r
   // Grab the protocols we need\r
   //\r
-  \r
   Status = gBS->OpenProtocol(\r
                   ControllerHandle,\r
                   &gEfiDevicePathProtocolGuid,\r

diff --git a/InOsEmuPkg/Unix/Sec/EmuThunk.c b/InOsEmuPkg/Unix/Sec/EmuThunk.c
index 194cf137f93fe8531d9ee2b21190e403952d6eaa..97c339d24129ce22f04238330ad3064ea90c3f22 100644 (file)
--- a/InOsEmuPkg/Unix/Sec/EmuThunk.c
+++ b/InOsEmuPkg/Unix/Sec/EmuThunk.c
@@ -257,8 +257,8 @@ SecSleep (
   struct timeval  start, end;
   unsigned long  MicroSec;
   
-  rq.tv_sec  = Nanoseconds / 1000000000;
-  rq.tv_nsec = Nanoseconds % 1000000000;
+  rq.tv_sec  = DivU64x32 (Nanoseconds, 1000000000);
+  rq.tv_nsec = ModU64x32 (Nanoseconds, 1000000000);
 
   //
   // nanosleep gets interrupted by our timer tic. 

diff --git a/InOsEmuPkg/Unix/UnixX64.fdf b/InOsEmuPkg/Unix/UnixX64.fdf
index b6d80a22ea07d28d6c1e0b17cb09c31e39206f6a..b0b64d4ec31fb24ced0dfb211bc875be6faa4dd5 100644 (file)
--- a/InOsEmuPkg/Unix/UnixX64.fdf
+++ b/InOsEmuPkg/Unix/UnixX64.fdf
@@ -254,19 +254,13 @@ INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
 !if $(BUILD_FAT)\r
 INF FatPkg/EnhancedFatDxe/Fat.inf\r
 !else\r
-# Used checked in Visual Studio binaries\r
-FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {\r
-    SECTION PE32 = FatBinPkg/EnhancedFatDxe/X64/Fat.efi\r
-  }\r
+INF  RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
 !endif\r
 \r
 !if $(BUILD_NEW_SHELL)\r
 INF  ShellPkg/Application/Shell/Shell.inf\r
 !else\r
-# Used checked in Visual Studio binaries\r
-FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {\r
-    SECTION PE32 = EdkShellBinPkg/FullShell/X64/Shell_Full.efi\r
-  }\r
+INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r
 !endif\r
 \r
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r