diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 4af5d21bc0..65a7b6597b 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -289,8 +289,8 @@ RELEASE_VS2005TEAMSUITE_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005TEAMSUITE_IPF_SLINK_PATH    = DEF(VS2005TEAMSUITE_BIN64)\lib.exe
 *_VS2005TEAMSUITE_IPF_DLINK_PATH    = DEF(VS2005TEAMSUITE_BIN64)\link.exe
 
-  DEBUG_VS2005TEAMSUITE_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /Gy /Os /GL /FIAutoGen.h /Zi
-RELEASE_VS2005TEAMSUITE_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /Gy /Os /GL /FIAutoGen.h 
+  DEBUG_VS2005TEAMSUITE_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi
+RELEASE_VS2005TEAMSUITE_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32
   DEBUG_VS2005TEAMSUITE_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4 -d debug
 RELEASE_VS2005TEAMSUITE_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4
   DEBUG_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
@@ -375,8 +375,8 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_WINDDK3790x1830_IPF_PCH_PATH     = DEF(WINDDK_BIN64)\cl.exe
 *_WINDDK3790x1830_IPF_ASM_PATH     = DEF(WINDDK_BIN64)\ias.exe
 
-  DEBUG_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /Gy /Os /GL /FIAutoGen.h /Zi
-RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /Gy /Os /GL /FIAutoGen.h
+  DEBUG_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi
+RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32
   DEBUG_WINDDK3790x1830_IPF_PCH_FLAGS    = /nologo /c /WX /GS- /X /W4 /EHs-c- /Gy /Os /GL /FIAutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi
 RELEASE_WINDDK3790x1830_IPF_PCH_FLAGS    = /nologo /c /WX /GS- /X /W4 /EHs-c- /Gy /Os /GL /FIAutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC
   DEBUG_WINDDK3790x1830_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4 -d debug
@@ -719,8 +719,8 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 
       *_MYTOOLS_IPF_ASM_OUTPUT           = "-o "
 
-  DEBUG_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GF /Zi /Zx
-RELEASE_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GF /Zx
+  DEBUG_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GF /Zx /QIPF_fr32 /Zi
+RELEASE_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GF /Zx /QIPF_fr32 
   DEBUG_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4 -d debug
 RELEASE_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4
   DEBUG_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG