4 files changed, 6 insertions, 9 deletions
diff --git a/DuetPkg/CpuDxe/Cpu.c b/DuetPkg/CpuDxe/Cpu.c
index 42ffcd6c85..fc15b8aa55 100644
--- a/DuetPkg/CpuDxe/Cpu.c
+++ b/DuetPkg/CpuDxe/Cpu.c
@@ -343,7 +343,7 @@ DumpExceptionDataDebugOut (
 
   ErrorCodeFlag = 0x00027d00;
 
-#ifdef EFI32
+#ifdef MDE_CPU_IA32
   DEBUG ((
     EFI_D_ERROR,
     "!!!! IA32 Exception Type - %08x !!!!\n",
@@ -563,7 +563,7 @@ DumpExceptionDataVgaOut (
   VideoBufferBase = (CHAR16 *) (UINTN) 0xb8000;
   VideoBuffer     = (CHAR16 *) (UINTN) 0xb8000;
 
-#ifdef EFI32
+#ifdef MDE_CPU_IA32
   UnicodeSPrintAsciiFormat (
     VideoBuffer,
     COLUMN_MAX * sizeof (CHAR16),
diff --git a/DuetPkg/DuetPkg.dsc b/DuetPkg/DuetPkg.dsc
index 300229564b..260350007b 100644
--- a/DuetPkg/DuetPkg.dsc
+++ b/DuetPkg/DuetPkg.dsc
@@ -191,7 +191,4 @@
 
 [BuildOptions.common]
   MSFT:*_*_*_CC_FLAGS = /FAsc /FR$(@R).SBR
-  MSFT:*_*_IA32_CC_FLAGS = /D EFI32
-  MSFT:*_*_X64_CC_FLAGS = /D EFIX64
-  MSFT:*_*_IPF_CC_FLAGS = /D EFI64
 
diff --git a/DuetPkg/EfiLdr/EfiLdr.inf b/DuetPkg/EfiLdr/EfiLdr.inf
index acef3b9344..8294f2050a 100644
--- a/DuetPkg/EfiLdr/EfiLdr.inf
+++ b/DuetPkg/EfiLdr/EfiLdr.inf
@@ -54,7 +54,7 @@
   gTianoCustomDecompressGuid
 
 [BuildOptions.common]
-  MSFT:*_*_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
+  MSFT:*_*_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
   MSFT:*_*_IA32_PP_FLAGS == /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
   MSFT:*_*_IA32_ASM_FLAGS == /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi
   MSFT:*_*_IA32_ASMLINK_FLAGS == /link /nologo /tiny  
diff --git a/DuetPkg/EfiLdr/PeLoader.c b/DuetPkg/EfiLdr/PeLoader.c
index c4cbbe34c4..e3641123e1 100644
--- a/DuetPkg/EfiLdr/PeLoader.c
+++ b/DuetPkg/EfiLdr/PeLoader.c
@@ -618,19 +618,19 @@ EfiLdrPeCoffCheckImageMachineType (
 
   Status = EFI_UNSUPPORTED;
 
-#ifdef EFI32
+#ifdef MDE_CPU_IA32
   if (MachineType == EFI_IMAGE_MACHINE_IA32) {
     Status = EFI_SUCCESS;
   }
 #endif
 
-#ifdef EFIX64
+#ifdef MDE_CPU_X64
   if (MachineType == EFI_IMAGE_MACHINE_X64) {
     Status = EFI_SUCCESS;
   }
 #endif
 
-#ifdef EFI64
+#ifdef MDE_CPU_IPF
   if (MachineType == EFI_IMAGE_MACHINE_IA64) {
     Status = EFI_SUCCESS;
   }