git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8633 6f19259b...

[mirror_edk2.git] / DuetPkg / EfiLdr / PeLoader.c

diff --git a/DuetPkg/EfiLdr/PeLoader.c b/DuetPkg/EfiLdr/PeLoader.c
index 721befb32eaf1bc43ff34cf80361dc71479d6ded..e3641123e11c4f2a15875b8492abd6579b356623 100644 (file)
--- a/DuetPkg/EfiLdr/PeLoader.c
+++ b/DuetPkg/EfiLdr/PeLoader.c
@@ -477,7 +477,7 @@ PrintHeader ('P');
 \r
       case EFI_IMAGE_REL_BASED_LOW:\r
         F16 = (UINT16 *) Fixup;\r
-        *F16 = *F16 + (UINT16) Adjust;\r
+        *F16 = (UINT16) (*F16 + (UINT16) Adjust);\r
         if (FixupData != NULL) {\r
           *(UINT16 *) FixupData = *F16;\r
           FixupData = FixupData + sizeof(UINT16);\r
@@ -618,19 +618,19 @@ EfiLdrPeCoffCheckImageMachineType (
 \r
   Status = EFI_UNSUPPORTED;\r
 \r
-#if EFI32\r
+#ifdef MDE_CPU_IA32\r
   if (MachineType == EFI_IMAGE_MACHINE_IA32) {\r
     Status = EFI_SUCCESS;\r
   }\r
 #endif\r
 \r
-#if EFIX64\r
+#ifdef MDE_CPU_X64\r
   if (MachineType == EFI_IMAGE_MACHINE_X64) {\r
     Status = EFI_SUCCESS;\r
   }\r
 #endif\r
 \r
-#if EFI64\r
+#ifdef MDE_CPU_IPF\r
   if (MachineType == EFI_IMAGE_MACHINE_IA64) {\r
     Status = EFI_SUCCESS;\r
   }\r