1 files changed, 11 insertions, 3 deletions
diff --git a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf b/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
index e830c6afac..447de8a0f1 100644
--- a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+++ b/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
@@ -51,6 +51,14 @@
   BaseMemoryLib
 
 [BuildOptions]
-  MSFT:*_*_*_CC_FLAGS  = /GL- /Oi-
-  INTEL:*_*_*_CC_FLAGS = /Oi-
-  GCC:*_*_*_CC_FLAGS   = -fno-builtin
+   # Override MSFT build option to remove /Oi
+   MSFT:DEBUG_VS2003_IA32_CC_FLAGS       == /nologo /c /WX /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm
+   MSFT:RELEASE_VS2003_IA32_CC_FLAGS     == /nologo /c /WX /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX-
+   MSFT:DEBUG_VS2003xASL_IA32_CC_FLAGS   == /nologo /c /WX /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm
+   MSFT:RELEASE_VS2003xASL_IA32_CC_FLAGS == /nologo /c /WX /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX-
+   MSFT:DEBUG_*_IA32_CC_FLAGS            == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm
+   MSFT:RELEASE_*_IA32_CC_FLAGS          == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
+   MSFT:DEBUG_*_X64_CC_FLAGS             == /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
+   MSFT:RELEASE_*_X64_CC_FLAGS           == /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
+  INTEL:*_*_*_CC_FLAGS                   =  /Oi-
+    GCC:*_*_*_CC_FLAGS                   =  -fno-builtin